test: improve system test stability

springwolf-core/src/test/java/io/github/springwolf/core/asyncapi/scanners/classes/spring/ComponentClassScannerIntegrationTest.java

@@ -16,7 +16,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 
 import java.util.Set;
@@ -32,7 +31,6 @@
             TestConditionalComponent.class,
             TestOtherConditionalComponent.class
         })
-@DirtiesContext
 class ComponentClassScannerIntegrationTest {
     @MockBean
     private AsyncApiDocketService asyncApiDocketService;

springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/ProducerSystemTest.java → springwolf-examples/springwolf-amqp-example/src/test/java/io/github/springwolf/examples/amqp/AmqpProducerSystemTest.java

@@ -15,8 +15,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -41,12 +42,11 @@
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
 @Testcontainers
-@DirtiesContext
 @TestMethodOrder(OrderAnnotation.class)
 @TestPropertySource(properties = {"spring.rabbitmq.host=localhost"})
 @Slf4j
 // @Ignore("Uncomment this line if you have issues running this test on your local machine.")
-public class ProducerSystemTest {
+public class AmqpProducerSystemTest {
     private static final String AMQP_NAME = "amqp";
 
     @Autowired
@@ -59,9 +59,16 @@ public class ProducerSystemTest {
     public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
             .withCopyFilesInContainer(".env") // do not copy all files in the directory
             .withServices(AMQP_NAME)
+            .withExposedService(AMQP_NAME, 5672)
             .waitingFor(AMQP_NAME, Wait.forLogMessage(".*Server startup complete.*", 1))
             .withLogConsumer(AMQP_NAME, l -> log.debug("amqp: {}", l.getUtf8StringWithoutLineEnding()));
 
+    @DynamicPropertySource
+    static void registerActiveMqBroker(DynamicPropertyRegistry registry) {
+        registry.add("spring.rabbitmq.host", () -> environment.getServiceHost(AMQP_NAME, 5672));
+        registry.add("spring.rabbitmq.port", () -> environment.getServicePort(AMQP_NAME, 5672));
+    }
+
     @Test
     @Order(1)
     void verifyAmqpIsAvailable() {

springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/ApiIntegrationTest.java

@@ -7,7 +7,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,10 +20,8 @@
 @SpringBootTest(
         classes = {SpringwolfCloudstreamExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EmbeddedKafka(
-        partitions = 1,
-        brokerProperties = {"listeners=PLAINTEXT://localhost:9095", "port=9095"})
-@DirtiesContext
+@EmbeddedKafka
+@TestPropertySource(properties = {"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}"})
 public class ApiIntegrationTest {
 
     @Autowired

springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringContextIntegrationTest.java

@@ -8,7 +8,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,13 +16,11 @@
 public class SpringContextIntegrationTest {
 
     @SpringBootTest(classes = SpringwolfCloudstreamExampleApplication.class)
-    @EmbeddedKafka(
-            partitions = 1,
-            brokerProperties = {"listeners=PLAINTEXT://localhost:9095", "port=9095"})
+    @EmbeddedKafka
     @Nested
-    @DirtiesContext
     @TestPropertySource(
             properties = {
+                "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
                 "springwolf.enabled=true",
                 "springwolf.docket.info.title=Info title was loaded from spring properties",
                 "springwolf.docket.info.version=1.0.0",

springwolf-examples/springwolf-cloud-stream-example/src/test/java/io/github/springwolf/examples/cloudstream/SpringwolfCloudstreamExampleApplicationIntegrationTest.java

@@ -6,17 +6,15 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest(
         classes = {SpringwolfCloudstreamExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EmbeddedKafka(
-        partitions = 1,
-        brokerProperties = {"listeners=PLAINTEXT://localhost:9095", "port=9095"})
-@DirtiesContext
+@EmbeddedKafka
+@TestPropertySource(properties = {"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}"})
 class SpringwolfCloudstreamExampleApplicationIntegrationTest {
 
     @Autowired

springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/ProducerSystemTest.java → springwolf-examples/springwolf-jms-example/src/test/java/io/github/springwolf/examples/jms/JmsProducerSystemTest.java

@@ -5,24 +5,25 @@
 import io.github.springwolf.examples.jms.dtos.ExamplePayloadDto;
 import io.github.springwolf.plugins.jms.producer.SpringwolfJmsProducer;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
 
 import java.io.File;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static io.github.springwolf.examples.jms.dtos.ExamplePayloadDto.ExampleEnum.FOO1;
-import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 
 /**
@@ -33,11 +34,9 @@
         classes = {SpringwolfJmsExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Testcontainers
-@DirtiesContext
-@TestMethodOrder(OrderAnnotation.class)
 @Slf4j
 // @Ignore("Uncomment this line if you have issues running this test on your local machine.")
-public class ProducerSystemTest {
+public class JmsProducerSystemTest {
     private static final String APP_JMS = "activemq";
 
     @Autowired
@@ -46,27 +45,42 @@ public class ProducerSystemTest {
     @SpyBean
     ExampleConsumer exampleConsumer;
 
+    @Value("${spring.activemq.broker-url}")
+    String brokerUrl;
+
     @Container
     public static DockerComposeContainer<?> environment = new DockerComposeContainer<>(new File("docker-compose.yml"))
             .withCopyFilesInContainer(".env") // do not copy all files in the directory
             .withServices(APP_JMS)
+            .withExposedService(APP_JMS, 61616)
             .withLogConsumer(APP_JMS, l -> log.debug("jms: {}", l.getUtf8StringWithoutLineEnding()))
             .waitingFor(APP_JMS, Wait.forLogMessage(".*Artemis Console available.*", 1));
 
+    @DynamicPropertySource
+    static void registerActiveMqBroker(DynamicPropertyRegistry registry) {
+        registry.add(
+                "spring.activemq.broker-url",
+                () -> String.format(
+                        "tcp://%s:%s",
+                        environment.getServiceHost(APP_JMS, 61616), environment.getServicePort(APP_JMS, 61616)));
+    }
+
     @Test
-    @Order(2)
     void producerCanUseSpringwolfConfigurationToSendMessage() {
         // given
         ExamplePayloadDto payload = new ExamplePayloadDto();
         payload.setSomeString("foo");
         payload.setSomeLong(5);
         payload.setSomeEnum(FOO1);
 
-        // when
-        springwolfJmsProducer.send("example-queue", Map.of(), payload);
+        // Awaitility is used, because message sent before amqp is ready are lost
+        Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+            // when
+            log.info("Waiting for message in {} on {}", exampleConsumer, brokerUrl);
+            springwolfJmsProducer.send("example-queue", Map.of(), payload);
 
-        // then
-        // Increased timeout once from 10s to 20s to fix flaky test in ci
-        verify(exampleConsumer, timeout(20000)).receiveExamplePayload(payload);
+            // then
+            verify(exampleConsumer, atLeastOnce()).receiveExamplePayload(payload);
+        });
     }
 }

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationTest.java

@@ -6,8 +6,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,8 +18,6 @@
 @SpringBootTest(
         classes = {SpringwolfKafkaExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EmbeddedKafka(partitions = 1)
-@DirtiesContext
 class ApiIntegrationTest {
 
     @Autowired

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ApiIntegrationWithActuatorIntegrationTest.java

@@ -8,7 +8,6 @@
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -20,11 +19,11 @@
         classes = {SpringwolfKafkaExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         properties = {
+            "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
             "springwolf.endpoint.actuator.enabled=true",
             "management.endpoints.web.exposure.include=springwolf"
         })
-@EmbeddedKafka(partitions = 1)
-@DirtiesContext
+@EmbeddedKafka
 public class ApiIntegrationWithActuatorIntegrationTest {
 
     @Autowired

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/ProducerSystemTest.java → springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/KafkaProducerSystemTest.java

@@ -51,7 +51,7 @@
 @TestMethodOrder(OrderAnnotation.class)
 @Slf4j
 // @Ignore("Uncomment this line if you have issues running this test on your local machine.")
-public class ProducerSystemTest {
+public class KafkaProducerSystemTest {
     private static final String KAFKA_NAME = "kafka";
 
     private static final boolean USE_SCHEMA_REGISTRY = false;

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringContextIntegrationTest.java

@@ -8,7 +8,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,13 +16,11 @@
 public class SpringContextIntegrationTest {
 
     @SpringBootTest(classes = SpringwolfKafkaExampleApplication.class)
-    @EmbeddedKafka(
-            partitions = 1,
-            brokerProperties = {"listeners=PLAINTEXT://localhost:9092", "port=9092"})
+    @EmbeddedKafka
     @Nested
-    @DirtiesContext
     @TestPropertySource(
             properties = {
+                "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
                 "springwolf.enabled=true",
                 "springwolf.docket.info.title=Info title was loaded from spring properties",
                 "springwolf.docket.info.version=1.0.0",
@@ -66,13 +63,11 @@ void testAllChannelsAreFound() {
     }
 
     @SpringBootTest(classes = SpringwolfKafkaExampleApplication.class)
-    @EmbeddedKafka(
-            partitions = 1,
-            brokerProperties = {"listeners=PLAINTEXT://localhost:9092", "port=9092"})
+    @EmbeddedKafka
     @Nested
-    @DirtiesContext
     @TestPropertySource(
             properties = {
+                "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}",
                 "springwolf.scanner.async-listener.enabled=false",
                 "springwolf.scanner.async-publisher.enabled=false",
                 "springwolf.scanner.consumer-data.enabled=false",

springwolf-examples/springwolf-kafka-example/src/test/java/io/github/springwolf/examples/kafka/SpringwolfKafkaExampleApplicationIntegrationTest.java

@@ -6,17 +6,15 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.kafka.test.context.EmbeddedKafka;
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @SpringBootTest(
         classes = {SpringwolfKafkaExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EmbeddedKafka(
-        partitions = 1,
-        brokerProperties = {"listeners=PLAINTEXT://localhost:9092", "port=9092"})
-@DirtiesContext
+@EmbeddedKafka
+@TestPropertySource(properties = {"spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}"})
 class SpringwolfKafkaExampleApplicationIntegrationTest {
 
     @Autowired

springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/ProducerSystemTest.java → springwolf-examples/springwolf-sqs-example/src/test/java/io/github/springwolf/examples/sqs/SqsProducerSystemTest.java

@@ -9,7 +9,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.test.annotation.DirtiesContext;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -35,10 +34,9 @@
         classes = {SpringwolfSqsExampleApplication.class},
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Testcontainers
-@DirtiesContext
 @Slf4j
 // @Ignore("Uncomment this line if you have issues running this test on your local machine.")
-public class ProducerSystemTest {
+public class SqsProducerSystemTest {
     private static final String LOCALSTACK_NAME = "localstack";
 
     @Autowired