Skip to content

Commit 276cdea

Browse files
dondonzdondonz
committed
Change tests back
1 parent 39d451c commit 276cdea

8 files changed

Lines changed: 28 additions & 29 deletions

File tree

‎src/main/java/graphql/schema/idl/SchemaGeneratorAppliedDirectiveHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static void buildAppliedDirectives(SchemaGeneratorHelper.BuildContext buildCtx,
5050
}
5151
}
5252
for (GraphQLAppliedDirective appliedDirective : appliedDirectives.second) {
53-
builder.addAppliedDirective(appliedDirective);
53+
builder.withAppliedDirective(appliedDirective);
5454
}
5555
}
5656

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package graphql.execution
22

33
import graphql.Directives
44
import graphql.ErrorType
5-
import graphql.ExecutionInput
65
import graphql.GraphQLContext
76
import graphql.GraphQLException
87
import graphql.TestUtil
@@ -100,7 +99,7 @@ class ValuesResolverTest extends Specification {
10099
.type(GraphQLString)
101100
def inputType = newInputObject()
102101
.name("Person")
103-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
102+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
104103
.field(aField)
105104
.field(bField)
106105
.build()
@@ -418,7 +417,7 @@ class ValuesResolverTest extends Specification {
418417
given: "schema defining input object"
419418
def inputObjectType = newInputObject()
420419
.name("oneOfInputObject")
421-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
420+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
422421
.field(newInputObjectField()
423422
.name("a")
424423
.type(GraphQLString)
@@ -498,7 +497,7 @@ class ValuesResolverTest extends Specification {
498497
given: "schema defining input object"
499498
def oneOfObjectType = newInputObject()
500499
.name("OneOfInputObject")
501-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
500+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
502501
.field(newInputObjectField()
503502
.name("a")
504503
.type(GraphQLString)
@@ -588,7 +587,7 @@ class ValuesResolverTest extends Specification {
588587
given: "schema defining input object"
589588
def oneOfObjectType = newInputObject()
590589
.name("OneOfInputObject")
591-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
590+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
592591
.field(newInputObjectField()
593592
.name("a")
594593
.type(GraphQLString)
@@ -636,7 +635,7 @@ class ValuesResolverTest extends Specification {
636635
given: "schema defining input object"
637636
def inputObjectType = newInputObject()
638637
.name("oneOfInputObject")
639-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
638+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
640639
.field(newInputObjectField()
641640
.name("a")
642641
.type(GraphQLString)
@@ -677,7 +676,7 @@ class ValuesResolverTest extends Specification {
677676
given: "schema defining input object"
678677
def inputObjectType = newInputObject()
679678
.name("oneOfInputObject")
680-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
679+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
681680
.field(newInputObjectField()
682681
.name("a")
683682
.type(GraphQLString)
@@ -738,7 +737,7 @@ class ValuesResolverTest extends Specification {
738737
given: "schema defining input object"
739738
def inputObjectType = newInputObject()
740739
.name("oneOfInputObject")
741-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
740+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
742741
.field(newInputObjectField()
743742
.name("a")
744743
.type(GraphQLString)
@@ -792,7 +791,7 @@ class ValuesResolverTest extends Specification {
792791
given: "schema defining input object"
793792
def inputObjectType = newInputObject()
794793
.name("oneOfInputObject")
795-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
794+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
796795
.field(newInputObjectField()
797796
.name("a")
798797
.type(GraphQLString)
@@ -853,7 +852,7 @@ class ValuesResolverTest extends Specification {
853852
given: "schema defining input object"
854853
def inputObjectType = newInputObject()
855854
.name("oneOfInputObject")
856-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
855+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
857856
.field(newInputObjectField()
858857
.name("a")
859858
.type(GraphQLString)
@@ -914,7 +913,7 @@ class ValuesResolverTest extends Specification {
914913
given: "schema defining input object"
915914
def inputObjectType = newInputObject()
916915
.name("oneOfInputObject")
917-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
916+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
918917
.field(newInputObjectField()
919918
.name("a")
920919
.type(GraphQLString)
@@ -962,7 +961,7 @@ class ValuesResolverTest extends Specification {
962961
given: "schema defining input object"
963962
def inputObjectType = newInputObject()
964963
.name("oneOfInputObject")
965-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
964+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
966965
.field(newInputObjectField()
967966
.name("a")
968967
.type(GraphQLString)
@@ -1010,7 +1009,7 @@ class ValuesResolverTest extends Specification {
10101009
given: "schema defining input object"
10111010
def inputObjectType = newInputObject()
10121011
.name("oneOfInputObject")
1013-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
1012+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
10141013
.field(newInputObjectField()
10151014
.name("a")
10161015
.type(GraphQLString)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class SchemaTraverserTest extends Specification {
203203
.name("foo")
204204
.coercing(coercing)
205205
.withDirective(mkDirective("bar", DirectiveLocation.SCALAR))
206-
.addAppliedDirective(GraphQLAppliedDirective.newDirective()
206+
.withAppliedDirective(GraphQLAppliedDirective.newDirective()
207207
.name("barApplied"))
208208
.build()
209209
new SchemaTraverser().depthFirst(visitor, scalarType)
@@ -219,7 +219,7 @@ class SchemaTraverserTest extends Specification {
219219
def objectType = GraphQLObjectType.newObject()
220220
.name("foo")
221221
.withDirective(mkDirective("bar", DirectiveLocation.OBJECT))
222-
.addAppliedDirective(GraphQLAppliedDirective.newDirective()
222+
.withAppliedDirective(GraphQLAppliedDirective.newDirective()
223223
.name("barApplied"))
224224
.build()
225225
new SchemaTraverser().depthFirst(visitor, objectType)
@@ -253,7 +253,7 @@ class SchemaTraverserTest extends Specification {
253253
.name("foo")
254254
.type(Scalars.GraphQLString)
255255
.withDirective(mkDirective("bar", DirectiveLocation.FIELD_DEFINITION))
256-
.addAppliedDirective(GraphQLAppliedDirective.newDirective()
256+
.withAppliedDirective(GraphQLAppliedDirective.newDirective()
257257
.name("barApplied"))
258258
.build()
259259
new SchemaTraverser().depthFirst(visitor, fieldDefinition)
@@ -270,7 +270,7 @@ class SchemaTraverserTest extends Specification {
270270
.name("foo")
271271
.type(Scalars.GraphQLString)
272272
.withDirective(mkDirective("bar", DirectiveLocation.ARGUMENT_DEFINITION))
273-
.addAppliedDirective(GraphQLAppliedDirective.newDirective()
273+
.withAppliedDirective(GraphQLAppliedDirective.newDirective()
274274
.name("barApplied"))
275275
.build()
276276
new SchemaTraverser().depthFirst(visitor, argument)
@@ -286,7 +286,7 @@ class SchemaTraverserTest extends Specification {
286286
def interfaceType = GraphQLInterfaceType.newInterface()
287287
.name("foo")
288288
.withDirective(mkDirective("bar", DirectiveLocation.INTERFACE))
289-
.addAppliedDirective(GraphQLAppliedDirective.newDirective()
289+
.withAppliedDirective(GraphQLAppliedDirective.newDirective()
290290
.name("barApplied"))
291291
.build()
292292
new SchemaTraverser().depthFirst(visitor, interfaceType)

‎src/test/groovy/graphql/schema/idl/SchemaPrinterTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,7 +2393,7 @@ type Query {
23932393
.build()
23942394

23952395
objType = newObject().name("obj").field({
2396-
it.name("f").type(GraphQLString).addAppliedDirective(newAppliedDirective)
2396+
it.name("f").type(GraphQLString).withAppliedDirective(newAppliedDirective)
23972397
}).build()
23982398

23992399
result = new SchemaPrinter().print(objType)
@@ -2414,7 +2414,7 @@ type Query {
24142414
.build()
24152415

24162416
GraphQLInputObjectType type = GraphQLInputObjectType.newInputObject().name("Person")
2417-
.field({ it.name("thisMustBeAPercentageSign").type(GraphQLString).addAppliedDirective(constraintAppliedDirective) })
2417+
.field({ it.name("thisMustBeAPercentageSign").type(GraphQLString).withAppliedDirective(constraintAppliedDirective) })
24182418
.build()
24192419

24202420
when:

‎src/test/groovy/graphql/schema/transform/FieldVisibilitySchemaTransformationTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ class FieldVisibilitySchemaTransformationTest extends Specification {
945945
def account = newObject()
946946
.name("Account")
947947
.field(newFieldDefinition().name("name").type(Scalars.GraphQLString).build())
948-
.field(newFieldDefinition().name("billingStatus").type(typeRef("SuperSecretCustomerData")).addAppliedDirective(privateDirective).build())
948+
.field(newFieldDefinition().name("billingStatus").type(typeRef("SuperSecretCustomerData")).withAppliedDirective(privateDirective).build())
949949
.build()
950950

951951
def billingStatus = newObject()
@@ -994,7 +994,7 @@ class FieldVisibilitySchemaTransformationTest extends Specification {
994994
def account = newObject()
995995
.name("Account")
996996
.field(newFieldDefinition().name("name").type(Scalars.GraphQLString).build())
997-
.field(newFieldDefinition().name("billingStatus").type(typeRef("BillingStatus")).addAppliedDirective(privateDirective).build())
997+
.field(newFieldDefinition().name("billingStatus").type(typeRef("BillingStatus")).withAppliedDirective(privateDirective).build())
998998
.build()
999999

10001000
def billingStatus = newObject()
@@ -1042,7 +1042,7 @@ class FieldVisibilitySchemaTransformationTest extends Specification {
10421042
def account = newObject()
10431043
.name("Account")
10441044
.field(newFieldDefinition().name("name").type(Scalars.GraphQLString).build())
1045-
.field(newFieldDefinition().name("billingStatus").type(typeRef("BillingStatus")).addAppliedDirective(privateDirective).build())
1045+
.field(newFieldDefinition().name("billingStatus").type(typeRef("BillingStatus")).withAppliedDirective(privateDirective).build())
10461046
.build()
10471047

10481048
def billingStatus = newObject()

‎src/test/groovy/graphql/schema/validation/AppliedDirectivesAreValidTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ class AppliedDirectivesAreValidTest extends Specification {
6666
def field = newFieldDefinition()
6767
.name("hello")
6868
.type(GraphQLString)
69-
.addAppliedDirectives(directive1.toAppliedDirective())
70-
.addAppliedDirectives(directive2.toAppliedDirective())
69+
.withAppliedDirectives(directive1.toAppliedDirective())
70+
.withAppliedDirectives(directive2.toAppliedDirective())
7171
.build()
7272

7373
when:

‎src/test/groovy/graphql/validation/SpecValidationSchema.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public class SpecValidationSchema {
190190

191191
public static final GraphQLInputObjectType oneOfInputType = GraphQLInputObjectType.newInputObject()
192192
.name("oneOfInputType")
193-
.addAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
193+
.withAppliedDirective(Directives.OneOfDirective.toAppliedDirective())
194194
.field(GraphQLInputObjectField.newInputObjectField()
195195
.name("a")
196196
.type(GraphQLString))

‎src/test/groovy/graphql/validation/ValidationUtilTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class ValidationUtilTest extends Specification {
211211
given:
212212
def inputObjectType = GraphQLInputObjectType.newInputObject()
213213
.name("inputObjectType")
214-
.addAppliedDirective(newDirective().name(OneOfDirective.getName()))
214+
.withAppliedDirective(newDirective().name(OneOfDirective.getName()))
215215
.field(GraphQLInputObjectField.newInputObjectField()
216216
.name("f1")
217217
.type(GraphQLString))
@@ -231,7 +231,7 @@ class ValidationUtilTest extends Specification {
231231
given:
232232
def inputObjectType = GraphQLInputObjectType.newInputObject()
233233
.name("inputObjectType")
234-
.addAppliedDirective(newDirective().name(OneOfDirective.getName()))
234+
.withAppliedDirective(newDirective().name(OneOfDirective.getName()))
235235
.field(GraphQLInputObjectField.newInputObjectField()
236236
.name("f1")
237237
.type(GraphQLString))

0 commit comments

Comments
 (0)