Skip to content

Commit b5d2607

Browse files
committed
replace should.Equal(nil, err) with should.NoError(err)
1 parent 48cc4d9 commit b5d2607

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

jsoniter_bool_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,22 @@ func Test_bool_can_be_null(t *testing.T) {
9292
obj := TestData{}
9393
data1 := []byte(`{"field": true}`)
9494
err := Unmarshal(data1, &obj)
95-
should.Equal(nil, err)
95+
should.NoError(err)
9696
should.Equal(true, obj.Field)
9797

9898
data2 := []byte(`{"field": null}`)
9999
err = Unmarshal(data2, &obj)
100-
should.Equal(nil, err)
100+
should.NoError(err)
101101
// Same behavior as stdlib, not touching the existing value.
102102
should.Equal(true, obj.Field)
103103

104104
// Checking stdlib behavior as well
105105
obj2 := TestData{}
106106
err = json.Unmarshal(data1, &obj2)
107-
should.Equal(nil, err)
107+
should.NoError(err)
108108
should.Equal(true, obj2.Field)
109109

110110
err = json.Unmarshal(data2, &obj2)
111-
should.Equal(nil, err)
111+
should.NoError(err)
112112
should.Equal(true, obj2.Field)
113113
}

jsoniter_enum_marshaler_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ func Test_custom_marshaler_on_enum(t *testing.T) {
4040
w := Wrapper{Payload: MyEnumB}
4141

4242
jb, err := Marshal(w)
43-
should.Equal(nil, err)
43+
should.NoError(err)
4444
should.Equal(`{"Payload":"foo-1"}`, string(jb))
4545

4646
var w2 Wrapper2
4747
err = Unmarshal(jb, &w2)
48-
should.Equal(nil, err)
48+
should.NoError(err)
4949
should.Equal(MyEnumB, w2.Payload)
5050
}

jsoniter_interface_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ func Test_nil_out_null_interface(t *testing.T) {
329329
data1 := []byte(`{"field": true}`)
330330

331331
err := Unmarshal(data1, &obj)
332-
should.Equal(nil, err)
332+
should.NoError(err)
333333
should.Equal(true, *(obj.Field.(*bool)))
334334

335335
data2 := []byte(`{"field": null}`)
336336

337337
err = Unmarshal(data2, &obj)
338-
should.Equal(nil, err)
338+
should.NoError(err)
339339
should.Equal(nil, obj.Field)
340340

341341
// Checking stdlib behavior matches.
@@ -344,11 +344,11 @@ func Test_nil_out_null_interface(t *testing.T) {
344344
}
345345

346346
err = json.Unmarshal(data1, &obj2)
347-
should.Equal(nil, err)
347+
should.NoError(err)
348348
should.Equal(true, *(obj2.Field.(*bool)))
349349

350350
err = json.Unmarshal(data2, &obj2)
351-
should.Equal(nil, err)
351+
should.NoError(err)
352352
should.Equal(nil, obj2.Field)
353353
}
354354

@@ -363,11 +363,11 @@ func Test_omitempty_nil_interface(t *testing.T) {
363363
}
364364

365365
js, err := json.Marshal(obj)
366-
should.Equal(nil, err)
366+
should.NoError(err)
367367
should.Equal("{}", string(js))
368368

369369
str, err := MarshalToString(obj)
370-
should.Equal(nil, err)
370+
should.NoError(err)
371371
should.Equal(string(js), str)
372372
}
373373

@@ -382,16 +382,16 @@ func Test_omitempty_nil_nonempty_interface(t *testing.T) {
382382
}
383383

384384
js, err := json.Marshal(obj)
385-
should.Equal(nil, err)
385+
should.NoError(err)
386386
should.Equal("{}", string(js))
387387

388388
str, err := MarshalToString(obj)
389-
should.Equal(nil, err)
389+
should.NoError(err)
390390
should.Equal(string(js), str)
391391

392392
obj.Field = MyString("hello")
393393
err = UnmarshalFromString(`{"field":null}`, &obj)
394-
should.Equal(nil, err)
394+
should.NoError(err)
395395
should.Equal(nil, obj.Field)
396396
}
397397

@@ -406,11 +406,11 @@ func Test_marshal_nil_marshaler_interface(t *testing.T) {
406406
}
407407

408408
js, err := json.Marshal(obj)
409-
should.Equal(nil, err)
409+
should.NoError(err)
410410
should.Equal(`{"field":null}`, string(js))
411411

412412
str, err := MarshalToString(obj)
413-
should.Equal(nil, err)
413+
should.NoError(err)
414414
should.Equal(string(js), str)
415415
}
416416

@@ -425,15 +425,15 @@ func Test_marshal_nil_nonempty_interface(t *testing.T) {
425425
}
426426

427427
js, err := json.Marshal(obj)
428-
should.Equal(nil, err)
428+
should.NoError(err)
429429
should.Equal(`{"field":null}`, string(js))
430430

431431
str, err := MarshalToString(obj)
432-
should.Equal(nil, err)
432+
should.NoError(err)
433433
should.Equal(string(js), str)
434434

435435
obj.Field = MyString("hello")
436436
err = Unmarshal(js, &obj)
437-
should.Equal(nil, err)
437+
should.NoError(err)
438438
should.Equal(nil, obj.Field)
439439
}

0 commit comments

Comments
 (0)