From 5d3f46b58f90fc76b2cf5a54bcb25956f1b36492 Mon Sep 17 00:00:00 2001 From: Mark Asp Date: Fri, 18 Sep 2020 09:00:40 -0500 Subject: [PATCH] Move test to nbt_test.go & don't ignore errors --- nbt/marshal.go | 9 +- nbt/marshal_test.go | 77 --------------- nbt/nbt_test.go | 236 ++++++++++++++++++++++++-------------------- 3 files changed, 135 insertions(+), 187 deletions(-) diff --git a/nbt/marshal.go b/nbt/marshal.go index 0f2532d..1fcb384 100644 --- a/nbt/marshal.go +++ b/nbt/marshal.go @@ -38,10 +38,11 @@ func (e *Encoder) Encode(v interface{}) error { return e.marshal(val, getTagType(val.Type()), "") } -func (e *Encoder) marshal(val reflect.Value, tagType byte, tagName string) (err error) { - err = e.writeHeader(val, tagType, tagName) - err = e.writeValue(val, tagType) - return err +func (e *Encoder) marshal(val reflect.Value, tagType byte, tagName string) error { + if err := e.writeHeader(val, tagType, tagName); err != nil { + return err + } + return e.writeValue(val, tagType) } func (e *Encoder) writeHeader(val reflect.Value, tagType byte, tagName string) (err error) { diff --git a/nbt/marshal_test.go b/nbt/marshal_test.go index 75b4fbb..8e275d6 100644 --- a/nbt/marshal_test.go +++ b/nbt/marshal_test.go @@ -2,7 +2,6 @@ package nbt import ( "bytes" - "io/ioutil" "math" "testing" ) @@ -167,79 +166,3 @@ func TestMarshal_StructArray(t *testing.T) { }) } } - - -// This test is for compliance with the "bigtest.dat" described in detail here: -// https://wiki.vg/NBT#bigtest.nbt -func TestMarshal_BigTest(t *testing.T) { - byteValues := make([]byte, 1000) - for n := 0; n < 1000; n++ { - byteValues[n] = byte((n*n*255 + n*7) % 100) - } - - type NestedCompound struct { - Name string `nbt:"name"` - Value float32 `nbt:"value"` - } - - type NestedCompoundCont struct { - Ham NestedCompound `nbt:"ham"` - Egg NestedCompound `nbt:"egg"` - } - - type ListCompound struct { - Name string `nbt:"name"` - CreatedOn int64 `nbt:"created-on"` - } - - val := struct { - LongTest int64 `nbt:"longTest"` - ShortTest int16 `nbt:"shortTest"` - StringTest string `nbt:"stringTest"` - FloatTest float32 `nbt:"floatTest"` - IntTest int32 `nbt:"intTest"` - NestedCompoundTest NestedCompoundCont `nbt:"nested compound test"` - ListTestLong []int64 `nbt:"listTest (long)" nbt_type:"noarray"` - ListTestCompound []ListCompound `nbt:"listTest (compound)"` - ByteTest byte `nbt:"byteTest"` - ByteArrayTest []byte `nbt:"byteArrayTest (the first 1000 values of (n*n*255+n*7)%100, starting with n=0 (0, 62, 34, 16, 8, ...))"` - DoubleTest float64 `nbt:"doubleTest"` - }{ - LongTest: 9223372036854775807, - ShortTest: 32767, - StringTest: "HELLO WORLD THIS IS A TEST STRING \xc3\x85\xc3\x84\xc3\x96!", - FloatTest: 0.49823147058486938, - IntTest: 2147483647, - NestedCompoundTest: NestedCompoundCont{ - NestedCompound{"Hampus", 0.75}, - NestedCompound{"Eggbert", 0.5}, - }, - ListTestLong: []int64{11, 12, 13, 14, 15}, - ListTestCompound: []ListCompound{ - {"Compound tag #0", 1264099775885}, - {"Compound tag #1", 1264099775885}, - }, - ByteTest: 127, - ByteArrayTest: byteValues, - DoubleTest: 0.49312871321823148, - } - - var b bytes.Buffer - err := MarshalCompound(&b, val, "Level") - if err != nil { - t.Error(err) - } - - want, err := ioutil.ReadFile("bigtest.nbt") - if err != nil { - t.Error(err) - } - - err = ioutil.WriteFile("bigtest_got.nbt", b.Bytes(), 0644) - if err != nil { - t.Error(err) - } - if !bytes.Equal(b.Bytes(), want) { - t.Errorf("got:\n[% 2x]\nwant:\n[% 2x]", b.Bytes(), want) - } -} diff --git a/nbt/nbt_test.go b/nbt/nbt_test.go index 4132892..5cc4f7e 100644 --- a/nbt/nbt_test.go +++ b/nbt/nbt_test.go @@ -3,6 +3,7 @@ package nbt import ( "bytes" "compress/gzip" + "io/ioutil" "reflect" "testing" ) @@ -60,111 +61,102 @@ func TestUnmarshal_simple(t *testing.T) { } } -func TestUnmarshal_bitTest(t *testing.T) { - // Generated by vscode-hexdump - data := []byte{ - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xed, 0x54, 0xcf, 0x4f, 0x1a, 0x41, - 0x14, 0x7e, 0xc2, 0x02, 0xcb, 0x96, 0x82, 0xb1, - 0xc4, 0x10, 0x63, 0xcc, 0xab, 0xb5, 0x84, 0xa5, - 0xdb, 0xcd, 0x42, 0x11, 0x89, 0xb1, 0x88, 0x16, - 0x2c, 0x9a, 0x0d, 0x1a, 0xd8, 0xa8, 0x31, 0x86, - 0xb8, 0x2b, 0xc3, 0x82, 0x2e, 0xbb, 0x66, 0x77, - 0xb0, 0xf1, 0xd4, 0x4b, 0x7b, 0x6c, 0x7a, 0xeb, - 0x3f, 0xd3, 0x23, 0x7f, 0x43, 0xcf, 0xbd, 0xf6, - 0xbf, 0xa0, 0xc3, 0x2f, 0x7b, 0x69, 0xcf, 0xbd, - 0xf0, 0x32, 0xc9, 0xf7, 0xe6, 0xbd, 0x6f, 0xe6, - 0x7b, 0x6f, 0x26, 0x79, 0x02, 0x04, 0x54, 0x72, - 0x4f, 0x2c, 0x0e, 0x78, 0xcb, 0xb1, 0x4d, 0x8d, - 0x78, 0xf4, 0xe3, 0x70, 0x62, 0x3e, 0x08, 0x7b, - 0x1d, 0xc7, 0xa5, 0x93, 0x18, 0x0f, 0x82, 0x47, - 0xdd, 0xee, 0x84, 0x02, 0x62, 0xb5, 0xa2, 0xaa, - 0xc7, 0x78, 0x76, 0x5c, 0x57, 0xcb, 0xa8, 0x55, - 0x0f, 0x1b, 0xc8, 0xd6, 0x1e, 0x6a, 0x95, 0x86, - 0x86, 0x0d, 0xad, 0x7e, 0x58, 0x7b, 0x8f, 0x83, - 0xcf, 0x83, 0x4f, 0x83, 0x6f, 0xcf, 0x03, 0x10, - 0x6e, 0x5b, 0x8e, 0x3e, 0xbe, 0xa5, 0x38, 0x4c, - 0x64, 0xfd, 0x10, 0xea, 0xda, 0x74, 0xa6, 0x23, - 0x40, 0xdc, 0x66, 0x2e, 0x69, 0xe1, 0xb5, 0xd3, - 0xbb, 0x73, 0xfa, 0x76, 0x0b, 0x29, 0xdb, 0x0b, - 0xe0, 0xef, 0xe8, 0x3d, 0x1e, 0x38, 0x5b, 0xef, - 0x11, 0x08, 0x56, 0xf5, 0xde, 0x5d, 0xdf, 0x0b, - 0x40, 0xe0, 0x5e, 0xb7, 0xfa, 0x64, 0xb7, 0x04, - 0x00, 0x8c, 0x41, 0x4c, 0x73, 0xc6, 0x08, 0x55, - 0x4c, 0xd3, 0x20, 0x2e, 0x7d, 0xa4, 0xc0, 0xc8, - 0xc2, 0x10, 0xb3, 0xba, 0xde, 0x58, 0x0b, 0x53, - 0xa3, 0xee, 0x44, 0x8e, 0x45, 0x03, 0x30, 0xb1, - 0x27, 0x53, 0x8c, 0x4c, 0xf1, 0xe9, 0x14, 0xa3, - 0x53, 0x8c, 0x85, 0xe1, 0xd9, 0x9f, 0xe3, 0xb3, - 0xf2, 0x44, 0x81, 0xa5, 0x7c, 0x33, 0xdd, 0xd8, - 0xbb, 0xc7, 0xaa, 0x75, 0x13, 0x5f, 0x28, 0x1c, - 0x08, 0xd7, 0x2e, 0xd1, 0x59, 0x3f, 0xaf, 0x1d, - 0x1b, 0x60, 0x21, 0x59, 0xdf, 0xfa, 0xf1, 0x05, - 0xfe, 0xc1, 0xce, 0xfc, 0x9d, 0xbd, 0x00, 0xbc, - 0xf1, 0x40, 0xc9, 0xf8, 0x85, 0x42, 0x40, 0x46, - 0xfe, 0x9e, 0xeb, 0xea, 0x0f, 0x93, 0x3a, 0x68, - 0x87, 0x60, 0xbb, 0xeb, 0x32, 0x37, 0xa3, 0x28, - 0x0a, 0x8e, 0xbb, 0xf5, 0xd0, 0x69, 0x63, 0xca, - 0x4e, 0xdb, 0xe9, 0xec, 0xe6, 0xe6, 0x2b, 0x3b, - 0xbd, 0x25, 0xbe, 0x64, 0x49, 0x09, 0x3d, 0xaa, - 0xbb, 0x94, 0xfd, 0x18, 0x7e, 0xe8, 0xd2, 0x0e, - 0xda, 0x6f, 0x15, 0x4c, 0xb1, 0x68, 0x3e, 0x2b, - 0xe1, 0x9b, 0x9c, 0x84, 0x99, 0xbc, 0x84, 0x05, - 0x09, 0x65, 0x59, 0x16, 0x45, 0x00, 0xff, 0x2f, - 0x28, 0xae, 0x2f, 0xf2, 0xc2, 0xb2, 0xa4, 0x2e, - 0x1d, 0x20, 0x77, 0x5a, 0x3b, 0xb9, 0x8c, 0xca, - 0xe7, 0x29, 0xdf, 0x51, 0x41, 0xc9, 0x16, 0xb5, - 0xc5, 0x6d, 0xa1, 0x2a, 0xad, 0x2c, 0xc5, 0x31, - 0x7f, 0xba, 0x7a, 0x92, 0x8e, 0x5e, 0x9d, 0x5f, - 0xf8, 0x12, 0x05, 0x23, 0x1b, 0xd1, 0xf6, 0xb7, - 0x77, 0xaa, 0xcd, 0x95, 0x72, 0xbc, 0x9e, 0xdf, - 0x58, 0x5d, 0x4b, 0x97, 0xae, 0x92, 0x17, 0xb9, - 0x44, 0xd0, 0x80, 0xc8, 0xfa, 0x3e, 0xbf, 0xb3, - 0xdc, 0x54, 0xcb, 0x07, 0x75, 0x6e, 0xa3, 0xb6, - 0x76, 0x59, 0x92, 0x93, 0xa9, 0xdc, 0x51, 0x50, - 0x99, 0x6b, 0xcc, 0x35, 0xe6, 0x1a, 0xff, 0x57, - 0x23, 0x08, 0x42, 0xcb, 0xe9, 0x1b, 0xd6, 0x78, - 0xc2, 0xec, 0xfe, 0xfc, 0x7a, 0xfb, 0x7d, 0x78, - 0xd3, 0x84, 0xdf, 0xd4, 0xf2, 0xa4, 0xfb, 0x08, - 0x06, 0x00, 0x00, - } +// Generated by vscode-hexdump +var bigTestData = [...]byte{ + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xed, 0x54, 0xcf, 0x4f, 0x1a, 0x41, + 0x14, 0x7e, 0xc2, 0x02, 0xcb, 0x96, 0x82, 0xb1, + 0xc4, 0x10, 0x63, 0xcc, 0xab, 0xb5, 0x84, 0xa5, + 0xdb, 0xcd, 0x42, 0x11, 0x89, 0xb1, 0x88, 0x16, + 0x2c, 0x9a, 0x0d, 0x1a, 0xd8, 0xa8, 0x31, 0x86, + 0xb8, 0x2b, 0xc3, 0x82, 0x2e, 0xbb, 0x66, 0x77, + 0xb0, 0xf1, 0xd4, 0x4b, 0x7b, 0x6c, 0x7a, 0xeb, + 0x3f, 0xd3, 0x23, 0x7f, 0x43, 0xcf, 0xbd, 0xf6, + 0xbf, 0xa0, 0xc3, 0x2f, 0x7b, 0x69, 0xcf, 0xbd, + 0xf0, 0x32, 0xc9, 0xf7, 0xe6, 0xbd, 0x6f, 0xe6, + 0x7b, 0x6f, 0x26, 0x79, 0x02, 0x04, 0x54, 0x72, + 0x4f, 0x2c, 0x0e, 0x78, 0xcb, 0xb1, 0x4d, 0x8d, + 0x78, 0xf4, 0xe3, 0x70, 0x62, 0x3e, 0x08, 0x7b, + 0x1d, 0xc7, 0xa5, 0x93, 0x18, 0x0f, 0x82, 0x47, + 0xdd, 0xee, 0x84, 0x02, 0x62, 0xb5, 0xa2, 0xaa, + 0xc7, 0x78, 0x76, 0x5c, 0x57, 0xcb, 0xa8, 0x55, + 0x0f, 0x1b, 0xc8, 0xd6, 0x1e, 0x6a, 0x95, 0x86, + 0x86, 0x0d, 0xad, 0x7e, 0x58, 0x7b, 0x8f, 0x83, + 0xcf, 0x83, 0x4f, 0x83, 0x6f, 0xcf, 0x03, 0x10, + 0x6e, 0x5b, 0x8e, 0x3e, 0xbe, 0xa5, 0x38, 0x4c, + 0x64, 0xfd, 0x10, 0xea, 0xda, 0x74, 0xa6, 0x23, + 0x40, 0xdc, 0x66, 0x2e, 0x69, 0xe1, 0xb5, 0xd3, + 0xbb, 0x73, 0xfa, 0x76, 0x0b, 0x29, 0xdb, 0x0b, + 0xe0, 0xef, 0xe8, 0x3d, 0x1e, 0x38, 0x5b, 0xef, + 0x11, 0x08, 0x56, 0xf5, 0xde, 0x5d, 0xdf, 0x0b, + 0x40, 0xe0, 0x5e, 0xb7, 0xfa, 0x64, 0xb7, 0x04, + 0x00, 0x8c, 0x41, 0x4c, 0x73, 0xc6, 0x08, 0x55, + 0x4c, 0xd3, 0x20, 0x2e, 0x7d, 0xa4, 0xc0, 0xc8, + 0xc2, 0x10, 0xb3, 0xba, 0xde, 0x58, 0x0b, 0x53, + 0xa3, 0xee, 0x44, 0x8e, 0x45, 0x03, 0x30, 0xb1, + 0x27, 0x53, 0x8c, 0x4c, 0xf1, 0xe9, 0x14, 0xa3, + 0x53, 0x8c, 0x85, 0xe1, 0xd9, 0x9f, 0xe3, 0xb3, + 0xf2, 0x44, 0x81, 0xa5, 0x7c, 0x33, 0xdd, 0xd8, + 0xbb, 0xc7, 0xaa, 0x75, 0x13, 0x5f, 0x28, 0x1c, + 0x08, 0xd7, 0x2e, 0xd1, 0x59, 0x3f, 0xaf, 0x1d, + 0x1b, 0x60, 0x21, 0x59, 0xdf, 0xfa, 0xf1, 0x05, + 0xfe, 0xc1, 0xce, 0xfc, 0x9d, 0xbd, 0x00, 0xbc, + 0xf1, 0x40, 0xc9, 0xf8, 0x85, 0x42, 0x40, 0x46, + 0xfe, 0x9e, 0xeb, 0xea, 0x0f, 0x93, 0x3a, 0x68, + 0x87, 0x60, 0xbb, 0xeb, 0x32, 0x37, 0xa3, 0x28, + 0x0a, 0x8e, 0xbb, 0xf5, 0xd0, 0x69, 0x63, 0xca, + 0x4e, 0xdb, 0xe9, 0xec, 0xe6, 0xe6, 0x2b, 0x3b, + 0xbd, 0x25, 0xbe, 0x64, 0x49, 0x09, 0x3d, 0xaa, + 0xbb, 0x94, 0xfd, 0x18, 0x7e, 0xe8, 0xd2, 0x0e, + 0xda, 0x6f, 0x15, 0x4c, 0xb1, 0x68, 0x3e, 0x2b, + 0xe1, 0x9b, 0x9c, 0x84, 0x99, 0xbc, 0x84, 0x05, + 0x09, 0x65, 0x59, 0x16, 0x45, 0x00, 0xff, 0x2f, + 0x28, 0xae, 0x2f, 0xf2, 0xc2, 0xb2, 0xa4, 0x2e, + 0x1d, 0x20, 0x77, 0x5a, 0x3b, 0xb9, 0x8c, 0xca, + 0xe7, 0x29, 0xdf, 0x51, 0x41, 0xc9, 0x16, 0xb5, + 0xc5, 0x6d, 0xa1, 0x2a, 0xad, 0x2c, 0xc5, 0x31, + 0x7f, 0xba, 0x7a, 0x92, 0x8e, 0x5e, 0x9d, 0x5f, + 0xf8, 0x12, 0x05, 0x23, 0x1b, 0xd1, 0xf6, 0xb7, + 0x77, 0xaa, 0xcd, 0x95, 0x72, 0xbc, 0x9e, 0xdf, + 0x58, 0x5d, 0x4b, 0x97, 0xae, 0x92, 0x17, 0xb9, + 0x44, 0xd0, 0x80, 0xc8, 0xfa, 0x3e, 0xbf, 0xb3, + 0xdc, 0x54, 0xcb, 0x07, 0x75, 0x6e, 0xa3, 0xb6, + 0x76, 0x59, 0x92, 0x93, 0xa9, 0xdc, 0x51, 0x50, + 0x99, 0x6b, 0xcc, 0x35, 0xe6, 0x1a, 0xff, 0x57, + 0x23, 0x08, 0x42, 0xcb, 0xe9, 0x1b, 0xd6, 0x78, + 0xc2, 0xec, 0xfe, 0xfc, 0x7a, 0xfb, 0x7d, 0x78, + 0xd3, 0x84, 0xdf, 0xd4, 0xf2, 0xa4, 0xfb, 0x08, + 0x06, 0x00, 0x00, +} - type BitTestStruct struct { - NCT struct { - Egg struct { - Name string `nbt:"name"` - Value float32 `nbt:"value"` - } `nbt:"egg"` - Ham struct { - Name string `nbt:"name"` - Value float32 `nbt:"value"` - } `nbt:"ham"` - } `nbt:"nested compound test"` - IntTest int `nbt:"intTest"` - ByteTest byte `nbt:"byteTest"` - StringTest string `nbt:"stringTest"` - ListTest []int64 `nbt:"listTest (long)"` - DoubleTest float64 `nbt:"doubleTest"` - LongTest int64 `nbt:"longTest"` - ListTest2 [2]struct { - CreatedOn int64 `nbt:"created-on"` - Name string `nbt:"name"` - } `nbt:"listTest (compound)"` - ByteArrayTest []byte `nbt:"byteArrayTest (the first 1000 values of (n*n*255+n*7)%100, starting with n=0 (0, 62, 34, 16, 8, ...))"` - ShortTest int16 `nbt:"shortTest"` - } +type BigTestStruct struct { + LongTest int64 `nbt:"longTest"` + ShortTest int16 `nbt:"shortTest"` + StringTest string `nbt:"stringTest"` + FloatTest float32 `nbt:"floatTest"` + IntTest int32 `nbt:"intTest"` + NCT struct { + Ham struct { + Name string `nbt:"name"` + Value float32 `nbt:"value"` + } `nbt:"ham"` + Egg struct { + Name string `nbt:"name"` + Value float32 `nbt:"value"` + } `nbt:"egg"` + } `nbt:"nested compound test"` + ListTest []int64 `nbt:"listTest (long)" nbt_type:"noarray"` + ListTest2 [2]struct { + Name string `nbt:"name"` + CreatedOn int64 `nbt:"created-on"` + } `nbt:"listTest (compound)"` + ByteTest byte `nbt:"byteTest"` + ByteArrayTest []byte `nbt:"byteArrayTest (the first 1000 values of (n*n*255+n*7)%100, starting with n=0 (0, 62, 34, 16, 8, ...))"` + DoubleTest float64 `nbt:"doubleTest"` +} - //test parse - var value BitTestStruct - r, err := gzip.NewReader(bytes.NewReader(data)) - if err != nil { - t.Fatal(err) - } - if err := NewDecoder(r).Decode(&value); err != nil { - t.Fatal(err) - } - - var want BitTestStruct +func MakeBigTestStruct() BigTestStruct { + var want BigTestStruct want.NCT.Egg.Name = "Eggbert" want.NCT.Egg.Value = 0.5 want.NCT.Ham.Name = "Hampus" @@ -174,6 +166,7 @@ func TestUnmarshal_bitTest(t *testing.T) { want.StringTest = "HELLO WORLD THIS IS A TEST STRING \xc3\x85\xc3\x84\xc3\x96!" want.ListTest = []int64{11, 12, 13, 14, 15} want.DoubleTest = 0.49312871321823148 + want.FloatTest = 0.49823147058486938 want.LongTest = 9223372036854775807 want.ListTest2[0].CreatedOn = 1264099775885 want.ListTest2[0].Name = "Compound tag #0" @@ -184,14 +177,28 @@ func TestUnmarshal_bitTest(t *testing.T) { want.ByteArrayTest[n] = byte((n*n*255 + n*7) % 100) } want.ShortTest = 32767 + return want +} +func TestUnmarshal_bigTest(t *testing.T) { + //test parse + var value BigTestStruct + r, err := gzip.NewReader(bytes.NewReader(bigTestData[:])) + if err != nil { + t.Fatal(err) + } + if err := NewDecoder(r).Decode(&value); err != nil { + t.Fatal(err) + } + + want := MakeBigTestStruct() if !reflect.DeepEqual(value, want) { t.Errorf("parse fail, expect %v, get %v", want, value) } //test rawRead var empty struct{} - r, err = gzip.NewReader(bytes.NewReader(data)) + r, err = gzip.NewReader(bytes.NewReader(bigTestData[:])) if err != nil { t.Fatal(err) } @@ -199,9 +206,8 @@ func TestUnmarshal_bitTest(t *testing.T) { t.Fatal(err) } - //test unmarshal to interface{} var inf interface{} - r, err = gzip.NewReader(bytes.NewReader(data)) + r, err = gzip.NewReader(bytes.NewReader(bigTestData[:])) if err != nil { t.Fatal(err) } @@ -211,6 +217,24 @@ func TestUnmarshal_bitTest(t *testing.T) { // t.Log(inf) } +func TestMarshal_bigTest(t *testing.T) { + var b bytes.Buffer + err := MarshalCompound(&b, MakeBigTestStruct(), "Level") + if err != nil { + t.Error(err) + } + + rd, _ := gzip.NewReader(bytes.NewReader(bigTestData[:])) + want, err := ioutil.ReadAll(rd) + if err != nil { + t.Error(err) + } + + if !bytes.Equal(b.Bytes(), want) { + t.Errorf("got:\n[% 2x]\nwant:\n[% 2x]", b.Bytes(), want) + } +} + func TestUnmarshal_IntArray(t *testing.T) { data := []byte{ TagIntArray, 0, 0,