From dd81d72fcb07e0e85cdb2e926250e11cabbb9211 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Fri, 10 Dec 2021 22:52:14 +0100 Subject: [PATCH] Start moving testing infra as test fixtures This commit applies the `java-test-fixtures` to the project modules and starts moving common infrastructure to the testFixtures configuration. See gh-217 --- build.gradle | 1 + spring-graphql-test/build.gradle | 1 + .../java/org/springframework/graphql/GraphQlServiceSetup.java | 0 .../java/org/springframework/graphql/GraphQlSetup.java | 0 .../java/org/springframework/graphql/WebGraphQlSetup.java | 0 5 files changed, 2 insertions(+) rename spring-graphql/src/{test => testFixtures}/java/org/springframework/graphql/GraphQlServiceSetup.java (100%) rename spring-graphql/src/{test => testFixtures}/java/org/springframework/graphql/GraphQlSetup.java (100%) rename spring-graphql/src/{test => testFixtures}/java/org/springframework/graphql/WebGraphQlSetup.java (100%) diff --git a/build.gradle b/build.gradle index fdf567ab..ddf382cd 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,7 @@ subprojects { configure(moduleProjects) { apply plugin: 'java-library' + apply plugin: 'java-test-fixtures' apply plugin: 'org.springframework.graphql.compiler' java { diff --git a/spring-graphql-test/build.gradle b/spring-graphql-test/build.gradle index fcab9fe9..704751e4 100644 --- a/spring-graphql-test/build.gradle +++ b/spring-graphql-test/build.gradle @@ -17,6 +17,7 @@ dependencies { compileOnly 'com.google.code.findbugs:jsr305' compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core' + testImplementation(testFixtures(project(":spring-graphql"))) testImplementation 'org.junit.jupiter:junit-jupiter' testImplementation 'org.assertj:assertj-core' testImplementation 'org.mockito:mockito-core' diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlServiceSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java similarity index 100% rename from spring-graphql/src/test/java/org/springframework/graphql/GraphQlServiceSetup.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlServiceSetup.java diff --git a/spring-graphql/src/test/java/org/springframework/graphql/GraphQlSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java similarity index 100% rename from spring-graphql/src/test/java/org/springframework/graphql/GraphQlSetup.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/GraphQlSetup.java diff --git a/spring-graphql/src/test/java/org/springframework/graphql/WebGraphQlSetup.java b/spring-graphql/src/testFixtures/java/org/springframework/graphql/WebGraphQlSetup.java similarity index 100% rename from spring-graphql/src/test/java/org/springframework/graphql/WebGraphQlSetup.java rename to spring-graphql/src/testFixtures/java/org/springframework/graphql/WebGraphQlSetup.java