From 39c31368a6f108110371a8831affd51bc488ee0d Mon Sep 17 00:00:00 2001 From: "Sachin D. Shinde" Date: Mon, 23 Mar 2020 19:03:51 -0700 Subject: [PATCH] Fix FederationTest and SchemaUtils --- .../federation/graphqljava/FederationTest.java | 16 ++++++++++++++-- .../federation/graphqljava/SchemaUtils.java | 4 +++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/graphql-java-support/src/test/java/com/apollographql/federation/graphqljava/FederationTest.java b/graphql-java-support/src/test/java/com/apollographql/federation/graphqljava/FederationTest.java index 2378440a..faf2320c 100644 --- a/graphql-java-support/src/test/java/com/apollographql/federation/graphqljava/FederationTest.java +++ b/graphql-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 index e089db58..285cef22 100644 --- 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) {