fix test

andimarek · andimarek · commit aacdc391c679 · 2025-10-18T09:31:35.000+10:00
diff --git a/src/test/groovy/graphql/schema/SchemaTransformerTest.groovy b/src/test/groovy/graphql/schema/SchemaTransformerTest.groovy
@@ -304,7 +304,7 @@ type SubChildChanged {
                 .name("Query")
                 .field({ builder ->
                     builder.name("foo")
-                           .type(Scalars.GraphQLString)
+                            .type(Scalars.GraphQLString)
                 }).build()
 
         def fooCoordinates = FieldCoordinates.coordinates("Query", "foo")
@@ -347,7 +347,7 @@ type SubChildChanged {
         })
 
         def fooTransformedCoordinates = FieldCoordinates.coordinates("Query", "fooChanged")
-        codeRegistry = codeRegistry.transform({it.dataFetcher(fooTransformedCoordinates, dataFetcher)})
+        codeRegistry = codeRegistry.transform({ it.dataFetcher(fooTransformedCoordinates, dataFetcher) })
         newSchema = newSchema.transform({
             builder -> builder.codeRegistry(codeRegistry)
         })
@@ -871,7 +871,7 @@ type Query {
             @Override
             TraversalControl visitGraphQLScalarType(GraphQLScalarType node, TraverserContext<GraphQLSchemaElement> context) {
                 if (node.getName() == "Foo") {
-                    GraphQLScalarType newNode = node.transform({sc -> sc.name("Bar")})
+                    GraphQLScalarType newNode = node.transform({ sc -> sc.name("Bar") })
                     return changeNode(context, newNode)
                 }
                 return super.visitGraphQLScalarType(node, context)
@@ -901,7 +901,7 @@ type Query {
             @Override
             TraversalControl visitGraphQLScalarType(GraphQLScalarType node, TraverserContext<GraphQLSchemaElement> context) {
                 if (node.getName() == "Foo") {
-                    GraphQLScalarType newNode = node.transform({sc -> sc.name("Bar")})
+                    GraphQLScalarType newNode = node.transform({ sc -> sc.name("Bar") })
                     return changeNode(context, newNode)
                 }
                 return super.visitGraphQLScalarType(node, context)
@@ -1056,8 +1056,17 @@ type Query {
         """
 
         def schema = TestUtil.schema(sdl)
+        schema = schema.transform { builder ->
+            for (def type : schema.getTypeMap().values()) {
+                if (type != schema.getQueryType() && type != schema.getMutationType() && type != schema.getSubscriptionType()) {
+                    builder.additionalType(type)
+                }
+            }
+        }
+
 
         def visitor = new GraphQLTypeVisitorStub() {
+
             @Override
             TraversalControl visitGraphQLFieldDefinition(GraphQLFieldDefinition node, TraverserContext<GraphQLSchemaElement> context) {
                 if (node.hasAppliedDirective("remove")) {
@@ -1075,23 +1084,22 @@ type Query {
                 return TraversalControl.CONTINUE
             }
         }
-
         when:
         def newSchema = SchemaTransformer.transformSchema(schema, visitor)
-        def newSdl = new SchemaPrinter().print(newSchema)
+        def printer = new SchemaPrinter(SchemaPrinter.Options.defaultOptions().includeDirectives(false))
+        def newSdl = printer.print(newSchema)
 
         then:
-        newSdl == """
-type Query {
-  customer: Customer
+        newSdl.trim() == """type Customer {
+  rental: Rental
 }
 
-type Customer {
-  rental: Rental
+type Query {
+  customer: Customer
 }
 
 type Rental {
   id: ID
-}""".stripIndent().trim()
+}""".trim()
     }
 }
