test: clean up state

kafbat · Dec 16, 2024 · aba9684 · aba9684
1 parent 1436ec2
commit aba9684
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -155,6 +155,13 @@
             <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>

diff --git a/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java b/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java
@@ -12,13 +12,16 @@
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 import org.junit.jupiter.api.io.TempDir;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.util.TestSocketUtils;
@@ -31,6 +34,7 @@
 @ActiveProfiles("test")
 @AutoConfigureWebTestClient(timeout = "60000")
 @ContextConfiguration(initializers = {AbstractIntegrationTest.Initializer.class})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public abstract class AbstractIntegrationTest {
   public static final String LOCAL = "local";
   public static final String SECOND_LOCAL = "secondLocal";
@@ -63,16 +67,22 @@ public abstract class AbstractIntegrationTest {
   @TempDir
   public static Path tmpDir;
 
-  static {
-    kafka.start();
-    schemaRegistry.start();
-    kafkaConnect.start();
+  @AfterEach
+  void afterEach() {
+    kafka.stop();
+    schemaRegistry.stop();
+    kafkaConnect.stop();
   }
 
+
   public static class Initializer
       implements ApplicationContextInitializer<ConfigurableApplicationContext> {
     @Override
     public void initialize(@NotNull ConfigurableApplicationContext context) {
+      kafka.start();
+      schemaRegistry.start();
+      kafkaConnect.start();
+
       System.setProperty("kafka.clusters.0.name", LOCAL);
       System.setProperty("kafka.clusters.0.bootstrapServers", kafka.getBootstrapServers());
       // List unavailable hosts to verify failover