This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3676 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit cc879d20a6ddc88229073e1bab204c68c36469d0 Author: danhaywood <[email protected]> AuthorDate: Wed Jan 17 22:37:01 2024 +0000 CAUSEWAY-3676: towards dumping the schema --- incubator/viewers/graphql/test/pom.xml | 4 ++++ .../CausewayViewerGraphqlTestModuleIntegTestAbstract.java | 4 ++-- ...ngeName.submit.gql => EndToEnd_IntegTest.changeName.gql} | 0 ....createE1.submit.gql => EndToEnd_IntegTest.createE1.gql} | 0 ...bmit.gql => EndToEnd_IntegTest.find_all_departments.gql} | 0 .../viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.java | 11 +++++++++++ .../EndToEnd_IntegTest.schema.gql} | 0 .../viewer/test/schema/GqlSchema_detail_IntegTest.java | 4 +--- .../viewer/test/schema/GqlSchema_print_IntegTest.java | 13 +++++++++---- 9 files changed, 27 insertions(+), 9 deletions(-) diff --git a/incubator/viewers/graphql/test/pom.xml b/incubator/viewers/graphql/test/pom.xml index c9a13bf825..2e85f61f34 100644 --- a/incubator/viewers/graphql/test/pom.xml +++ b/incubator/viewers/graphql/test/pom.xml @@ -43,6 +43,10 @@ <build> <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> <testResource> <directory>src/test/java</directory> <filtering>false</filtering> diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java index 028d32d3b5..217dc0417f 100644 --- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java +++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/CausewayViewerGraphqlTestModuleIntegTestAbstract.java @@ -141,7 +141,7 @@ public abstract class CausewayViewerGraphqlTestModuleIntegTestAbstract { protected HttpGraphQlTester graphQlTester() { WebTestClient client = WebTestClient.bindToServer() - .baseUrl("http://0.0.0.0:"; + port + "/graphql") + .baseUrl(String.format("http://0.0.0.0:%d/graphql";, port)) .build(); return HttpGraphQlTester.create(client); } @@ -155,7 +155,7 @@ public abstract class CausewayViewerGraphqlTestModuleIntegTestAbstract { * @throws Exception if an error occurs during the submission */ protected String submit() throws Exception{ - val httpRequest = buildRequest(testInfo, ".submit.gql"); + val httpRequest = buildRequest(testInfo, ".gql"); return submitRequest(httpRequest); } diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.changeName.submit.gql b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.changeName.gql similarity index 100% rename from incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.changeName.submit.gql rename to incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.changeName.gql diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.createE1.submit.gql b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.createE1.gql similarity index 100% rename from incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.createE1.submit.gql rename to incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.createE1.gql diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.find_all_departments.submit.gql b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.find_all_departments.gql similarity index 100% rename from incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.find_all_departments.submit.gql rename to incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.find_all_departments.gql diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.java index b4bedbfa57..e4b1f40d40 100644 --- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.java +++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.java @@ -18,6 +18,7 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.e2e; +import java.io.File; import java.io.IOException; import java.lang.reflect.Method; import java.net.URI; @@ -25,6 +26,9 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; @@ -53,6 +57,7 @@ import org.approvaltests.reporters.TextWebReporter; import org.approvaltests.reporters.UseReporter; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; @@ -93,6 +98,12 @@ public class EndToEnd_IntegTest extends CausewayViewerGraphqlTestModuleIntegTest }); } + @Test + @UseReporter({MyWinMergeDiffReporter.class, DiffReporter.class}) + void schema() throws Exception { + Approvals.verify(submit(), jsonOptions()); + } + @Test @UseReporter({MyWinMergeDiffReporter.class, DiffReporter.class}) void schema_types_name() throws Exception { diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/introspectquery/introspection-query-request.gql b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.schema.gql similarity index 100% rename from incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/introspectquery/introspection-query-request.gql rename to incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/EndToEnd_IntegTest.schema.gql diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_detail_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_detail_IntegTest.java index 65f10c4874..bd709b2e19 100644 --- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_detail_IntegTest.java +++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_detail_IntegTest.java @@ -22,6 +22,7 @@ import java.util.List; import javax.inject.Inject; +import org.apache.causeway.commons.internal.ioc._IocContainer; import org.apache.causeway.viewer.graphql.viewer.test.domain.DeptHead; import org.junit.jupiter.api.BeforeEach; @@ -170,9 +171,6 @@ public class GqlSchema_detail_IntegTest extends CausewayViewerGraphqlTestModuleI assertTrue(codeRegistry.hasDataFetcher(FieldCoordinates.coordinates("gqltestdomain_E1", "e2"))); DataFetcher<?> dataFetcher = codeRegistry.getDataFetcher(FieldCoordinates.coordinates("gqltestdomain_E1", "e2"), (GraphQLFieldDefinition) gqltestdomain_e1.getChildren().get(0)); assertNotNull(dataFetcher); - - } - } diff --git a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java index b12cd83ef3..3ceac932e9 100644 --- a/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java +++ b/incubator/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/schema/GqlSchema_print_IntegTest.java @@ -18,6 +18,9 @@ */ package org.apache.causeway.viewer.graphql.viewer.test.schema; +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.stream.Collectors; import javax.inject.Inject; @@ -60,17 +63,19 @@ public class GqlSchema_print_IntegTest extends CausewayViewerGraphqlTestModuleIn assertNotNull(graphQlSourceForCauseway); } - @UseReporter({MyWinMergeDiffReporter.class, DiffReporter.class}) @Test - void schema() { + void schema() throws Exception { + val graphQL = graphQlSourceForCauseway.graphQl(); val graphQLSchema = graphQL.getGraphQLSchema(); val printer = new SchemaPrinter(); - val schemaDefinition = printer.print(graphQLSchema); + val submit = printer.print(graphQLSchema); + + File targetFile1 = new File("src/test/resources/schema.gql"); - Approvals.verify(schemaDefinition, gqlSchemaOptions()); + Files.write(Paths.get(targetFile1.getPath()), submit.getBytes()); } private Options gqlSchemaOptions() {
