From 2927213a8d9dca8673e0a63a1c667730aa4b28fd Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Thu, 7 Feb 2019 11:40:38 -0600 Subject: [PATCH] Split reactive and non-reactive integration tests into separate subprojects. --- spring-credhub-integration-tests/build.gradle | 4 +- .../build.gradle | 71 +++++++++++++++++++ .../ReactiveCertificateIntegrationTests.java | 0 .../ReactiveCredHubIntegrationTests.java | 0 .../ReactiveCredentialIntegrationTests.java | 0 .../ReactiveInfoIntegrationTests.java | 0 ...ReactiveInterpolationIntegrationTests.java | 0 .../ReactivePermissionIntegrationTests.java | 0 .../ReactivePermissionV2IntegrationTests.java | 0 .../credhub/integration/TestApplication.java | 27 +++++++ 10 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 spring-credhub-reactive-integration-tests/build.gradle rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactiveCertificateIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactiveCredHubIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactiveInfoIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactiveInterpolationIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactivePermissionIntegrationTests.java (100%) rename {spring-credhub-integration-tests => spring-credhub-reactive-integration-tests}/src/test/java/org/springframework/credhub/integration/ReactivePermissionV2IntegrationTests.java (100%) create mode 100644 spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/TestApplication.java diff --git a/spring-credhub-integration-tests/build.gradle b/spring-credhub-integration-tests/build.gradle index 1f50f11..370839b 100644 --- a/spring-credhub-integration-tests/build.gradle +++ b/spring-credhub-integration-tests/build.gradle @@ -43,8 +43,7 @@ dependencies { compile project(":spring-credhub-starter") compile("org.springframework.boot:spring-boot-starter") - compile("org.springframework.boot:spring-boot-starter-webflux") - compile("io.projectreactor.netty:reactor-netty") + compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.security:spring-security-config") compile("org.springframework.security:spring-security-oauth2-client") @@ -60,7 +59,6 @@ dependencies { } testCompile("org.springframework.boot:spring-boot-starter-test") - testCompile("io.projectreactor:reactor-test") testCompile("org.assertj:assertj-core:${assertJVersion}") } diff --git a/spring-credhub-reactive-integration-tests/build.gradle b/spring-credhub-reactive-integration-tests/build.gradle new file mode 100644 index 0000000..9faf46d --- /dev/null +++ b/spring-credhub-reactive-integration-tests/build.gradle @@ -0,0 +1,71 @@ +/* + * Copyright 2016-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +description = 'Spring CredHub Reactive Integration Tests' + +buildscript { + dependencies { + classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE' + classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE' + classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}" + } + + repositories { + mavenCentral() + maven { url "https://repo.spring.io/plugins-release" } + } +} + +apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'eclipse' + +apply plugin: 'propdeps' +apply plugin: 'propdeps-maven' +apply plugin: 'propdeps-idea' +apply plugin: 'propdeps-eclipse' +apply plugin: 'org.springframework.boot' + +dependencies { + compile project(":spring-credhub-starter") + compile("org.springframework.boot:spring-boot-starter") + + compile("org.springframework.boot:spring-boot-starter-webflux") + compile("io.projectreactor.netty:reactor-netty") + + compile("org.springframework.security:spring-security-config") + compile("org.springframework.security:spring-security-oauth2-client") + + testCompile("org.springframework.boot:spring-boot-starter-test") + testCompile("io.projectreactor:reactor-test") + testCompile("org.assertj:assertj-core:${assertJVersion}") +} + +test { + onlyIf { + project.hasProperty("integrationTests") + } +} + +bootJar { + enabled = false +} + +configurations.archives.artifacts.clear() + +repositories { + mavenCentral() +} \ No newline at end of file diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCertificateIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCertificateIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCertificateIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCertificateIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredHubIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredHubIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredHubIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredHubIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveCredentialIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInfoIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInfoIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInfoIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInfoIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInterpolationIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInterpolationIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInterpolationIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactiveInterpolationIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionIntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionIntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionIntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionIntegrationTests.java diff --git a/spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionV2IntegrationTests.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionV2IntegrationTests.java similarity index 100% rename from spring-credhub-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionV2IntegrationTests.java rename to spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/ReactivePermissionV2IntegrationTests.java diff --git a/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/TestApplication.java b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/TestApplication.java new file mode 100644 index 0000000..0f80053 --- /dev/null +++ b/spring-credhub-reactive-integration-tests/src/test/java/org/springframework/credhub/integration/TestApplication.java @@ -0,0 +1,27 @@ +/* + * Copyright 2017-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.credhub.integration; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestApplication { + public static void main(String[] args) { + SpringApplication.run(TestApplication.class, args); + } +}