Skip to content

Commit 31c0a4c

Browse files
committed
@testcontainers annotation moved to TestContainersConfiguration,
avoiding the Spring bug spring-projects/spring-framework#26694
1 parent 8f84a16 commit 31c0a4c

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveNotifierTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ import org.springframework.kafka.core.ConsumerFactory
1313
import org.springframework.kafka.test.utils.KafkaTestUtils
1414
import org.springframework.test.annotation.DirtiesContext
1515
import org.springframework.test.context.junit.jupiter.EnabledIf
16-
import org.testcontainers.junit.jupiter.Testcontainers
1716
import java.time.LocalDateTime
1817

1918
@SpringBootTest(classes = [KafkaMoveNotifier::class])
2019
@EnabledIf(expression = "\${test.container.enabled:false}", loadContext = true)
2120
@EnableAutoConfiguration
2221
@Import(TestContainersConfiguration::class)
23-
@Testcontainers
2422
@DirtiesContext
2523
internal class ContainerKafkaMoveNotifierTest(
2624
@Autowired

kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/ContainerKafkaMoveReceiverTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ import org.springframework.context.annotation.Import
1515
import org.springframework.kafka.core.ProducerFactory
1616
import org.springframework.test.annotation.DirtiesContext
1717
import org.springframework.test.context.junit.jupiter.EnabledIf
18-
import org.testcontainers.junit.jupiter.Testcontainers
1918
import java.time.LocalDateTime
2019

2120
@SpringBootTest(classes = [KafkaMoveReceiver::class])
2221
@EnabledIf(expression = "\${test.container.enabled:false}", loadContext = true)
2322
@EnableAutoConfiguration
2423
@Import(TestContainersConfiguration::class)
25-
@Testcontainers
2624
@DirtiesContext
2725
internal class ContainerKafkaMoveReceiverTest(
2826
@Autowired

kotlin-app/src/test/kotlin/de/igorakkerman/demo/kafka/kafka/container/TestContainersConfiguration.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ import org.springframework.kafka.core.DefaultKafkaProducerFactory
1414
import org.springframework.kafka.core.ProducerFactory
1515
import org.testcontainers.containers.KafkaContainer
1616
import org.testcontainers.junit.jupiter.Container
17+
import org.testcontainers.junit.jupiter.Testcontainers
1718
import org.testcontainers.utility.DockerImageName
1819

1920
@TestConfiguration
2021
@ConditionalOnProperty("test.container.enabled", havingValue = "true")
22+
@Testcontainers
2123
internal class TestContainersConfiguration {
2224

2325
@Container

0 commit comments

Comments
 (0)