go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-04-20 11:28:49 +02:00
Code Issues Releases Activity

Merge pull request #422 from JensErat/map-invalid-type

Browse Source 
pass nested error in compatible configuration, fixes #388
This commit is contained in:
Tao Wen 2019-12-21 11:10:28 +08:00 committed by GitHub
commit acfec88f7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
reflect_map.go
View File

@ -321,6 +321,9 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
} }
stream.Write(keyValue.keyValue) stream.Write(keyValue.keyValue)
} }
if subStream.Error != nil && stream.Error == nil {
stream.Error = subStream.Error
}
stream.WriteObjectEnd() stream.WriteObjectEnd()
stream.cfg.ReturnStream(subStream) stream.cfg.ReturnStream(subStream)
stream.cfg.ReturnIterator(subIter) stream.cfg.ReturnIterator(subIter)

38
value_tests/invalid_test.go
View File

@ -103,18 +103,44 @@ func Test_invalid_float(t *testing.T) {
} }
func Test_chan(t *testing.T) { func Test_chan(t *testing.T) {
t.Skip("do not support chan")
type TestObject struct { type TestObject struct {
MyChan chan bool MyChan chan bool
MyField int MyField int
} }
should := require.New(t)
obj := TestObject{} obj := TestObject{}
str, err := json.Marshal(obj)
should.Nil(err) t.Run("Encode channel", func(t *testing.T) {
should.Equal(``, str) should := require.New(t)
str, err := jsoniter.Marshal(obj)
should.NotNil(err)
should.Nil(str)
})
t.Run("Encode channel using compatible configuration", func(t *testing.T) {
should := require.New(t)
str, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(obj)
should.NotNil(err)
should.Nil(str)
})
}
func Test_invalid_in_map(t *testing.T) {
testMap := map[string]interface{}{"chan": make(chan interface{})}
t.Run("Encode map with invalid content", func(t *testing.T) {
should := require.New(t)
str, err := jsoniter.Marshal(testMap)
should.NotNil(err)
should.Nil(str)
})
t.Run("Encode map with invalid content using compatible configuration", func(t *testing.T) {
should := require.New(t)
str, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(testMap)
should.NotNil(err)
should.Nil(str)
})
} }
func Test_invalid_number(t *testing.T) { func Test_invalid_number(t *testing.T) {