Skip to content

Commit b02e379

Browse files
dondonzdondonz
committed
Update tests to use new methods whilst retaining some legacy tests for coverage
1 parent 9f7eb53 commit b02e379

10 files changed

Lines changed: 120 additions & 87 deletions

‎src/main/java/graphql/schema/GraphqlDirectivesContainerTypeBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import static graphql.Assert.assertNotNull;
99

10-
@SuppressWarnings("unchecked")
1110
@Internal
1211
public abstract class GraphqlDirectivesContainerTypeBuilder<B extends GraphqlDirectivesContainerTypeBuilder<B, BASE>, BASE extends GraphqlTypeBuilder<BASE>> extends GraphqlTypeBuilder<BASE> {
1312

@@ -25,7 +24,7 @@ public B replaceAppliedDirectives(List<GraphQLAppliedDirective> directives) {
2524
public B addAppliedDirectives(GraphQLAppliedDirective... directives) {
2625
assertNotNull(directives, () -> "directives can't be null");
2726
for (GraphQLAppliedDirective directive : directives) {
28-
withAppliedDirective(directive);
27+
addAppliedDirective(directive);
2928
}
3029
return (B) this;
3130
}

‎src/test/groovy/graphql/execution/ValuesResolverTest.groovy‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ValuesResolverTest extends Specification {
100100
.type(GraphQLString)
101101
def inputType = newInputObject()
102102
.name("Person")
103-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
103+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
104104
.field(aField)
105105
.field(bField)
106106
.build()
@@ -418,7 +418,7 @@ class ValuesResolverTest extends Specification {
418418
given: "schema defining input object"
419419
def inputObjectType = newInputObject()
420420
.name("oneOfInputObject")
421-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
421+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
422422
.field(newInputObjectField()
423423
.name("a")
424424
.type(GraphQLString)
@@ -498,7 +498,7 @@ class ValuesResolverTest extends Specification {
498498
given: "schema defining input object"
499499
def oneOfObjectType = newInputObject()
500500
.name("OneOfInputObject")
501-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
501+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
502502
.field(newInputObjectField()
503503
.name("a")
504504
.type(GraphQLString)
@@ -588,7 +588,7 @@ class ValuesResolverTest extends Specification {
588588
given: "schema defining input object"
589589
def oneOfObjectType = newInputObject()
590590
.name("OneOfInputObject")
591-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
591+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
592592
.field(newInputObjectField()
593593
.name("a")
594594
.type(GraphQLString)
@@ -636,7 +636,7 @@ class ValuesResolverTest extends Specification {
636636
given: "schema defining input object"
637637
def inputObjectType = newInputObject()
638638
.name("oneOfInputObject")
639-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
639+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
640640
.field(newInputObjectField()
641641
.name("a")
642642
.type(GraphQLString)
@@ -677,7 +677,7 @@ class ValuesResolverTest extends Specification {
677677
given: "schema defining input object"
678678
def inputObjectType = newInputObject()
679679
.name("oneOfInputObject")
680-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
680+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
681681
.field(newInputObjectField()
682682
.name("a")
683683
.type(GraphQLString)
@@ -738,7 +738,7 @@ class ValuesResolverTest extends Specification {
738738
given: "schema defining input object"
739739
def inputObjectType = newInputObject()
740740
.name("oneOfInputObject")
741-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
741+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
742742
.field(newInputObjectField()
743743
.name("a")
744744
.type(GraphQLString)
@@ -792,7 +792,7 @@ class ValuesResolverTest extends Specification {
792792
given: "schema defining input object"
793793
def inputObjectType = newInputObject()
794794
.name("oneOfInputObject")
795-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
795+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
796796
.field(newInputObjectField()
797797
.name("a")
798798
.type(GraphQLString)
@@ -853,7 +853,7 @@ class ValuesResolverTest extends Specification {
853853
given: "schema defining input object"
854854
def inputObjectType = newInputObject()
855855
.name("oneOfInputObject")
856-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
856+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
857857
.field(newInputObjectField()
858858
.name("a")
859859
.type(GraphQLString)
@@ -914,7 +914,7 @@ class ValuesResolverTest extends Specification {
914914
given: "schema defining input object"
915915
def inputObjectType = newInputObject()
916916
.name("oneOfInputObject")
917-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
917+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
918918
.field(newInputObjectField()
919919
.name("a")
920920
.type(GraphQLString)
@@ -962,7 +962,7 @@ class ValuesResolverTest extends Specification {
962962
given: "schema defining input object"
963963
def inputObjectType = newInputObject()
964964
.name("oneOfInputObject")
965-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
965+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
966966
.field(newInputObjectField()
967967
.name("a")
968968
.type(GraphQLString)
@@ -1010,7 +1010,7 @@ class ValuesResolverTest extends Specification {
10101010
given: "schema defining input object"
10111011
def inputObjectType = newInputObject()
10121012
.name("oneOfInputObject")
1013-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
1013+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
10141014
.field(newInputObjectField()
10151015
.name("a")
10161016
.type(GraphQLString)

‎src/test/groovy/graphql/schema/GraphQLArgumentTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ class GraphQLArgumentTest extends Specification {
231231
def field = newFieldDefinition()
232232
.name("hello")
233233
.type(GraphQLString)
234-
.withAppliedDirective(directive.toAppliedDirective())
234+
.addAppliedDirective(directive.toAppliedDirective())
235235
.build()
236236
when:
237237
newSchema()

‎src/test/groovy/graphql/schema/GraphQLInputObjectTypeTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class GraphQLInputObjectTypeTest extends Specification {
103103
when:
104104
inputObjectType = newInputObject().name("TestInputObjectType")
105105
.field(newInputObjectField().name("NAME").type(GraphQLInt))
106-
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
106+
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
107107
.build()
108108
then:
109109
inputObjectType.isOneOf()

0 commit comments

Comments
 (0)