Skip to content

Commit 1494ff5

Browse files
diPhantxmdiPhantxm
authored
Better tests (check that response match the structure) (#52)
Trailing zeros were removed from time in responses because of json marshaling features
1 parent 922e2de commit 1494ff5

33 files changed

+744
-123
lines changed

‎client_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func TestRequest(t *testing.T) {
6666

6767
if err != nil {
6868
t.Error(err)
69+
continue
6970
}
7071

7172
if resp.StatusCode != test.statusCode {

‎ozon/analytics_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ func TestGetAnalyticsData(t *testing.T) {
6464
resp, err := c.Analytics().GetAnalyticsData(ctx, test.params)
6565
if err != nil {
6666
t.Error(err)
67+
continue
6768
}
6869

70+
compareJsonResponse(t, test.response, &GetAnalyticsDataResponse{})
71+
6972
if resp.StatusCode != test.statusCode {
7073
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
7174
}
@@ -125,8 +128,11 @@ func TestGetStocksOnWarehouses(t *testing.T) {
125128
resp, err := c.Analytics().GetStocksOnWarehouses(ctx, test.params)
126129
if err != nil {
127130
t.Error(err)
131+
continue
128132
}
129133

134+
compareJsonResponse(t, test.response, &GetStocksOnWarehousesResponse{})
135+
130136
if resp.StatusCode != test.statusCode {
131137
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
132138
}

‎ozon/barcodes_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ func TestGenerateBarcodes(t *testing.T) {
5454
resp, err := c.Barcodes().Generate(ctx, test.params)
5555
if err != nil {
5656
t.Error(err)
57+
continue
5758
}
5859

60+
compareJsonResponse(t, test.response, &GenerateBarcodesResponse{})
61+
5962
if resp.StatusCode != test.statusCode {
6063
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
6164
}
@@ -121,8 +124,11 @@ func TestBindBarcodes(t *testing.T) {
121124
resp, err := c.Barcodes().Bind(ctx, test.params)
122125
if err != nil {
123126
t.Error(err)
127+
continue
124128
}
125129

130+
compareJsonResponse(t, test.response, &BindBarcodesResponse{})
131+
126132
if resp.StatusCode != test.statusCode {
127133
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
128134
}

‎ozon/brands_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func TestListCertifiedBrands(t *testing.T) {
2929
"result": {
3030
"brand_certification": [
3131
{
32-
"brand_id": 135476863,
3332
"brand_name": "Sea of Spa",
3433
"has_certificate": false
3534
}
@@ -57,8 +56,11 @@ func TestListCertifiedBrands(t *testing.T) {
5756
resp, err := c.Brands().List(ctx, test.params)
5857
if err != nil {
5958
t.Error(err)
59+
continue
6060
}
6161

62+
compareJsonResponse(t, test.response, &ListCertifiedBrandsResponse{})
63+
6264
if resp.StatusCode != test.statusCode {
6365
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
6466
}

‎ozon/cancellations_test.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,11 @@ func TestGetCancellationInfo(t *testing.T) {
6767
resp, err := c.Cancellations().GetInfo(ctx, test.params)
6868
if err != nil {
6969
t.Error(err)
70+
continue
7071
}
7172

73+
compareJsonResponse(t, test.response, &GetCancellationInfoResponse{})
74+
7275
if resp.StatusCode != test.statusCode {
7376
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
7477
}
@@ -123,9 +126,9 @@ func TestListCancellations(t *testing.T) {
123126
"state": "APPROVED"
124127
},
125128
"cancellation_initiator": "CLIENT",
126-
"order_date": "2021-09-03T07:04:53.220Z",
129+
"order_date": "2021-09-03T07:04:53.22Z",
127130
"approve_comment": "",
128-
"approve_date": "2021-09-03T09:13:12.614200Z",
131+
"approve_date": "2021-09-03T09:13:12.6142Z",
129132
"auto_approve_date": "2021-09-06T07:17:12.116114Z"
130133
},
131134
{
@@ -177,8 +180,11 @@ func TestListCancellations(t *testing.T) {
177180
resp, err := c.Cancellations().List(ctx, test.params)
178181
if err != nil {
179182
t.Error(err)
183+
continue
180184
}
181185

186+
compareJsonResponse(t, test.response, &ListCancellationsResponse{})
187+
182188
if resp.StatusCode != test.statusCode {
183189
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
184190
}
@@ -222,8 +228,11 @@ func TestApproveCancellations(t *testing.T) {
222228
resp, err := c.Cancellations().Approve(ctx, test.params)
223229
if err != nil {
224230
t.Error(err)
231+
continue
225232
}
226233

234+
compareJsonResponse(t, test.response, &ApproveRejectCancellationsResponse{})
235+
227236
if resp.StatusCode != test.statusCode {
228237
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
229238
}
@@ -267,8 +276,11 @@ func TestRejectCancellations(t *testing.T) {
267276
resp, err := c.Cancellations().Reject(ctx, test.params)
268277
if err != nil {
269278
t.Error(err)
279+
continue
270280
}
271281

282+
compareJsonResponse(t, test.response, &ApproveRejectCancellationsResponse{})
283+
272284
if resp.StatusCode != test.statusCode {
273285
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
274286
}

‎ozon/categories_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ func TestGetProductTree(t *testing.T) {
5656
resp, err := c.Categories().Tree(ctx, test.params)
5757
if err != nil {
5858
t.Error(err)
59+
continue
5960
}
6061

62+
compareJsonResponse(t, test.response, &GetProductTreeResponse{})
63+
6164
if resp.StatusCode != test.statusCode {
6265
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
6366
}
@@ -118,8 +121,11 @@ func TestGetCategoryAttributes(t *testing.T) {
118121
resp, err := c.Categories().Attributes(ctx, test.params)
119122
if err != nil {
120123
t.Error(err)
124+
continue
121125
}
122126

127+
compareJsonResponse(t, test.response, &GetCategoryAttributesResponse{})
128+
123129
if resp.StatusCode != test.statusCode {
124130
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
125131
}
@@ -178,8 +184,11 @@ func TestGetAttributeDictionary(t *testing.T) {
178184
resp, err := c.Categories().AttributesDictionary(ctx, test.params)
179185
if err != nil {
180186
t.Error(err)
187+
continue
181188
}
182189

190+
compareJsonResponse(t, test.response, &GetAttributeDictionaryResponse{})
191+
183192
if resp.StatusCode != test.statusCode {
184193
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
185194
}

‎ozon/certificates.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ type ListOfCertifiedCategoriesResponse struct {
100100
core.CommonResponse
101101

102102
// Method result
103-
Result ListOfCertifiedCategoriesResult `json:"reult"`
103+
Result ListOfCertifiedCategoriesResult `json:"result"`
104104
}
105105

106106
type ListOfCertifiedCategoriesResult struct {
@@ -233,7 +233,7 @@ type GetCertificateInfoResult struct {
233233
AccordanceTypeCode string `json:"accordance_type_code"`
234234

235235
// Certificate rejection reason
236-
RejectionReasonCode string `json:"rejectio_reason_code"`
236+
RejectionReasonCode string `json:"rejection_reason_code"`
237237

238238
// Moderator's comment
239239
VerificationComment string `json:"verification_comment"`
@@ -307,7 +307,7 @@ type ListCertificatesResultCert struct {
307307
CertificateName string `json:"certificate_name"`
308308

309309
// Type
310-
TypeCode string `json:"type"`
310+
TypeCode string `json:"type_code"`
311311

312312
// Status
313313
StatusCode string `json:"status_code"`
@@ -316,13 +316,13 @@ type ListCertificatesResultCert struct {
316316
AccordanceTypecode string `json:"accordance_type_code"`
317317

318318
// Certificate rejection reason
319-
RejectionReasonCode string `json:"rejectio_reason_code"`
319+
RejectionReasonCode string `json:"rejection_reason_code"`
320320

321321
// Moderator's comment
322322
VerificationComment string `json:"verification_comment"`
323323

324324
// Issue date
325-
IssueDate time.Time `json:"issue_data"`
325+
IssueDate time.Time `json:"issue_date"`
326326

327327
// Expire date
328328
ExpireDate time.Time `json:"expire_date"`

‎ozon/certificates_test.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ func TestListOfAccordanceTypes(t *testing.T) {
5656
resp, err := c.Certificates().ListOfAccordanceTypes(ctx)
5757
if err != nil {
5858
t.Error(err)
59+
continue
5960
}
6061

62+
compareJsonResponse(t, test.response, &ListOfAccordanceTypesResponse{})
63+
6164
if resp.StatusCode != test.statusCode {
6265
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
6366
}
@@ -119,8 +122,11 @@ func TestDirectoryOfDocumentTypes(t *testing.T) {
119122
resp, err := c.Certificates().DirectoryOfDocumentTypes(ctx)
120123
if err != nil {
121124
t.Error(err)
125+
continue
122126
}
123127

128+
compareJsonResponse(t, test.response, &DirectoryOfDocumentTypesResponse{})
129+
124130
if resp.StatusCode != test.statusCode {
125131
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
126132
}
@@ -175,8 +181,11 @@ func TestListOfCertifiedCategories(t *testing.T) {
175181
resp, err := c.Certificates().ListOfCertifiedCategories(ctx, test.params)
176182
if err != nil {
177183
t.Error(err)
184+
continue
178185
}
179186

187+
compareJsonResponse(t, test.response, &ListOfCertifiedCategoriesResponse{})
188+
180189
if resp.StatusCode != test.statusCode {
181190
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
182191
}
@@ -223,8 +232,11 @@ func TestLinkCertificateToProduct(t *testing.T) {
223232
resp, err := c.Certificates().LinkToProduct(ctx, test.params)
224233
if err != nil {
225234
t.Error(err)
235+
continue
226236
}
227237

238+
compareJsonResponse(t, test.response, &LinkCertificateToProductResponse{})
239+
228240
if resp.StatusCode != test.statusCode {
229241
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
230242
}
@@ -273,8 +285,11 @@ func TestDeleteCertificate(t *testing.T) {
273285
resp, err := c.Certificates().Delete(ctx, test.params)
274286
if err != nil {
275287
t.Error(err)
288+
continue
276289
}
277290

291+
compareJsonResponse(t, test.response, &DeleteCertificateResponse{})
292+
278293
if resp.StatusCode != test.statusCode {
279294
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
280295
}
@@ -332,8 +347,11 @@ func TestGetCertificateInfo(t *testing.T) {
332347
resp, err := c.Certificates().GetInfo(ctx, test.params)
333348
if err != nil {
334349
t.Error(err)
350+
continue
335351
}
336352

353+
compareJsonResponse(t, test.response, &GetCertificateInfoResponse{})
354+
337355
if resp.StatusCode != test.statusCode {
338356
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
339357
}
@@ -406,8 +424,11 @@ func TestListCertificates(t *testing.T) {
406424
resp, err := c.Certificates().List(ctx, test.params)
407425
if err != nil {
408426
t.Error(err)
427+
continue
409428
}
410429

430+
compareJsonResponse(t, test.response, &ListCertificatesResponse{})
431+
411432
if resp.StatusCode != test.statusCode {
412433
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
413434
}
@@ -453,8 +474,11 @@ func TestProductStatuses(t *testing.T) {
453474
resp, err := c.Certificates().ProductStatuses(ctx)
454475
if err != nil {
455476
t.Error(err)
477+
continue
456478
}
457479

480+
compareJsonResponse(t, test.response, &ProductStatusesResponse{})
481+
458482
if resp.StatusCode != test.statusCode {
459483
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
460484
}
@@ -511,8 +535,11 @@ func TestListProductsForCertificate(t *testing.T) {
511535
resp, err := c.Certificates().ListProductsForCertificate(ctx, test.params)
512536
if err != nil {
513537
t.Error(err)
538+
continue
514539
}
515540

541+
compareJsonResponse(t, test.response, &ListProductsForCertificateResponse{})
542+
516543
if resp.StatusCode != test.statusCode {
517544
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
518545
}
@@ -565,8 +592,11 @@ func TestUnlinkFromProduct(t *testing.T) {
565592
resp, err := c.Certificates().UnlinkFromProduct(ctx, test.params)
566593
if err != nil {
567594
t.Error(err)
595+
continue
568596
}
569597

598+
compareJsonResponse(t, test.response, &UnlinkFromProductResponse{})
599+
570600
if resp.StatusCode != test.statusCode {
571601
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
572602
}
@@ -612,8 +642,11 @@ func TestPossibleRejectReasons(t *testing.T) {
612642
resp, err := c.Certificates().PossibleRejectReasons(ctx)
613643
if err != nil {
614644
t.Error(err)
645+
continue
615646
}
616647

648+
compareJsonResponse(t, test.response, &PossibleRejectReasonsResponse{})
649+
617650
if resp.StatusCode != test.statusCode {
618651
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
619652
}
@@ -659,8 +692,11 @@ func TestPossibleStatuses(t *testing.T) {
659692
resp, err := c.Certificates().PossibleStatuses(ctx)
660693
if err != nil {
661694
t.Error(err)
695+
continue
662696
}
663697

698+
compareJsonResponse(t, test.response, &PossibleStatusesResponse{})
699+
664700
if resp.StatusCode != test.statusCode {
665701
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
666702
}
@@ -712,8 +748,11 @@ func TestAddCertificatesForProducts(t *testing.T) {
712748
resp, err := c.Certificates().AddForProducts(ctx, test.params)
713749
if err != nil {
714750
t.Error(err)
751+
continue
715752
}
716753

754+
compareJsonResponse(t, test.response, &AddCertificatesForProductsResponse{})
755+
717756
if resp.StatusCode != test.statusCode {
718757
t.Errorf("got wrong status code: got: %d, expected: %d", resp.StatusCode, test.statusCode)
719758
}

0 commit comments

Comments
 (0)