From 957e73044b66103834ec550af27b420a7ced70e1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:49:03 +0100 Subject: [PATCH] Update spring-boot-smoke-test-data-redis to use docker-test plugin See gh-41228 --- .../build.gradle | 27 ++++++++++--------- .../SampleRedisApplicationJedisSslTests.java | 0 ...ampleRedisApplicationReactiveSslTests.java | 0 .../redis/SampleRedisApplicationSslTests.java | 0 .../data/redis/SecureRedisContainer.java | 0 5 files changed, 14 insertions(+), 13 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SampleRedisApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/{test => dockerTest}/java/smoketest/data/redis/SecureRedisContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle index 6d785ff8df3..c7daa751063 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle @@ -1,23 +1,24 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot Data Redis smoke test" dependencies { - implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) + 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.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("redis.clients:jedis") - 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.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("redis.clients:jedis") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-redis")) } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationJedisSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationReactiveSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SampleRedisApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SampleRedisApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SecureRedisContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SecureRedisContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/test/java/smoketest/data/redis/SecureRedisContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/src/dockerTest/java/smoketest/data/redis/SecureRedisContainer.java