From 24e797f8c20a179e8b6cfea2fc35cea3830f5ed2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 26 Jun 2024 10:46:00 +0100 Subject: [PATCH] Update spring-boot-smoke-test-amqp to use docker-test plugin See gh-41228 --- .../spring-boot-smoke-test-amqp/build.gradle | 15 ++++++++------- .../amqp/SampleAmqpSimpleApplicationSslTests.java | 0 .../amqp/SampleAmqpSimpleApplicationTests.java | 0 .../smoketest/amqp/SecureRabbitMqContainer.java | 0 4 files changed, 8 insertions(+), 7 deletions(-) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java (100%) rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/{test => dockerTest}/java/smoketest/amqp/SecureRabbitMqContainer.java (100%) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle index 4ef5cf07a46..10b6ac14c48 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle @@ -1,17 +1,18 @@ plugins { id "java" id "org.springframework.boot.conventions" + id "org.springframework.boot.docker-test" } description = "Spring Boot AMQP smoke test" dependencies { + dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-testcontainers")) + dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) + dockerTestImplementation("org.awaitility:awaitility") + dockerTestImplementation("org.testcontainers:junit-jupiter") + dockerTestImplementation("org.testcontainers:rabbitmq") + implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-amqp")) - - testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) - testImplementation(project(":spring-boot-project:spring-boot-testcontainers")) - testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation("org.awaitility:awaitility") - testImplementation("org.testcontainers:junit-jupiter") - testImplementation("org.testcontainers:rabbitmq") } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SecureRabbitMqContainer.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java similarity index 100% rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/test/java/smoketest/amqp/SecureRabbitMqContainer.java rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java