consolidate more tests

any_tests/jsoniter_any_object_test.go

@@ -106,3 +106,18 @@ func Test_any_within_struct(t *testing.T) {
 	should.Equal("hello", obj.Field1.ToString())
 	should.Equal("[1,2,3]", obj.Field2.ToString())
 }
+
+func Test_object_wrapper_any_get_all(t *testing.T) {
+	should := require.New(t)
+	type TestObject struct {
+		Field1 []int
+		Field2 []int
+	}
+	any := jsoniter.Wrap(TestObject{[]int{1, 2}, []int{3, 4}})
+	should.Contains(any.Get('*', 0).ToString(), `"Field2":3`)
+	should.Contains(any.Keys(), "Field1")
+	should.Contains(any.Keys(), "Field2")
+	should.NotContains(any.Keys(), "Field3")
+
+	//should.Contains(any.GetObject()["Field1"].GetArray()[0], 1)
+}

jsoniter_object_test.go

@@ -1,364 +0,0 @@
-package jsoniter
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func Test_empty_object(t *testing.T) {
-	should := require.New(t)
-	iter := ParseString(ConfigDefault, `{}`)
-	field := iter.ReadObject()
-	should.Equal("", field)
-	iter = ParseString(ConfigDefault, `{}`)
-	iter.ReadObjectCB(func(iter *Iterator, field string) bool {
-		should.FailNow("should not call")
-		return true
-	})
-}
-
-func Test_one_field(t *testing.T) {
-	should := require.New(t)
-	iter := ParseString(ConfigDefault, `{"a": "stream"}`)
-	field := iter.ReadObject()
-	should.Equal("a", field)
-	value := iter.ReadString()
-	should.Equal("stream", value)
-	field = iter.ReadObject()
-	should.Equal("", field)
-	iter = ParseString(ConfigDefault, `{"a": "stream"}`)
-	should.True(iter.ReadObjectCB(func(iter *Iterator, field string) bool {
-		should.Equal("a", field)
-		iter.Skip()
-		return true
-	}))
-
-}
-
-func Test_two_field(t *testing.T) {
-	should := require.New(t)
-	iter := ParseString(ConfigDefault, `{ "a": "stream" , "c": "d" }`)
-	field := iter.ReadObject()
-	should.Equal("a", field)
-	value := iter.ReadString()
-	should.Equal("stream", value)
-	field = iter.ReadObject()
-	should.Equal("c", field)
-	value = iter.ReadString()
-	should.Equal("d", value)
-	field = iter.ReadObject()
-	should.Equal("", field)
-	iter = ParseString(ConfigDefault, `{"field1": "1", "field2": 2}`)
-	for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
-		switch field {
-		case "field1":
-			iter.ReadString()
-		case "field2":
-			iter.ReadInt64()
-		default:
-			iter.ReportError("bind object", "unexpected field")
-		}
-	}
-}
-
-func Test_object_wrapper_any_get_all(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 []int
-		Field2 []int
-	}
-	any := Wrap(TestObject{[]int{1, 2}, []int{3, 4}})
-	should.Contains(any.Get('*', 0).ToString(), `"Field2":3`)
-	should.Contains(any.Keys(), "Field1")
-	should.Contains(any.Keys(), "Field2")
-	should.NotContains(any.Keys(), "Field3")
-
-	//should.Contains(any.GetObject()["Field1"].GetArray()[0], 1)
-}
-
-func Test_write_object(t *testing.T) {
-	should := require.New(t)
-	buf := &bytes.Buffer{}
-	stream := NewStream(Config{IndentionStep: 2}.Froze(), buf, 4096)
-	stream.WriteObjectStart()
-	stream.WriteObjectField("hello")
-	stream.WriteInt(1)
-	stream.WriteMore()
-	stream.WriteObjectField("world")
-	stream.WriteInt(2)
-	stream.WriteObjectEnd()
-	stream.Flush()
-	should.Nil(stream.Error)
-	should.Equal("{\n  \"hello\": 1,\n  \"world\": 2\n}", buf.String())
-}
-
-func Test_write_val_zero_field_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-	}
-	obj := TestObject{}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{}`, str)
-}
-
-func Test_write_val_one_field_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1"`
-	}
-	obj := TestObject{"hello"}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{"field-1":"hello"}`, str)
-}
-
-func Test_mixed(t *testing.T) {
-	should := require.New(t)
-	type AA struct {
-		ID      int                    `json:"id"`
-		Payload map[string]interface{} `json:"payload"`
-		buf     *bytes.Buffer
-	}
-	aa := AA{}
-	err := UnmarshalFromString(` {"id":1, "payload":{"account":"123","password":"456"}}`, &aa)
-	should.Nil(err)
-	should.Equal(1, aa.ID)
-	should.Equal("123", aa.Payload["account"])
-}
-
-func Test_omit_empty(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1,omitempty"`
-		Field2 string `json:"field-2,omitempty"`
-		Field3 string `json:"field-3,omitempty"`
-	}
-	obj := TestObject{}
-	obj.Field2 = "hello"
-	str, err := MarshalToString(&obj)
-	should.Nil(err)
-	should.Equal(`{"field-2":"hello"}`, str)
-}
-
-func Test_ignore_field_on_not_valid_type(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string `json:"field-1,omitempty"`
-		Field2 func() `json:"-"`
-	}
-	obj := TestObject{}
-	obj.Field1 = "hello world"
-	obj.Field2 = func() {}
-	str, err := MarshalToString(&obj)
-	should.Nil(err)
-	should.Equal(`{"field-1":"hello world"}`, str)
-}
-
-func Test_nested_field_omit_empty(t *testing.T) {
-	should := require.New(t)
-	type S1 struct {
-		F1 string `json:",omitempty"`
-	}
-
-	type S2 struct {
-		*S1
-		F2 string `json:",omitempty"`
-	}
-	s1 := &S1{
-	//F1: "abc",
-	}
-	s2 := &S2{
-		S1: s1,
-		F2: "123",
-	}
-	str, err := MarshalToString(s2)
-	should.Nil(err)
-	should.Equal(`{"F2":"123"}`, str)
-}
-
-func Test_recursive_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-		Me     *TestObject
-	}
-	obj := TestObject{}
-	str, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Contains(str, `"Field1":""`)
-	should.Contains(str, `"Me":null`)
-	err = UnmarshalFromString(str, &obj)
-	should.Nil(err)
-}
-
-func Test_encode_anonymous_struct(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field string
-	}
-	str, err := MarshalToString(struct {
-		TestObject
-		Field int
-	}{
-		Field: 100,
-	})
-	should.Nil(err)
-	should.Equal(`{"Field":100}`, str)
-}
-
-func Test_decode_anonymous_struct(t *testing.T) {
-	should := require.New(t)
-	type Inner struct {
-		Key string `json:"key"`
-	}
-
-	type Outer struct {
-		Inner
-	}
-	var outer Outer
-	j := []byte("{\"key\":\"value\"}")
-	should.Nil(Unmarshal(j, &outer))
-	should.Equal("value", outer.Key)
-}
-
-func Test_multiple_level_anonymous_struct(t *testing.T) {
-	type Level1 struct {
-		Field1 string
-	}
-	type Level2 struct {
-		Level1
-		Field2 string
-	}
-	type Level3 struct {
-		Level2
-		Field3 string
-	}
-	should := require.New(t)
-	obj := Level3{Level2{Level1{"1"}, "2"}, "3"}
-	output, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Equal(`{"Field1":"1","Field2":"2","Field3":"3"}`, output)
-}
-
-func Test_multiple_level_anonymous_struct_with_ptr(t *testing.T) {
-	type Level1 struct {
-		Field1 string
-		Field2 string
-		Field4 string
-	}
-	type Level2 struct {
-		*Level1
-		Field2 string
-		Field3 string
-	}
-	type Level3 struct {
-		*Level2
-		Field3 string
-	}
-	should := require.New(t)
-	obj := Level3{&Level2{&Level1{"1", "", "4"}, "2", ""}, "3"}
-	output, err := MarshalToString(obj)
-	should.Nil(err)
-	should.Contains(output, `"Field1":"1"`)
-	should.Contains(output, `"Field2":"2"`)
-	should.Contains(output, `"Field3":"3"`)
-	should.Contains(output, `"Field4":"4"`)
-}
-
-func Test_shadow_struct_field(t *testing.T) {
-	should := require.New(t)
-	type omit *struct{}
-	type CacheItem struct {
-		Key    string `json:"key"`
-		MaxAge int    `json:"cacheAge"`
-	}
-	output, err := MarshalToString(struct {
-		*CacheItem
-
-		// Omit bad keys
-		OmitMaxAge omit `json:"cacheAge,omitempty"`
-
-		// Add nice keys
-		MaxAge int `json:"max_age"`
-	}{
-		CacheItem: &CacheItem{
-			Key:    "value",
-			MaxAge: 100,
-		},
-		MaxAge: 20,
-	})
-	should.Nil(err)
-	should.Contains(output, `"key":"value"`)
-	should.Contains(output, `"max_age":20`)
-}
-
-func Test_embedded_order(t *testing.T) {
-	type A struct {
-		Field2 string
-	}
-
-	type C struct {
-		Field5 string
-	}
-
-	type B struct {
-		Field4 string
-		C
-		Field6 string
-	}
-
-	type TestObject struct {
-		Field1 string
-		A
-		Field3 string
-		B
-		Field7 string
-	}
-	should := require.New(t)
-	s := TestObject{}
-	output, err := MarshalToString(s)
-	should.Nil(err)
-	should.Equal(`{"Field1":"","Field2":"","Field3":"","Field4":"","Field5":"","Field6":"","Field7":""}`, output)
-}
-
-func Test_decode_nested(t *testing.T) {
-	type StructOfString struct {
-		Field1 string
-		Field2 string
-	}
-	iter := ParseString(ConfigDefault, `[{"field1": "hello"}, null, {"field2": "world"}]`)
-	slice := []*StructOfString{}
-	iter.ReadVal(&slice)
-	if len(slice) != 3 {
-		fmt.Println(iter.Error)
-		t.Fatal(len(slice))
-	}
-	if slice[0].Field1 != "hello" {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[0])
-	}
-	if slice[1] != nil {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[1])
-	}
-	if slice[2].Field2 != "world" {
-		fmt.Println(iter.Error)
-		t.Fatal(slice[2])
-	}
-}
-
-func Test_decode_field_with_escape(t *testing.T) {
-	should := require.New(t)
-	type TestObject struct {
-		Field1 string
-	}
-	var obj TestObject
-	should.Nil(ConfigCompatibleWithStandardLibrary.Unmarshal([]byte(`{"Field\"1":"hello"}`), &obj))
-	should.Equal("", obj.Field1)
-	should.Nil(ConfigCompatibleWithStandardLibrary.Unmarshal([]byte(`{"\u0046ield1":"hello"}`), &obj))
-	should.Equal("hello", obj.Field1)
-}

misc_tests/jsoniter_object_test.go

@@ -0,0 +1,81 @@
+package misc_tests
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/json-iterator/go"
+)
+
+func Test_empty_object(t *testing.T) {
+	should := require.New(t)
+	iter := jsoniter.ParseString(jsoniter.ConfigDefault, `{}`)
+	field := iter.ReadObject()
+	should.Equal("", field)
+	iter = jsoniter.ParseString(jsoniter.ConfigDefault, `{}`)
+	iter.ReadObjectCB(func(iter *jsoniter.Iterator, field string) bool {
+		should.FailNow("should not call")
+		return true
+	})
+}
+
+func Test_one_field(t *testing.T) {
+	should := require.New(t)
+	iter := jsoniter.ParseString(jsoniter.ConfigDefault, `{"a": "stream"}`)
+	field := iter.ReadObject()
+	should.Equal("a", field)
+	value := iter.ReadString()
+	should.Equal("stream", value)
+	field = iter.ReadObject()
+	should.Equal("", field)
+	iter = jsoniter.ParseString(jsoniter.ConfigDefault, `{"a": "stream"}`)
+	should.True(iter.ReadObjectCB(func(iter *jsoniter.Iterator, field string) bool {
+		should.Equal("a", field)
+		iter.Skip()
+		return true
+	}))
+
+}
+
+func Test_two_field(t *testing.T) {
+	should := require.New(t)
+	iter := jsoniter.ParseString(jsoniter.ConfigDefault, `{ "a": "stream" , "c": "d" }`)
+	field := iter.ReadObject()
+	should.Equal("a", field)
+	value := iter.ReadString()
+	should.Equal("stream", value)
+	field = iter.ReadObject()
+	should.Equal("c", field)
+	value = iter.ReadString()
+	should.Equal("d", value)
+	field = iter.ReadObject()
+	should.Equal("", field)
+	iter = jsoniter.ParseString(jsoniter.ConfigDefault, `{"field1": "1", "field2": 2}`)
+	for field := iter.ReadObject(); field != ""; field = iter.ReadObject() {
+		switch field {
+		case "field1":
+			iter.ReadString()
+		case "field2":
+			iter.ReadInt64()
+		default:
+			iter.ReportError("bind object", "unexpected field")
+		}
+	}
+}
+
+func Test_write_object(t *testing.T) {
+	should := require.New(t)
+	buf := &bytes.Buffer{}
+	stream := jsoniter.NewStream(jsoniter.Config{IndentionStep: 2}.Froze(), buf, 4096)
+	stream.WriteObjectStart()
+	stream.WriteObjectField("hello")
+	stream.WriteInt(1)
+	stream.WriteMore()
+	stream.WriteObjectField("world")
+	stream.WriteInt(2)
+	stream.WriteObjectEnd()
+	stream.Flush()
+	should.Nil(stream.Error)
+	should.Equal("{\n  \"hello\": 1,\n  \"world\": 2\n}", buf.String())
+}

value_tests/struct_test.go

@@ -3,6 +3,7 @@ package test
 import (
 	"time"
 	"encoding/json"
+	"bytes"
 )
 
 func init() {
@@ -16,6 +17,23 @@ func init() {
 			Field int `json:"field"`
 		})(nil),
 		input: `{"field": null}`,
+	}, unmarshalCase{
+		ptr: (*struct {
+			ID      int                    `json:"id"`
+			Payload map[string]interface{} `json:"payload"`
+			buf     *bytes.Buffer
+		})(nil),
+		input: ` {"id":1, "payload":{"account":"123","password":"456"}}`,
+	}, unmarshalCase{
+		ptr: (*struct {
+			Field1 string
+		})(nil),
+		input: `{"Field\"1":"hello"}`,
+	}, unmarshalCase{
+		ptr: (*struct {
+			Field1 string
+		})(nil),
+		input: `{"\u0046ield1":"hello"}`,
 	})
 	marshalCases = append(marshalCases,
 		struct {
@@ -77,6 +95,27 @@ func init() {
 		struct {
 			Field MyInterface `json:"field"`
 		}{MyString("hello")},
+		struct {
+			Field1 string `json:"field-1,omitempty"`
+			Field2 func() `json:"-"`
+		}{},
+		structRecursive{},
+		struct {
+			*CacheItem
+
+			// Omit bad keys
+			OmitMaxAge omit `json:"cacheAge,omitempty"`
+
+			// Add nice keys
+			MaxAge int `json:"max_age"`
+		}{
+			CacheItem: &CacheItem{
+				Key:    "value",
+				MaxAge: 100,
+			},
+			MaxAge: 20,
+		},
+		structOrder{},
 	)
 }
 
@@ -84,4 +123,38 @@ type StructVarious struct {
 	Field0 string
 	Field1 []string
 	Field2 map[string]interface{}
+}
+
+type structRecursive struct {
+	Field1 string
+	Me     *structRecursive
+}
+
+type omit *struct{}
+type CacheItem struct {
+	Key    string `json:"key"`
+	MaxAge int    `json:"cacheAge"`
+}
+
+
+type orderA struct {
+	Field2 string
+}
+
+type orderC struct {
+	Field5 string
+}
+
+type orderB struct {
+	Field4 string
+	orderC
+	Field6 string
+}
+
+type structOrder struct {
+	Field1 string
+	orderA
+	Field3 string
+	orderB
+	Field7 string
 }