Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding/json: cleanup tests

Browse source 
Perform minor cleanups in tests to improve printout of diffs
and/or follow modern coding style.

This reduces the amount of diffs between v1 and the v2 prototype.

Change-Id: I019bb9642e2135f2fa3eac6abfa6df91c397aa82
Reviewed-on: https://go-review.googlesource.com/c/go/+/642257
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Joseph Tsai <joetsai@digital-static.net>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Joe Tsai 2025-01-14 12:43:27 -08:00 • committed by Joseph Tsai
parent bd80d8956f
commit 368a9ec998
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/encoding/json/decode_test.go
View file

@ -1321,7 +1321,7 @@ func TestUnmarshal(t *testing.T) {
var scan scanner
if err := checkValid(in, &scan); err != nil {
if !equalError(err, tt.err) {
t.Fatalf("%s: checkValid error: %#v", tt.Where, err)
t.Fatalf("%s: checkValid error:\n\tgot %#v\n\twant %#v", tt.Where, err, tt.err)
}
}
if tt.ptr == nil {
@ -1355,7 +1355,7 @@ func TestUnmarshal(t *testing.T) {
dec.DisallowUnknownFields()
}
if err := dec.Decode(v.Interface()); !equalError(err, tt.err) {
t.Fatalf("%s: Decode error:\n\tgot: %#v\n\twant: %#v", tt.Where, err, tt.err)
t.Fatalf("%s: Decode error:\n\tgot: %v\n\twant: %v\n\n\tgot: %#v\n\twant: %#v", tt.Where, err, tt.err, err, tt.err)
} else if err != nil && tt.out == nil {
// Initialize tt.out during an error where there are no mutations,
// so the output is just the zero value of the input type.

10
src/encoding/json/stream_test.go
View file

@ -79,9 +79,9 @@ func TestEncoder(t *testing.T) {
t.Fatalf("#%d.%d Encode error: %v", i, j, err)
}
}
if have, want := buf.String(), nlines(streamEncoded, i); have != want {
if got, want := buf.String(), nlines(streamEncoded, i); got != want {
t.Errorf("encoding %d items: mismatch:", i)
diff(t, []byte(have), []byte(want))
diff(t, []byte(got), []byte(want))
break
}
}
@ -148,9 +148,9 @@ func TestEncoderIndent(t *testing.T) {
for _, v := range streamTest {
enc.Encode(v)
}
if have, want := buf.String(), streamEncodedIndent; have != want {
t.Error("Encode mismatch:")
diff(t, []byte(have), []byte(want))
if got, want := buf.String(), streamEncodedIndent; got != want {
t.Errorf("Encode mismatch:\ngot:\n%s\n\nwant:\n%s", got, want)
diff(t, []byte(got), []byte(want))
}
}

4
src/encoding/json/tags_test.go
View file

@ -4,9 +4,7 @@
package json
import (
"testing"
)
import "testing"
func TestTagParsing(t *testing.T) {
name, opts := parseTag("field,foobar,foo")