Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix bug introduced with #17 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2018
Merged

Fix bug introduced with #17 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43f1b5a
Fix bug introduced with #17
hanzei Jan 29, 2018
884f9f5
Add testcase for mixed json slice
hanzei Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 12 additions & 5 deletions type_specific_codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
}

Expand Down