From bcc27596bed5c57943286d8b0df0686318527ab8 Mon Sep 17 00:00:00 2001
From: Igor Akkerman <commit@dynamite.software>
Date: Wed, 17 Mar 2021 14:10:06 +0100
Subject: [PATCH] @TestContainers annotation moved to
 TestContainersConfiguration, avoiding the Spring bug
 https://github.com/spring-projects/spring-framework/issues/26694

---
 .../kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt     | 2 --
 .../kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt     | 2 --
 .../demo/kafka/kafka/container/TestContainersConfiguration.kt   | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt
index 7c1fd01..a4d503c 100644
--- a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt
+++ b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt
@@ -13,14 +13,12 @@ import org.springframework.kafka.core.ConsumerFactory
 import org.springframework.kafka.test.utils.KafkaTestUtils
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.junit.jupiter.EnabledIf
-import org.testcontainers.junit.jupiter.Testcontainers
 import java.time.LocalDateTime
 
 @SpringBootTest(classes = [KafkaMoveNotifier::class])
 @EnabledIf(expression = "\${test.container.enabled:false}", loadContext = true)
 @EnableAutoConfiguration
 @Import(TestContainersConfiguration::class)
-@Testcontainers
 @DirtiesContext
 internal class ContainerKafkaMoveNotifierTest(
     @Autowired
diff --git a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt
index 619e83d..3742dea 100644
--- a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt
+++ b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt
@@ -15,14 +15,12 @@ import org.springframework.context.annotation.Import
 import org.springframework.kafka.core.ProducerFactory
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.junit.jupiter.EnabledIf
-import org.testcontainers.junit.jupiter.Testcontainers
 import java.time.LocalDateTime
 
 @SpringBootTest(classes = [KafkaMoveReceiver::class])
 @EnabledIf(expression = "\${test.container.enabled:false}", loadContext = true)
 @EnableAutoConfiguration
 @Import(TestContainersConfiguration::class)
-@Testcontainers
 @DirtiesContext
 internal class ContainerKafkaMoveReceiverTest(
     @Autowired
diff --git a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/TestContainersConfiguration.kt b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/TestContainersConfiguration.kt
index 0310276..ebba297 100644
--- a/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/TestContainersConfiguration.kt
+++ b/kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/TestContainersConfiguration.kt
@@ -14,10 +14,12 @@ import org.springframework.kafka.core.DefaultKafkaProducerFactory
 import org.springframework.kafka.core.ProducerFactory
 import org.testcontainers.containers.KafkaContainer
 import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
 import org.testcontainers.utility.DockerImageName
 
 @TestConfiguration
 @ConditionalOnProperty("test.container.enabled", havingValue = "true")
+@Testcontainers
 internal class TestContainersConfiguration {
 
     @Container