Skip to content

Commit a31b4b3

Browse files
author
Damir Vandic
committed
Refactor tests in order to account for embedded error cause
1 parent 94e801b commit a31b4b3

File tree

5 files changed

+96
-148
lines changed

5 files changed

+96
-148
lines changed

‎abstract_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,7 @@ func TestResolveTypeOnInterfaceYieldsUsefulError(t *testing.T) {
524524
if len(result.Errors) == 0 {
525525
t.Fatalf("wrong result, expected errors: %v, got: %v", len(expected.Errors), len(result.Errors))
526526
}
527-
if !reflect.DeepEqual(expected, result) {
528-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
529-
}
527+
testutil.EqualResults(t, expected, result)
530528
}
531529

532530
func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
@@ -642,7 +640,5 @@ func TestResolveTypeOnUnionYieldsUsefulError(t *testing.T) {
642640
if len(result.Errors) == 0 {
643641
t.Fatalf("wrong result, expected errors: %v, got: %v", len(expected.Errors), len(result.Errors))
644642
}
645-
if !reflect.DeepEqual(expected, result) {
646-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
647-
}
643+
testutil.EqualResults(t, expected, result)
648644
}

‎directives_test.go

Lines changed: 25 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package graphql_test
22

33
import (
4-
"reflect"
54
"testing"
65

76
"github.com/graphql-go/graphql"
@@ -60,9 +59,7 @@ func TestDirectives_DirectivesMustBeNamed(t *testing.T) {
6059
Message: "Directive must be named.",
6160
Locations: []location.SourceLocation{},
6261
}
63-
if !reflect.DeepEqual(expectedErr, err) {
64-
t.Fatalf("Expected error to be equal, got: %v", testutil.Diff(expectedErr, err))
65-
}
62+
testutil.EqualFormattedErrors(t, expectedErr, err)
6663
}
6764

6865
func TestDirectives_DirectiveNameMustBeValid(t *testing.T) {
@@ -87,9 +84,7 @@ func TestDirectives_DirectiveNameMustBeValid(t *testing.T) {
8784
Message: `Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "123invalid name" does not.`,
8885
Locations: []location.SourceLocation{},
8986
}
90-
if !reflect.DeepEqual(expectedErr, err) {
91-
t.Fatalf("Expected error to be equal, got: %v", testutil.Diff(expectedErr, err))
92-
}
87+
testutil.EqualFormattedErrors(t, expectedErr, err)
9388
}
9489

9590
func TestDirectives_DirectiveNameMustProvideLocations(t *testing.T) {
@@ -111,9 +106,7 @@ func TestDirectives_DirectiveNameMustProvideLocations(t *testing.T) {
111106
Message: `Must provide locations for directive.`,
112107
Locations: []location.SourceLocation{},
113108
}
114-
if !reflect.DeepEqual(expectedErr, err) {
115-
t.Fatalf("Expected error to be equal, got: %v", testutil.Diff(expectedErr, err))
116-
}
109+
testutil.EqualFormattedErrors(t, expectedErr, err)
117110
}
118111

119112
func TestDirectives_DirectiveArgNamesMustBeValid(t *testing.T) {
@@ -148,9 +141,7 @@ func TestDirectives_DirectiveArgNamesMustBeValid(t *testing.T) {
148141
Message: `Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "123if" does not.`,
149142
Locations: []location.SourceLocation{},
150143
}
151-
if !reflect.DeepEqual(expectedErr, err) {
152-
t.Fatalf("Expected error to be equal, got: %v", testutil.Diff(expectedErr, err))
153-
}
144+
testutil.EqualFormattedErrors(t, expectedErr, err)
154145
}
155146

156147
func TestDirectivesWorksWithoutDirectives(t *testing.T) {
@@ -165,9 +156,7 @@ func TestDirectivesWorksWithoutDirectives(t *testing.T) {
165156
if len(result.Errors) != 0 {
166157
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
167158
}
168-
if !reflect.DeepEqual(expected, result) {
169-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
170-
}
159+
testutil.EqualResults(t, expected, result)
171160
}
172161

173162
func TestDirectivesWorksOnScalarsIfTrueIncludesScalar(t *testing.T) {
@@ -182,9 +171,7 @@ func TestDirectivesWorksOnScalarsIfTrueIncludesScalar(t *testing.T) {
182171
if len(result.Errors) != 0 {
183172
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
184173
}
185-
if !reflect.DeepEqual(expected, result) {
186-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
187-
}
174+
testutil.EqualResults(t, expected, result)
188175
}
189176

190177
func TestDirectivesWorksOnScalarsIfFalseOmitsOnScalar(t *testing.T) {
@@ -198,9 +185,7 @@ func TestDirectivesWorksOnScalarsIfFalseOmitsOnScalar(t *testing.T) {
198185
if len(result.Errors) != 0 {
199186
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
200187
}
201-
if !reflect.DeepEqual(expected, result) {
202-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
203-
}
188+
testutil.EqualResults(t, expected, result)
204189
}
205190

206191
func TestDirectivesWorksOnScalarsUnlessFalseIncludesScalar(t *testing.T) {
@@ -215,9 +200,7 @@ func TestDirectivesWorksOnScalarsUnlessFalseIncludesScalar(t *testing.T) {
215200
if len(result.Errors) != 0 {
216201
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
217202
}
218-
if !reflect.DeepEqual(expected, result) {
219-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
220-
}
203+
testutil.EqualResults(t, expected, result)
221204
}
222205

223206
func TestDirectivesWorksOnScalarsUnlessTrueOmitsScalar(t *testing.T) {
@@ -231,9 +214,7 @@ func TestDirectivesWorksOnScalarsUnlessTrueOmitsScalar(t *testing.T) {
231214
if len(result.Errors) != 0 {
232215
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
233216
}
234-
if !reflect.DeepEqual(expected, result) {
235-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
236-
}
217+
testutil.EqualResults(t, expected, result)
237218
}
238219

239220
func TestDirectivesWorksOnFragmentSpreadsIfFalseOmitsFragmentSpread(t *testing.T) {
@@ -255,9 +236,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfFalseOmitsFragmentSpread(t *testing.T
255236
if len(result.Errors) != 0 {
256237
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
257238
}
258-
if !reflect.DeepEqual(expected, result) {
259-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
260-
}
239+
testutil.EqualResults(t, expected, result)
261240
}
262241

263242
func TestDirectivesWorksOnFragmentSpreadsIfTrueIncludesFragmentSpread(t *testing.T) {
@@ -280,9 +259,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfTrueIncludesFragmentSpread(t *testing
280259
if len(result.Errors) != 0 {
281260
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
282261
}
283-
if !reflect.DeepEqual(expected, result) {
284-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
285-
}
262+
testutil.EqualResults(t, expected, result)
286263
}
287264

288265
func TestDirectivesWorksOnFragmentSpreadsUnlessFalseIncludesFragmentSpread(t *testing.T) {
@@ -305,9 +282,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessFalseIncludesFragmentSpread(t *te
305282
if len(result.Errors) != 0 {
306283
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
307284
}
308-
if !reflect.DeepEqual(expected, result) {
309-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
310-
}
285+
testutil.EqualResults(t, expected, result)
311286
}
312287

313288
func TestDirectivesWorksOnFragmentSpreadsUnlessTrueOmitsFragmentSpread(t *testing.T) {
@@ -329,9 +304,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessTrueOmitsFragmentSpread(t *testin
329304
if len(result.Errors) != 0 {
330305
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
331306
}
332-
if !reflect.DeepEqual(expected, result) {
333-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
334-
}
307+
testutil.EqualResults(t, expected, result)
335308
}
336309

337310
func TestDirectivesWorksOnInlineFragmentIfFalseOmitsInlineFragment(t *testing.T) {
@@ -352,9 +325,7 @@ func TestDirectivesWorksOnInlineFragmentIfFalseOmitsInlineFragment(t *testing.T)
352325
if len(result.Errors) != 0 {
353326
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
354327
}
355-
if !reflect.DeepEqual(expected, result) {
356-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
357-
}
328+
testutil.EqualResults(t, expected, result)
358329
}
359330

360331
func TestDirectivesWorksOnInlineFragmentIfTrueIncludesInlineFragment(t *testing.T) {
@@ -376,9 +347,7 @@ func TestDirectivesWorksOnInlineFragmentIfTrueIncludesInlineFragment(t *testing.
376347
if len(result.Errors) != 0 {
377348
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
378349
}
379-
if !reflect.DeepEqual(expected, result) {
380-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
381-
}
350+
testutil.EqualResults(t, expected, result)
382351
}
383352

384353
func TestDirectivesWorksOnInlineFragmentUnlessFalseIncludesInlineFragment(t *testing.T) {
@@ -400,9 +369,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessFalseIncludesInlineFragment(t *tes
400369
if len(result.Errors) != 0 {
401370
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
402371
}
403-
if !reflect.DeepEqual(expected, result) {
404-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
405-
}
372+
testutil.EqualResults(t, expected, result)
406373
}
407374

408375
func TestDirectivesWorksOnInlineFragmentUnlessTrueIncludesInlineFragment(t *testing.T) {
@@ -423,9 +390,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessTrueIncludesInlineFragment(t *test
423390
if len(result.Errors) != 0 {
424391
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
425392
}
426-
if !reflect.DeepEqual(expected, result) {
427-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
428-
}
393+
testutil.EqualResults(t, expected, result)
429394
}
430395

431396
func TestDirectivesWorksOnAnonymousInlineFragmentIfFalseOmitsAnonymousInlineFragment(t *testing.T) {
@@ -446,9 +411,7 @@ func TestDirectivesWorksOnAnonymousInlineFragmentIfFalseOmitsAnonymousInlineFrag
446411
if len(result.Errors) != 0 {
447412
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
448413
}
449-
if !reflect.DeepEqual(expected, result) {
450-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
451-
}
414+
testutil.EqualResults(t, expected, result)
452415
}
453416

454417
func TestDirectivesWorksOnAnonymousInlineFragmentIfTrueIncludesAnonymousInlineFragment(t *testing.T) {
@@ -470,9 +433,7 @@ func TestDirectivesWorksOnAnonymousInlineFragmentIfTrueIncludesAnonymousInlineFr
470433
if len(result.Errors) != 0 {
471434
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
472435
}
473-
if !reflect.DeepEqual(expected, result) {
474-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
475-
}
436+
testutil.EqualResults(t, expected, result)
476437
}
477438

478439
func TestDirectivesWorksOnAnonymousInlineFragmentUnlessFalseIncludesAnonymousInlineFragment(t *testing.T) {
@@ -494,9 +455,7 @@ func TestDirectivesWorksOnAnonymousInlineFragmentUnlessFalseIncludesAnonymousInl
494455
if len(result.Errors) != 0 {
495456
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
496457
}
497-
if !reflect.DeepEqual(expected, result) {
498-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
499-
}
458+
testutil.EqualResults(t, expected, result)
500459
}
501460

502461
func TestDirectivesWorksOnAnonymousInlineFragmentUnlessTrueIncludesAnonymousInlineFragment(t *testing.T) {
@@ -517,9 +476,7 @@ func TestDirectivesWorksOnAnonymousInlineFragmentUnlessTrueIncludesAnonymousInli
517476
if len(result.Errors) != 0 {
518477
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
519478
}
520-
if !reflect.DeepEqual(expected, result) {
521-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
522-
}
479+
testutil.EqualResults(t, expected, result)
523480
}
524481

525482
func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndNoSkip(t *testing.T) {
@@ -534,9 +491,7 @@ func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndNoSkip(t *testing
534491
if len(result.Errors) != 0 {
535492
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
536493
}
537-
if !reflect.DeepEqual(expected, result) {
538-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
539-
}
494+
testutil.EqualResults(t, expected, result)
540495
}
541496

542497
func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndSkip(t *testing.T) {
@@ -550,9 +505,7 @@ func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndSkip(t *testing.T
550505
if len(result.Errors) != 0 {
551506
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
552507
}
553-
if !reflect.DeepEqual(expected, result) {
554-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
555-
}
508+
testutil.EqualResults(t, expected, result)
556509
}
557510

558511
func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeAndSkip(t *testing.T) {
@@ -566,9 +519,7 @@ func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeAndSkip(t *testing
566519
if len(result.Errors) != 0 {
567520
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
568521
}
569-
if !reflect.DeepEqual(expected, result) {
570-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
571-
}
522+
testutil.EqualResults(t, expected, result)
572523
}
573524

574525
func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeOrSkip(t *testing.T) {
@@ -582,7 +533,5 @@ func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeOrSkip(t *testing.
582533
if len(result.Errors) != 0 {
583534
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
584535
}
585-
if !reflect.DeepEqual(expected, result) {
586-
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
587-
}
536+
testutil.EqualResults(t, expected, result)
588537
}

0 commit comments

Comments
 (0)