Merge pull request #427 from graphql-go/original-error-improvements

errors: consolidates original error for re-usability

Author: chris-ramon

abstract_test.go

@@ -491,7 +491,6 @@ func TestResolveTypeOnInterfaceYieldsUsefulError(t *testing.T) {
       }
     }`
 
-	originalError := gqlerrors.NewFormattedError(`Runtime Object type "Human" is not a possible type for "Pet".`)
 	expected := &graphql.Result{
 		Data: map[string]interface{}{
 			"pets": []interface{}{
@@ -506,31 +505,28 @@ func TestResolveTypeOnInterfaceYieldsUsefulError(t *testing.T) {
 				nil,
 			},
 		},
-		Errors: []gqlerrors.FormattedError{gqlerrors.FormatError(gqlerrors.Error{
-			Message: originalError.Message,
-			Locations: []location.SourceLocation{
-				{
-					Line:   2,
-					Column: 7,
+		Errors: []gqlerrors.FormattedError{
+			{
+				Message: `Runtime Object type "Human" is not a possible type for "Pet".`,
+				Locations: []location.SourceLocation{
+					{
+						Line:   2,
+						Column: 7,
+					},
+				},
+				Path: []interface{}{
+					"pets",
+					2,
 				},
 			},
-			Path: []interface{}{
-				"pets",
-				2,
-			},
-			OriginalError: originalError,
-		})},
+		},
 	}
 
 	result := graphql.Do(graphql.Params{
 		Schema:        schema,
 		RequestString: query,
 	})
-
-	if len(result.Errors) == 0 {
-		t.Fatalf("wrong result, expected errors: %v, got: %v", len(expected.Errors), len(result.Errors))
-	}
-	if !reflect.DeepEqual(expected, result) {
+	if !testutil.EqualResults(expected, result) {
 		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
 	}
 }
@@ -619,7 +615,6 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
       }
     }`
 
-	originalError := gqlerrors.NewFormattedError(`Runtime Object type "Human" is not a possible type for "Pet".`)
 	expected := &graphql.Result{
 		Data: map[string]interface{}{
 			"pets": []interface{}{
@@ -635,8 +630,8 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
 			},
 		},
 		Errors: []gqlerrors.FormattedError{
-			gqlerrors.FormatError(gqlerrors.Error{
-				Message: originalError.Message,
+			{
+				Message: `Runtime Object type "Human" is not a possible type for "Pet".`,
 				Locations: []location.SourceLocation{
 					{
 						Line:   2,
@@ -647,19 +642,15 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
 					"pets",
 					2,
 				},
-				OriginalError: originalError,
-			}),
+			},
 		},
 	}
 
 	result := graphql.Do(graphql.Params{
 		Schema:        schema,
 		RequestString: query,
 	})
-	if len(result.Errors) == 0 {
-		t.Fatalf("wrong result, expected errors: %v, got: %v", len(expected.Errors), len(result.Errors))
-	}
-	if !reflect.DeepEqual(expected, result) {
+	if !testutil.EqualResults(expected, result) {
 		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
 	}
 }