From a9be2e50e3ca7ff350e303831aa5411e13ef54f5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:47:01 +0100 Subject: [PATCH] Update spring-boot-smoke-test-data-cassandra to use docker-test plugin See gh-41228 --- .../build.gradle | 23 +++++++------- ...eCassandraApplicationReactiveSslTests.java | 0 .../SampleCassandraApplicationSslTests.java | 0 .../cassandra/SecureCassandraContainer.java | 0 .../resources/ssl/cassandra.yaml | 0 .../resources/ssl/test-ca.p12 | Bin .../resources/ssl/test-client.p12 | Bin .../resources/ssl/test-server.p12 | Bin .../build.gradle | 29 +++++++++--------- 9 files changed, 27 insertions(+), 25 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/java/smoketest/data/cassandra/SecureCassandraContainer.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/cassandra.yaml (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-ca.p12 (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-client.p12 (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/{test => dockerTest}/resources/ssl/test-server.p12 (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle index 651be2c7ee7..6fb7872d303 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle @@ -1,22 +1,23 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Cassandra smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("org.testcontainers:cassandra") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-cassandra-reactive")) - - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("org.testcontainers:cassandra") } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SecureCassandraContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SecureCassandraContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/java/smoketest/data/cassandra/SecureCassandraContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SecureCassandraContainer.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/cassandra.yaml b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/cassandra.yaml rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-ca.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-ca.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-ca.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-ca.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-client.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-client.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-client.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-client.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-server.p12 b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-server.p12 similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/test/resources/ssl/test-server.p12 rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/test-server.p12 diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle index fba550646ef..153cc49baea 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle @@ -1,25 +1,26 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Couchbase smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation("io.projectreactor:reactor-core") + dockerTestImplementation("io.projectreactor:reactor-test") + dockerTestImplementation("org.apache.httpcomponents.client5:httpclient5") + dockerTestImplementation("org.junit.jupiter:junit-jupiter") + dockerTestImplementation("org.junit.platform:junit-platform-engine") + dockerTestImplementation("org.junit.platform:junit-platform-launcher") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:testcontainers") + dockerTestImplementation("org.testcontainers:couchbase") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase-reactive")) - - testImplementation(project(":spring-boot-project:spring-boot-test")) - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation("io.projectreactor:reactor-core") - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.apache.httpcomponents.client5:httpclient5") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.junit.platform:junit-platform-engine") - testImplementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:testcontainers") - testImplementation("org.testcontainers:couchbase") }