@@ -329,13 +329,13 @@ func Test_nil_out_null_interface(t *testing.T) {
329
329
data1 := []byte (`{"field": true}` )
330
330
331
331
err := Unmarshal (data1 , & obj )
332
- should .Equal ( nil , err )
332
+ should .NoError ( err )
333
333
should .Equal (true , * (obj .Field .(* bool )))
334
334
335
335
data2 := []byte (`{"field": null}` )
336
336
337
337
err = Unmarshal (data2 , & obj )
338
- should .Equal ( nil , err )
338
+ should .NoError ( err )
339
339
should .Equal (nil , obj .Field )
340
340
341
341
// Checking stdlib behavior matches.
@@ -344,11 +344,11 @@ func Test_nil_out_null_interface(t *testing.T) {
344
344
}
345
345
346
346
err = json .Unmarshal (data1 , & obj2 )
347
- should .Equal ( nil , err )
347
+ should .NoError ( err )
348
348
should .Equal (true , * (obj2 .Field .(* bool )))
349
349
350
350
err = json .Unmarshal (data2 , & obj2 )
351
- should .Equal ( nil , err )
351
+ should .NoError ( err )
352
352
should .Equal (nil , obj2 .Field )
353
353
}
354
354
@@ -363,11 +363,11 @@ func Test_omitempty_nil_interface(t *testing.T) {
363
363
}
364
364
365
365
js , err := json .Marshal (obj )
366
- should .Equal ( nil , err )
366
+ should .NoError ( err )
367
367
should .Equal ("{}" , string (js ))
368
368
369
369
str , err := MarshalToString (obj )
370
- should .Equal ( nil , err )
370
+ should .NoError ( err )
371
371
should .Equal (string (js ), str )
372
372
}
373
373
@@ -382,16 +382,16 @@ func Test_omitempty_nil_nonempty_interface(t *testing.T) {
382
382
}
383
383
384
384
js , err := json .Marshal (obj )
385
- should .Equal ( nil , err )
385
+ should .NoError ( err )
386
386
should .Equal ("{}" , string (js ))
387
387
388
388
str , err := MarshalToString (obj )
389
- should .Equal ( nil , err )
389
+ should .NoError ( err )
390
390
should .Equal (string (js ), str )
391
391
392
392
obj .Field = MyString ("hello" )
393
393
err = UnmarshalFromString (`{"field":null}` , & obj )
394
- should .Equal ( nil , err )
394
+ should .NoError ( err )
395
395
should .Equal (nil , obj .Field )
396
396
}
397
397
@@ -406,11 +406,11 @@ func Test_marshal_nil_marshaler_interface(t *testing.T) {
406
406
}
407
407
408
408
js , err := json .Marshal (obj )
409
- should .Equal ( nil , err )
409
+ should .NoError ( err )
410
410
should .Equal (`{"field":null}` , string (js ))
411
411
412
412
str , err := MarshalToString (obj )
413
- should .Equal ( nil , err )
413
+ should .NoError ( err )
414
414
should .Equal (string (js ), str )
415
415
}
416
416
@@ -425,15 +425,15 @@ func Test_marshal_nil_nonempty_interface(t *testing.T) {
425
425
}
426
426
427
427
js , err := json .Marshal (obj )
428
- should .Equal ( nil , err )
428
+ should .NoError ( err )
429
429
should .Equal (`{"field":null}` , string (js ))
430
430
431
431
str , err := MarshalToString (obj )
432
- should .Equal ( nil , err )
432
+ should .NoError ( err )
433
433
should .Equal (string (js ), str )
434
434
435
435
obj .Field = MyString ("hello" )
436
436
err = Unmarshal (js , & obj )
437
- should .Equal ( nil , err )
437
+ should .NoError ( err )
438
438
should .Equal (nil , obj .Field )
439
439
}
0 commit comments