From 0e6d82b97165e9cdd294aaeac02bbbf26263877a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 16 Aug 2022 21:24:39 -0600 Subject: borrowed_decode_test.go: Do better checking of errors [ci-skip] --- compat/json/borrowed_decode_test.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/compat/json/borrowed_decode_test.go b/compat/json/borrowed_decode_test.go index ccee264..2c89d5d 100644 --- a/compat/json/borrowed_decode_test.go +++ b/compat/json/borrowed_decode_test.go @@ -1092,13 +1092,19 @@ func TestUnmarshal(t *testing.T) { for i, tt := range unmarshalTests { var scan scanner in := []byte(tt.in) - if err := checkValid(in, &scan); err != nil { - if !equalError(err, tt.err) { - t.Errorf("#%d: checkValid: %#v", i, err) - continue - } + var expSyntaxError error // MODIFIED: added + if _, ok := tt.err.(*SyntaxError); ok { // MODIFIED: added + expSyntaxError = tt.err // MODIFIED: added + } // MODIFIED: added + if err := checkValid(in, &scan); !equalError(err, expSyntaxError) { // MODIFIED: don't ignore cases where it returned nil but should have returned an error + t.Errorf("#%d: checkValid:\n got: %#v\nwant: %#v", i, err, expSyntaxError) // MODIFIED: show what the expected error was + continue } if tt.ptr == nil { + var val any // MODIFIED: added + if err := Unmarshal([]byte(tt.in), &val); !equalError(err, expSyntaxError) { // MODIFIED: added + t.Errorf("#%d: Unmarshal:\n got: %#v\nwant: %#v", i, err, expSyntaxError) // MODIFIED: added + } // MODIFIED: added continue } -- cgit v1.2.3-54-g00ecf