Skip to content

Commit

Permalink
moves 'EqualErrorMessage' func to testutil pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-ramon committed Dec 21, 2015
1 parent cfa1891 commit 68b7cc0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 6 additions & 10 deletions enum_type_test.go
Expand Up @@ -9,10 +9,6 @@ import (
"github.com/graphql-go/graphql/testutil"
)

func equalErrorMessage(expected, result *graphql.Result, i int) bool {
return expected.Errors[i].Message == result.Errors[i].Message
}

var enumTypeTestColorType = graphql.NewEnum(graphql.EnumConfig{
Name: "Color",
Values: graphql.EnumValueConfigMap{
Expand Down Expand Up @@ -165,7 +161,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptStringLiterals(t *testing.T) {
},
}
result := executeEnumTypeTest(t, query)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand All @@ -192,7 +188,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptInternalValueInPlaceOfEnumLiteral(t
},
}
result := executeEnumTypeTest(t, query)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand All @@ -208,7 +204,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptEnumLiteralInPlaceOfInt(t *testing.T
},
}
result := executeEnumTypeTest(t, query)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand Down Expand Up @@ -258,7 +254,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptInternalValueAsEnumVariable(t *testi
},
}
result := executeEnumTypeTestWithParams(t, query, params)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand All @@ -276,7 +272,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptStringVariablesAsEnumInput(t *testin
},
}
result := executeEnumTypeTestWithParams(t, query, params)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand All @@ -294,7 +290,7 @@ func TestTypeSystem_EnumValues_DoesNotAcceptInternalValueVariableAsEnumInput(t *
},
}
result := executeEnumTypeTestWithParams(t, query, params)
if !equalErrorMessage(expected, result, 0) {
if !testutil.EqualErrorMessage(expected, result, 0) {
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
}
}
Expand Down
4 changes: 4 additions & 0 deletions testutil/testutil.go
Expand Up @@ -459,3 +459,7 @@ func ContainSubset(super map[string]interface{}, sub map[string]interface{}) boo
}
return true
}

func EqualErrorMessage(expected, result *graphql.Result, i int) bool {
return expected.Errors[i].Message == result.Errors[i].Message
}

0 comments on commit 68b7cc0

Please sign in to comment.