Unverified Commit 8a3f7159 authored by Hanzei's avatar Hanzei Committed by GitHub
Browse files

Fix bug introduced with #17 (#60)

* Fix bug introduced with #17

* Add testcase for mixed json slice
parent e89b2c16
......@@ -116,6 +116,37 @@ func TestConversionJSONInt(t *testing.T) {
assert.Equal(t, []interface{}{1}, m.Get("d").InterSlice()[0])
}
func TestJSONSliceInt(t *testing.T) {
jsonString :=
`{
"a": [
{"b": 1},
{"c": 2}
]
}`
m, err := objx.FromJSON(jsonString)
assert.Nil(t, err)
require.NotNil(t, m)
assert.Equal(t, []objx.Map{objx.Map{"b": 1}, objx.Map{"c": 2}}, m.Get("a").ObjxMapSlice())
}
func TestJSONSliceMixed(t *testing.T) {
jsonString :=
`{
"a": [
{"b": 1},
"a"
]
}`
m, err := objx.FromJSON(jsonString)
assert.Nil(t, err)
require.NotNil(t, m)
assert.Nil(t, m.Get("a").ObjxMapSlice())
}
func TestMapFromBase64String(t *testing.T) {
base64String := "eyJuYW1lIjoiTWF0In0="
o, err := objx.FromBase64(base64String)
......
......@@ -276,7 +276,10 @@ func (v *Value) MustObjxMap() Map {
// ObjxMapSlice gets the value as a [](Map), returns the optionalDefault
// value or nil if the value is not a [](Map).
func (v *Value) ObjxMapSlice(optionalDefault ...[](Map)) [](Map) {
slice, ok := v.data.([]interface{})
if s, ok := v.data.([]Map); ok {
return s
}
s, ok := v.data.([]interface{})
if !ok {
if len(optionalDefault) == 1 {
return optionalDefault[0]
......@@ -285,11 +288,15 @@ func (v *Value) ObjxMapSlice(optionalDefault ...[](Map)) [](Map) {
}
}
result := make([]Map, len(slice))
for i := range slice {
result[i] = New(slice[i])
result := make([]Map, len(s))
for i := range s {
switch s[i].(type) {
case Map:
result[i] = s[i].(Map)
default:
return nil
}
}
return result
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment