Skip to content

Commit 31c8259

Browse files
committed
renames
1 parent 919151c commit 31c8259

File tree

1 file changed

+52
-50
lines changed

1 file changed

+52
-50
lines changed

selected_fields_test.go

+52-50
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestSelectedFieldsNestedAliasesArgsDirectives(t *testing.T) {
3838

3939
gqltesting.RunTests(t, []*gqltesting.Test{
4040
{
41-
Schema: graphql.MustParseSchema(schemaString, &selectedFieldsResolver1{t}),
41+
Schema: graphql.MustParseSchema(schemaString, &nestedAliasesArgsDirectivesQueryResolver{t}),
4242
Query: `
4343
{
4444
test {
@@ -56,11 +56,11 @@ func TestSelectedFieldsNestedAliasesArgsDirectives(t *testing.T) {
5656
})
5757
}
5858

59-
type selectedFieldsResolver1 struct {
59+
type nestedAliasesArgsDirectivesQueryResolver struct {
6060
T *testing.T
6161
}
6262

63-
func (r *selectedFieldsResolver1) Test(ctx context.Context) selectedFieldsTestResolver1 {
63+
func (r *nestedAliasesArgsDirectivesQueryResolver) Test(ctx context.Context) nestedAliasesArgsDirectivesTestResolver {
6464
sel := fields.Selected(ctx)
6565
if sel == nil {
6666
failWithError(r.T, "selected field is nil")
@@ -139,25 +139,21 @@ func (r *selectedFieldsResolver1) Test(ctx context.Context) selectedFieldsTestRe
139139
failWithError(r.T, "c field assertion failed")
140140
}
141141

142-
return selectedFieldsTestResolver1{}
142+
return nestedAliasesArgsDirectivesTestResolver{}
143143
}
144144

145-
type selectedFieldsTestResolver1 struct{}
145+
type nestedAliasesArgsDirectivesTestResolver struct{}
146146

147-
func (r selectedFieldsTestDResolver) Value() string { return "value" }
148-
149-
type aArgs struct {
150-
Value *string
147+
func (r nestedAliasesArgsDirectivesTestResolver) A(struct{ Value *string }) string { return "a" }
148+
func (r nestedAliasesArgsDirectivesTestResolver) B() *string { return nil }
149+
func (r nestedAliasesArgsDirectivesTestResolver) C() int32 { return 1 }
150+
func (r nestedAliasesArgsDirectivesTestResolver) D() nestedAliasesArgsDirectivesDResolver {
151+
return nestedAliasesArgsDirectivesDResolver{}
151152
}
152153

153-
func (r selectedFieldsTestResolver1) A(aArgs) string { return "a" }
154-
func (r selectedFieldsTestResolver1) B() *string { return nil }
155-
func (r selectedFieldsTestResolver1) C() int32 { return 1 }
156-
func (r selectedFieldsTestResolver1) D() selectedFieldsTestDResolver {
157-
return selectedFieldsTestDResolver{}
158-
}
154+
type nestedAliasesArgsDirectivesDResolver struct{}
159155

160-
type selectedFieldsTestDResolver struct{}
156+
func (r nestedAliasesArgsDirectivesDResolver) Value() string { return "value" }
161157

162158
// Test 2: Union query result
163159

@@ -189,7 +185,7 @@ func TestSelectedFieldsUnionQueryResult(t *testing.T) {
189185

190186
gqltesting.RunTests(t, []*gqltesting.Test{
191187
{
192-
Schema: graphql.MustParseSchema(schemaString, &selectedFieldsResolver2{t}),
188+
Schema: graphql.MustParseSchema(schemaString, &unionQueryResultQueryResolver{t}),
193189
Query: `
194190
{
195191
test {
@@ -210,11 +206,11 @@ func TestSelectedFieldsUnionQueryResult(t *testing.T) {
210206
})
211207
}
212208

213-
type selectedFieldsResolver2 struct {
209+
type unionQueryResultQueryResolver struct {
214210
T *testing.T
215211
}
216212

217-
func (r *selectedFieldsResolver2) Test(ctx context.Context) []selectedFieldsTestUnion {
213+
func (r *unionQueryResultQueryResolver) Test(ctx context.Context) []unionQueryResultTestUnion {
218214
f := fields.Selected(ctx)
219215
if f == nil {
220216
failWithError(r.T, "selected field is nil")
@@ -240,34 +236,34 @@ func (r *selectedFieldsResolver2) Test(ctx context.Context) []selectedFieldsTest
240236
r.T.FailNow()
241237
}
242238

243-
return []selectedFieldsTestUnion{}
239+
return []unionQueryResultTestUnion{}
244240
}
245241

246242
type aOrB interface {
247243
ID() string
248244
}
249-
type selectedFieldsTestUnion struct{ aOrB }
245+
type unionQueryResultTestUnion struct{ aOrB }
250246

251-
type selectedFieldsTestAResolver2 struct{}
247+
type unionQueryResultAResolver struct{}
252248

253-
func (r selectedFieldsTestAResolver2) ID() string { return "" }
254-
func (r selectedFieldsTestAResolver2) Value() int32 { return 0 }
249+
func (r unionQueryResultAResolver) ID() string { return "" }
250+
func (r unionQueryResultAResolver) Value() int32 { return 0 }
255251

256-
type selectedFieldsTestBResolver2 struct{}
252+
type unionQueryResultBResolver struct{}
257253

258-
func (r selectedFieldsTestBResolver2) ID() string { return "" }
259-
func (r selectedFieldsTestBResolver2) Index() int32 { return 0 }
254+
func (r unionQueryResultBResolver) ID() string { return "" }
255+
func (r unionQueryResultBResolver) Index() int32 { return 0 }
260256

261-
func (r selectedFieldsTestUnion) ToA() (*selectedFieldsTestAResolver2, bool) {
262-
v, ok := r.aOrB.(selectedFieldsTestAResolver2)
257+
func (r unionQueryResultTestUnion) ToA() (*unionQueryResultAResolver, bool) {
258+
v, ok := r.aOrB.(unionQueryResultAResolver)
263259
if !ok {
264260
return nil, false
265261
}
266262
return &v, true
267263
}
268264

269-
func (r selectedFieldsTestUnion) ToB() (*selectedFieldsTestBResolver2, bool) {
270-
v, ok := r.aOrB.(selectedFieldsTestBResolver2)
265+
func (r unionQueryResultTestUnion) ToB() (*unionQueryResultBResolver, bool) {
266+
v, ok := r.aOrB.(unionQueryResultBResolver)
271267
if !ok {
272268
return nil, false
273269
}
@@ -302,7 +298,7 @@ func TestSelectedFieldsInterfaceQueryResult(t *testing.T) {
302298

303299
gqltesting.RunTests(t, []*gqltesting.Test{
304300
{
305-
Schema: graphql.MustParseSchema(schemaString, &selectedFieldsResolver3{t}),
301+
Schema: graphql.MustParseSchema(schemaString, &interfaceQueryResultQueryResolver{t}),
306302
Query: `
307303
{
308304
test {
@@ -315,11 +311,11 @@ func TestSelectedFieldsInterfaceQueryResult(t *testing.T) {
315311
})
316312
}
317313

318-
type selectedFieldsResolver3 struct {
314+
type interfaceQueryResultQueryResolver struct {
319315
T *testing.T
320316
}
321317

322-
func (r *selectedFieldsResolver3) Test(ctx context.Context) []identifiable {
318+
func (r *interfaceQueryResultQueryResolver) Test(ctx context.Context) []interfaceQueryResultIdentifiable {
323319
f := fields.Selected(ctx)
324320
if f == nil {
325321
failWithError(r.T, "selected field is nil")
@@ -335,13 +331,13 @@ func (r *selectedFieldsResolver3) Test(ctx context.Context) []identifiable {
335331
failWithError(r.T, "id field assertion field")
336332
}
337333

338-
return []identifiable{}
334+
return []interfaceQueryResultIdentifiable{}
339335
}
340336

341-
type identifiable interface {
337+
type interfaceQueryResultIdentifiable interface {
342338
ID() string
343-
ToA() (*selectedFieldsTestAResolver2, bool)
344-
ToB() (*selectedFieldsTestBResolver2, bool)
339+
ToA() (*unionQueryResultAResolver, bool)
340+
ToB() (*unionQueryResultBResolver, bool)
345341
}
346342

347343
// Test 4: Nested fields lookup
@@ -374,7 +370,7 @@ func TestSelectedFieldsNestedFieldsLookup(t *testing.T) {
374370

375371
gqltesting.RunTests(t, []*gqltesting.Test{
376372
{
377-
Schema: graphql.MustParseSchema(schemaString, &selectedFieldsResolver4{t}),
373+
Schema: graphql.MustParseSchema(schemaString, &nestedFieldsLookupQueryResolver{t}),
378374
Query: `
379375
{
380376
test {
@@ -393,11 +389,11 @@ func TestSelectedFieldsNestedFieldsLookup(t *testing.T) {
393389
})
394390
}
395391

396-
type selectedFieldsResolver4 struct {
392+
type nestedFieldsLookupQueryResolver struct {
397393
T *testing.T
398394
}
399395

400-
func (r *selectedFieldsResolver4) Test(ctx context.Context) selectedFieldsResolver4Test {
396+
func (r *nestedFieldsLookupQueryResolver) Test(ctx context.Context) nestedFieldsLookupTestResolver {
401397
testField := fields.Selected(ctx)
402398
if !(testField != nil && testField.Name == "test" && testField.TypeName == "Test!" && testField.Alias == "test") {
403399
failWithError(r.T, "test field assertion failed")
@@ -419,24 +415,30 @@ func (r *selectedFieldsResolver4) Test(ctx context.Context) selectedFieldsResolv
419415
valueField.Alias == "value" && len(valueField.Fields) == 0) {
420416
failWithError(r.T, "value field assertion failed")
421417
}
422-
return selectedFieldsResolver4Test{}
418+
return nestedFieldsLookupTestResolver{}
423419
}
424420

425-
type selectedFieldsResolver4Test struct{}
421+
type nestedFieldsLookupTestResolver struct{}
426422

427-
func (r selectedFieldsResolver4Test) A() selectedFieldsResolver4A { return selectedFieldsResolver4A{} }
423+
func (r nestedFieldsLookupTestResolver) A() nestedFieldsLookupAResolver {
424+
return nestedFieldsLookupAResolver{}
425+
}
428426

429-
type selectedFieldsResolver4A struct{}
427+
type nestedFieldsLookupAResolver struct{}
430428

431-
func (r selectedFieldsResolver4A) B() selectedFieldsResolver4B { return selectedFieldsResolver4B{} }
429+
func (r nestedFieldsLookupAResolver) B() nestedFieldsLookupBResolver {
430+
return nestedFieldsLookupBResolver{}
431+
}
432432

433-
type selectedFieldsResolver4B struct{}
433+
type nestedFieldsLookupBResolver struct{}
434434

435-
func (r selectedFieldsResolver4B) C() selectedFieldsResolver4C { return selectedFieldsResolver4C{} }
435+
func (r nestedFieldsLookupBResolver) C() nestedFieldsLookupCResolver {
436+
return nestedFieldsLookupCResolver{}
437+
}
436438

437-
type selectedFieldsResolver4C struct{}
439+
type nestedFieldsLookupCResolver struct{}
438440

439-
func (r selectedFieldsResolver4C) Value() string { return "value" }
441+
func (r nestedFieldsLookupCResolver) Value() string { return "value" }
440442

441443
// Utils
442444

0 commit comments

Comments
 (0)