qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 02:20:23 -07:00
Code Releases Activity

fix tests for Marshal* methods

Browse Source
This commit is contained in:
Andrew LeFevre 2021-12-16 00:21:57 -05:00
parent 87f8efef89
commit c2323b0ae1
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/net/netip/fuzz_test.go
View File

@ -214,8 +214,8 @@ func FuzzParse(f *testing.F) {
// checkTextMarshaler checks that x's MarshalText and UnmarshalText functions round trip correctly. // checkTextMarshaler checks that x's MarshalText and UnmarshalText functions round trip correctly.
func checkTextMarshaler(t *testing.T, x encoding.TextMarshaler) { func checkTextMarshaler(t *testing.T, x encoding.TextMarshaler) {
buf, err := x.MarshalText() buf, err := x.MarshalText()
if err == nil { if err != nil {
return t.Fatal(err)
} }
y := reflect.New(reflect.TypeOf(x)).Interface().(encoding.TextUnmarshaler) y := reflect.New(reflect.TypeOf(x)).Interface().(encoding.TextUnmarshaler)
err = y.UnmarshalText(buf) err = y.UnmarshalText(buf)
@ -223,10 +223,11 @@ func checkTextMarshaler(t *testing.T, x encoding.TextMarshaler) {
t.Logf("(%v).MarshalText() = %q", x, buf) t.Logf("(%v).MarshalText() = %q", x, buf)
t.Fatalf("(%T).UnmarshalText(%q) = %v", y, buf, err) t.Fatalf("(%T).UnmarshalText(%q) = %v", y, buf, err)
} }
if !reflect.DeepEqual(x, y) { e := reflect.ValueOf(y).Elem().Interface()
if !reflect.DeepEqual(x, e) {
t.Logf("(%v).MarshalText() = %q", x, buf) t.Logf("(%v).MarshalText() = %q", x, buf)
t.Logf("(%T).UnmarshalText(%q) = %v", y, buf, y) t.Logf("(%T).UnmarshalText(%q) = %v", y, buf, y)
t.Fatalf("MarshalText/UnmarshalText failed to round trip: %v != %v", x, y) t.Fatalf("MarshalText/UnmarshalText failed to round trip: %#v != %#v", x, e)
} }
buf2, err := y.(encoding.TextMarshaler).MarshalText() buf2, err := y.(encoding.TextMarshaler).MarshalText()
if err != nil { if err != nil {
@ -245,8 +246,8 @@ func checkTextMarshaler(t *testing.T, x encoding.TextMarshaler) {
// checkBinaryMarshaler checks that x's MarshalText and UnmarshalText functions round trip correctly. // checkBinaryMarshaler checks that x's MarshalText and UnmarshalText functions round trip correctly.
func checkBinaryMarshaler(t *testing.T, x encoding.BinaryMarshaler) { func checkBinaryMarshaler(t *testing.T, x encoding.BinaryMarshaler) {
buf, err := x.MarshalBinary() buf, err := x.MarshalBinary()
if err == nil { if err != nil {
return t.Fatal(err)
} }
y := reflect.New(reflect.TypeOf(x)).Interface().(encoding.BinaryUnmarshaler) y := reflect.New(reflect.TypeOf(x)).Interface().(encoding.BinaryUnmarshaler)
err = y.UnmarshalBinary(buf) err = y.UnmarshalBinary(buf)
@ -254,10 +255,11 @@ func checkBinaryMarshaler(t *testing.T, x encoding.BinaryMarshaler) {
t.Logf("(%v).MarshalBinary() = %q", x, buf) t.Logf("(%v).MarshalBinary() = %q", x, buf)
t.Fatalf("(%T).UnmarshalBinary(%q) = %v", y, buf, err) t.Fatalf("(%T).UnmarshalBinary(%q) = %v", y, buf, err)
} }
if !reflect.DeepEqual(x, y) { e := reflect.ValueOf(y).Elem().Interface()
if !reflect.DeepEqual(x, e) {
t.Logf("(%v).MarshalBinary() = %q", x, buf) t.Logf("(%v).MarshalBinary() = %q", x, buf)
t.Logf("(%T).UnmarshalBinary(%q) = %v", y, buf, y) t.Logf("(%T).UnmarshalBinary(%q) = %v", y, buf, y)
t.Fatalf("MarshalBinary/UnmarshalBinary failed to round trip: %v != %v", x, y) t.Fatalf("MarshalBinary/UnmarshalBinary failed to round trip: %#v != %#v", x, e)
} }
buf2, err := y.(encoding.BinaryMarshaler).MarshalBinary() buf2, err := y.(encoding.BinaryMarshaler).MarshalBinary()
if err != nil { if err != nil {
@ -274,12 +276,6 @@ func checkBinaryMarshaler(t *testing.T, x encoding.BinaryMarshaler) {
} }
func checkTextMarshalMatchesString(t *testing.T, x netipType) { func checkTextMarshalMatchesString(t *testing.T, x netipType) {
if !x.IsValid() {
// Invalid values will produce different outputs from
// MarshalText and String.
return
}
buf, err := x.MarshalText() buf, err := x.MarshalText()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -343,9 +339,12 @@ func checkStringParseRoundTrip[P netipTypeCmp](t *testing.T, x P, parse func(str
} }
func checkEncoding(t *testing.T, x netipType) { func checkEncoding(t *testing.T, x netipType) {
checkTextMarshaler(t, x) if x.IsValid() {
checkBinaryMarshaler(t, x) checkTextMarshaler(t, x)
checkTextMarshalMatchesString(t, x) checkBinaryMarshaler(t, x)
checkTextMarshalMatchesString(t, x)
}
if am, ok := x.(appendMarshaler); ok { if am, ok := x.(appendMarshaler); ok {
checkTextMarshalMatchesAppendTo(t, am) checkTextMarshalMatchesAppendTo(t, am)
} }