GOMODULES
/
testify
mirror of https://github.com/stretchr/testify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JSONEq unmarshal's into an interface{} instead of attemping Map and Slice unmarshallings

pull/217/head
Julian Cooper 2015-10-13 14:13:42 -07:00
parent 7f6cb13c5c
commit 2d0c0a478c
2 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
assert/assertions.go
View File

@ -917,30 +917,15 @@ func NotZero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
//
// Returns whether the assertion was successful (true) or not (false).
func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) bool {
expectSlice := false
expectedJSONAsMap := make(map[string]interface{})
expectedJSONAsSlice := make([]interface{}, 0, 0)
var expectedJSONAsInterface, actualJSONAsInterface interface{}
actualJSONAsMap := make(map[string]interface{})
actualJSONAsSlice := make([]interface{}, 0, 0)
if err := json.Unmarshal([]byte(expected), &expectedJSONAsMap); err != nil {
if err := json.Unmarshal([]byte(expected), &expectedJSONAsSlice); err == nil {
expectSlice = true
} else {
return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid json.\nJSON parsing error: '%s'", expected, err.Error()), msgAndArgs...)
}
if err := json.Unmarshal([]byte(expected), &expectedJSONAsInterface); err != nil {
return Fail(t, fmt.Sprintf("Expected value ('%s') is not valid json.\nJSON parsing error: '%s'", expected, err.Error()), msgAndArgs...)
}
if expectSlice {
if err := json.Unmarshal([]byte(actual), &actualJSONAsSlice); err != nil {
return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid json.\nJSON parsing error: '%s'", actual, err.Error()), msgAndArgs...)
}
return Equal(t, expectedJSONAsSlice, actualJSONAsSlice, msgAndArgs...)
} else {
if err := json.Unmarshal([]byte(actual), &actualJSONAsMap); err != nil {
return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid json.\nJSON parsing error: '%s'", actual, err.Error()), msgAndArgs...)
}
return Equal(t, expectedJSONAsMap, actualJSONAsMap, msgAndArgs...)
if err := json.Unmarshal([]byte(actual), &actualJSONAsInterface); err != nil {
return Fail(t, fmt.Sprintf("Input ('%s') needs to be valid json.\nJSON parsing error: '%s'", actual, err.Error()), msgAndArgs...)
}
return Equal(t, expectedJSONAsInterface, actualJSONAsInterface, msgAndArgs...)
}

29
require/requirements.go
View File

@ -235,32 +235,17 @@ func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interf
//
// Returns whether the assertion was successful (true) or not (false).
func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) {
expectSlice := false
expectedJSONAsMap := make(map[string]interface{})
expectedJSONAsSlice := make([]interface{}, 0, 0)
var expectedJSONAsInterface, actualJSONAsInterface interface{}
actualJSONAsMap := make(map[string]interface{})
actualJSONAsSlice := make([]interface{}, 0, 0)
if err := json.Unmarshal([]byte(expected), &expectedJSONAsMap); err != nil {
if err := json.Unmarshal([]byte(expected), &expectedJSONAsSlice); err == nil {
expectSlice = true
} else {
t.FailNow()
}
if err := json.Unmarshal([]byte(expected), &expectedJSONAsInterface); err != nil {
t.FailNow()
}
if expectSlice {
if err := json.Unmarshal([]byte(actual), &actualJSONAsSlice); err != nil {
t.FailNow()
}
Equal(t, expectedJSONAsSlice, actualJSONAsSlice, msgAndArgs...)
} else {
if err := json.Unmarshal([]byte(actual), &actualJSONAsMap); err != nil {
t.FailNow()
}
Equal(t, expectedJSONAsMap, actualJSONAsMap, msgAndArgs...)
if err := json.Unmarshal([]byte(actual), &actualJSONAsInterface); err != nil {
t.FailNow()
}
Equal(t, expectedJSONAsInterface, actualJSONAsInterface, msgAndArgs...)
}
/*