Skip to content

Commit d5ce57d

Browse files
lenatenlenaten
committed
Merge pull request graph-gophers#1 from sogko/sogko/naming
Fixed failed tests and restored `language/parser` and `testutil` packages
2 parents 0f6be19 + 48ffb95 commit d5ce57d

27 files changed

+2317
-2104
lines changed

‎abstract_test.go‎

Lines changed: 147 additions & 145 deletions
Large diffs are not rendered by default.

‎definition_test.go‎

Lines changed: 162 additions & 159 deletions
Large diffs are not rendered by default.

‎directives_test.go‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
package graphql
1+
package graphql_test
22

33
import (
44
"reflect"
55
"testing"
6+
7+
"github.com/chris-ramon/graphql-go"
8+
"github.com/chris-ramon/graphql-go/testutil"
69
)
710

8-
var directivesTestSchema, _ = NewSchema(SchemaConfig{
9-
Query: NewObject(ObjectConfig{
11+
var directivesTestSchema, _ = graphql.NewSchema(graphql.SchemaConfig{
12+
Query: graphql.NewObject(graphql.ObjectConfig{
1013
Name: "TestType",
11-
Fields: FieldConfigMap{
12-
"a": &FieldConfig{
13-
Type: String,
14+
Fields: graphql.FieldConfigMap{
15+
"a": &graphql.FieldConfig{
16+
Type: graphql.String,
1417
},
15-
"b": &FieldConfig{
16-
Type: String,
18+
"b": &graphql.FieldConfig{
19+
Type: graphql.String,
1720
},
1821
},
1922
}),
@@ -24,19 +27,19 @@ var directivesTestData map[string]interface{} = map[string]interface{}{
2427
"b": func() interface{} { return "b" },
2528
}
2629

27-
func executeDirectivesTestQuery(t *testing.T, doc string) *Result {
28-
ast := TestParse(t, doc)
29-
ep := ExecuteParams{
30+
func executeDirectivesTestQuery(t *testing.T, doc string) *graphql.Result {
31+
ast := testutil.TestParse(t, doc)
32+
ep := graphql.ExecuteParams{
3033
Schema: directivesTestSchema,
3134
AST: ast,
3235
Root: directivesTestData,
3336
}
34-
return TestExecute(t, ep)
37+
return testutil.TestExecute(t, ep)
3538
}
3639

3740
func TestDirectivesWorksWithoutDirectives(t *testing.T) {
3841
query := `{ a, b }`
39-
expected := &Result{
42+
expected := &graphql.Result{
4043
Data: map[string]interface{}{
4144
"a": "a",
4245
"b": "b",
@@ -47,13 +50,13 @@ func TestDirectivesWorksWithoutDirectives(t *testing.T) {
4750
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
4851
}
4952
if !reflect.DeepEqual(expected, result) {
50-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
53+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
5154
}
5255
}
5356

5457
func TestDirectivesWorksOnScalarsIfTrueIncludesScalar(t *testing.T) {
5558
query := `{ a, b @include(if: true) }`
56-
expected := &Result{
59+
expected := &graphql.Result{
5760
Data: map[string]interface{}{
5861
"a": "a",
5962
"b": "b",
@@ -64,13 +67,13 @@ func TestDirectivesWorksOnScalarsIfTrueIncludesScalar(t *testing.T) {
6467
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
6568
}
6669
if !reflect.DeepEqual(expected, result) {
67-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
70+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
6871
}
6972
}
7073

7174
func TestDirectivesWorksOnScalarsIfFalseOmitsOnScalar(t *testing.T) {
7275
query := `{ a, b @include(if: false) }`
73-
expected := &Result{
76+
expected := &graphql.Result{
7477
Data: map[string]interface{}{
7578
"a": "a",
7679
},
@@ -80,13 +83,13 @@ func TestDirectivesWorksOnScalarsIfFalseOmitsOnScalar(t *testing.T) {
8083
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
8184
}
8285
if !reflect.DeepEqual(expected, result) {
83-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
86+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
8487
}
8588
}
8689

8790
func TestDirectivesWorksOnScalarsUnlessFalseIncludesScalar(t *testing.T) {
8891
query := `{ a, b @skip(if: false) }`
89-
expected := &Result{
92+
expected := &graphql.Result{
9093
Data: map[string]interface{}{
9194
"a": "a",
9295
"b": "b",
@@ -97,13 +100,13 @@ func TestDirectivesWorksOnScalarsUnlessFalseIncludesScalar(t *testing.T) {
97100
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
98101
}
99102
if !reflect.DeepEqual(expected, result) {
100-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
103+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
101104
}
102105
}
103106

104107
func TestDirectivesWorksOnScalarsUnlessTrueOmitsScalar(t *testing.T) {
105108
query := `{ a, b @skip(if: true) }`
106-
expected := &Result{
109+
expected := &graphql.Result{
107110
Data: map[string]interface{}{
108111
"a": "a",
109112
},
@@ -113,7 +116,7 @@ func TestDirectivesWorksOnScalarsUnlessTrueOmitsScalar(t *testing.T) {
113116
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
114117
}
115118
if !reflect.DeepEqual(expected, result) {
116-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
119+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
117120
}
118121
}
119122

@@ -127,7 +130,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfFalseOmitsFragmentSpread(t *testing.T
127130
b
128131
}
129132
`
130-
expected := &Result{
133+
expected := &graphql.Result{
131134
Data: map[string]interface{}{
132135
"a": "a",
133136
},
@@ -137,7 +140,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfFalseOmitsFragmentSpread(t *testing.T
137140
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
138141
}
139142
if !reflect.DeepEqual(expected, result) {
140-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
143+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
141144
}
142145
}
143146

@@ -151,7 +154,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfTrueIncludesFragmentSpread(t *testing
151154
b
152155
}
153156
`
154-
expected := &Result{
157+
expected := &graphql.Result{
155158
Data: map[string]interface{}{
156159
"a": "a",
157160
"b": "b",
@@ -162,7 +165,7 @@ func TestDirectivesWorksOnFragmentSpreadsIfTrueIncludesFragmentSpread(t *testing
162165
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
163166
}
164167
if !reflect.DeepEqual(expected, result) {
165-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
168+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
166169
}
167170
}
168171

@@ -176,7 +179,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessFalseIncludesFragmentSpread(t *te
176179
b
177180
}
178181
`
179-
expected := &Result{
182+
expected := &graphql.Result{
180183
Data: map[string]interface{}{
181184
"a": "a",
182185
"b": "b",
@@ -187,7 +190,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessFalseIncludesFragmentSpread(t *te
187190
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
188191
}
189192
if !reflect.DeepEqual(expected, result) {
190-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
193+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
191194
}
192195
}
193196

@@ -201,7 +204,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessTrueOmitsFragmentSpread(t *testin
201204
b
202205
}
203206
`
204-
expected := &Result{
207+
expected := &graphql.Result{
205208
Data: map[string]interface{}{
206209
"a": "a",
207210
},
@@ -211,7 +214,7 @@ func TestDirectivesWorksOnFragmentSpreadsUnlessTrueOmitsFragmentSpread(t *testin
211214
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
212215
}
213216
if !reflect.DeepEqual(expected, result) {
214-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
217+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
215218
}
216219
}
217220

@@ -227,7 +230,7 @@ func TestDirectivesWorksOnInlineFragmentIfFalseOmitsInlineFragment(t *testing.T)
227230
b
228231
}
229232
`
230-
expected := &Result{
233+
expected := &graphql.Result{
231234
Data: map[string]interface{}{
232235
"a": "a",
233236
},
@@ -237,7 +240,7 @@ func TestDirectivesWorksOnInlineFragmentIfFalseOmitsInlineFragment(t *testing.T)
237240
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
238241
}
239242
if !reflect.DeepEqual(expected, result) {
240-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
243+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
241244
}
242245
}
243246

@@ -253,7 +256,7 @@ func TestDirectivesWorksOnInlineFragmentIfTrueIncludesInlineFragment(t *testing.
253256
b
254257
}
255258
`
256-
expected := &Result{
259+
expected := &graphql.Result{
257260
Data: map[string]interface{}{
258261
"a": "a",
259262
"b": "b",
@@ -264,7 +267,7 @@ func TestDirectivesWorksOnInlineFragmentIfTrueIncludesInlineFragment(t *testing.
264267
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
265268
}
266269
if !reflect.DeepEqual(expected, result) {
267-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
270+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
268271
}
269272
}
270273

@@ -280,7 +283,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessFalseIncludesInlineFragment(t *tes
280283
b
281284
}
282285
`
283-
expected := &Result{
286+
expected := &graphql.Result{
284287
Data: map[string]interface{}{
285288
"a": "a",
286289
"b": "b",
@@ -291,7 +294,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessFalseIncludesInlineFragment(t *tes
291294
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
292295
}
293296
if !reflect.DeepEqual(expected, result) {
294-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
297+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
295298
}
296299
}
297300

@@ -307,7 +310,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessTrueIncludesInlineFragment(t *test
307310
b
308311
}
309312
`
310-
expected := &Result{
313+
expected := &graphql.Result{
311314
Data: map[string]interface{}{
312315
"a": "a",
313316
},
@@ -317,7 +320,7 @@ func TestDirectivesWorksOnInlineFragmentUnlessTrueIncludesInlineFragment(t *test
317320
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
318321
}
319322
if !reflect.DeepEqual(expected, result) {
320-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
323+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
321324
}
322325
}
323326

@@ -331,7 +334,7 @@ func TestDirectivesWorksOnFragmentIfFalseOmitsFragment(t *testing.T) {
331334
b
332335
}
333336
`
334-
expected := &Result{
337+
expected := &graphql.Result{
335338
Data: map[string]interface{}{
336339
"a": "a",
337340
},
@@ -341,7 +344,7 @@ func TestDirectivesWorksOnFragmentIfFalseOmitsFragment(t *testing.T) {
341344
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
342345
}
343346
if !reflect.DeepEqual(expected, result) {
344-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
347+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
345348
}
346349
}
347350

@@ -355,7 +358,7 @@ func TestDirectivesWorksOnFragmentIfTrueIncludesFragment(t *testing.T) {
355358
b
356359
}
357360
`
358-
expected := &Result{
361+
expected := &graphql.Result{
359362
Data: map[string]interface{}{
360363
"a": "a",
361364
"b": "b",
@@ -366,7 +369,7 @@ func TestDirectivesWorksOnFragmentIfTrueIncludesFragment(t *testing.T) {
366369
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
367370
}
368371
if !reflect.DeepEqual(expected, result) {
369-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
372+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
370373
}
371374
}
372375

@@ -380,7 +383,7 @@ func TestDirectivesWorksOnFragmentUnlessFalseIncludesFragment(t *testing.T) {
380383
b
381384
}
382385
`
383-
expected := &Result{
386+
expected := &graphql.Result{
384387
Data: map[string]interface{}{
385388
"a": "a",
386389
"b": "b",
@@ -391,7 +394,7 @@ func TestDirectivesWorksOnFragmentUnlessFalseIncludesFragment(t *testing.T) {
391394
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
392395
}
393396
if !reflect.DeepEqual(expected, result) {
394-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
397+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
395398
}
396399
}
397400

@@ -405,7 +408,7 @@ func TestDirectivesWorksOnFragmentUnlessTrueOmitsFragment(t *testing.T) {
405408
b
406409
}
407410
`
408-
expected := &Result{
411+
expected := &graphql.Result{
409412
Data: map[string]interface{}{
410413
"a": "a",
411414
},
@@ -415,6 +418,6 @@ func TestDirectivesWorksOnFragmentUnlessTrueOmitsFragment(t *testing.T) {
415418
t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
416419
}
417420
if !reflect.DeepEqual(expected, result) {
418-
t.Fatalf("Unexpected result, Diff: %v", Diff(expected, result))
421+
t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
419422
}
420423
}

0 commit comments

Comments
 (0)