Fix FederationTest and SchemaUtils

apollographql · Mar 26, 2020 · 39c3136 · 39c3136
1 parent 03c0482
commit 39c3136
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/...l-java-support/src/test/java/com/apollographql/federation/graphqljava/FederationTest.java b/...l-java-support/src/test/java/com/apollographql/federation/graphqljava/FederationTest.java
@@ -35,13 +35,25 @@ class FederationTest {
     void testEmpty() {
         final GraphQLSchema federated = Federation.transform(emptySDL)
                 .build();
-        Assertions.assertEquals("type Query {\n" +
+        Assertions.assertEquals("directive @extends on OBJECT\n" +
+                "\n" +
+                "directive @external on FIELD_DEFINITION\n" +
+                "\n" +
+                "directive @key(fields: _FieldSet!) on OBJECT | INTERFACE\n" +
+                "\n" +
+                "directive @provides(fields: _FieldSet!) on FIELD_DEFINITION\n" +
+                "\n" +
+                "directive @requires(fields: _FieldSet!) on FIELD_DEFINITION\n" +
+                "\n" +
+                "type Query {\n" +
                 "  _service: _Service\n" +
                 "}\n" +
                 "\n" +
                 "type _Service {\n" +
                 "  sdl: String!\n" +
-                "}\n", SchemaUtils.printSchema(federated));
+                "}\n" +
+                "\n" +
+                "scalar _FieldSet\n", SchemaUtils.printSchema(federated));
 
         final GraphQLType _Service = federated.getType("_Service");
         assertNotNull(_Service, "_Service type present");

diff --git a/graphql-java-support/src/test/java/com/apollographql/federation/graphqljava/SchemaUtils.java b/graphql-java-support/src/test/java/com/apollographql/federation/graphqljava/SchemaUtils.java
@@ -16,7 +16,9 @@ private SchemaUtils() {
     }
 
     static String printSchema(GraphQLSchema schema) {
-        return new FederationSdlPrinter().print(schema);
+        return new FederationSdlPrinter(FederationSdlPrinter.Options.defaultOptions()
+                .includeScalarTypes(true)
+        ).print(schema);
     }
 
     static ExecutionResult execute(GraphQLSchema schema, String query) {