From 7d76019345a4ed86ac028b9c64d7bb9d7918f68f Mon Sep 17 00:00:00 2001 From: "Sachin D. Shinde" Date: Mon, 23 Mar 2020 19:03:51 -0700 Subject: [PATCH] Fix FederationTest --- .../federation/graphqljava/FederationTest.java | 16 ++++++++++++++-- .../federation/graphqljava/SchemaUtils.java | 1 + 2 files changed, 15 insertions(+), 2 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 fda8ecb3..d33743f3 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 @@ -36,13 +36,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.printWithoutStandardDirectiveDefinitions(federated)); + "}\n" + + "\n" + + "scalar _FieldSet\n", SchemaUtils.printWithoutStandardDirectiveDefinitions(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 19b912d6..4fe3b7a1 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 @@ -22,6 +22,7 @@ private SchemaUtils() { static String printWithoutStandardDirectiveDefinitions(GraphQLSchema schema) { return new FederationSdlPrinter(FederationSdlPrinter.Options.defaultOptions() + .includeScalarTypes(true) .includeDirectives(directive -> !standardDirectives.contains(directive.getName())) ).print(schema); }