Consider reusability when stopping Postgres testcontainer

Signed-off-by: nscuro <[email protected]>
DependencyTrack · Feb 13, 2024 · 95467c2 · 95467c2
1 parent 54aa0c0
commit 95467c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/test/java/org/dependencytrack/PersistenceCapableTest.java b/src/test/java/org/dependencytrack/PersistenceCapableTest.java
@@ -32,7 +32,6 @@
 import org.junit.Rule;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.utility.TestcontainersConfiguration;
 
 import javax.jdo.JDOHelper;
 import java.sql.Connection;
@@ -49,7 +48,7 @@ public abstract class PersistenceCapableTest {
     protected QueryManager qm;
 
     @BeforeClass
-    public static void init() throws Exception {
+    public static void init() {
         Config.enableUnitTests();
 
         postgresContainer = new PostgresTestContainer();
@@ -84,9 +83,8 @@ public void after() {
 
     @AfterClass
     public static void tearDownClass() {
-        final boolean canReuseContainers = TestcontainersConfiguration.getInstance().environmentSupportsReuse();
-        if (postgresContainer != null && (!canReuseContainers || !postgresContainer.isShouldBeReused())) {
-            postgresContainer.stop();
+        if (postgresContainer != null) {
+            postgresContainer.stopWhenNotReusing();
         }
     }
 

diff --git a/src/test/java/org/dependencytrack/PostgresTestContainer.java b/src/test/java/org/dependencytrack/PostgresTestContainer.java
@@ -5,6 +5,7 @@
 import org.postgresql.ds.PGSimpleDataSource;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 public class PostgresTestContainer extends PostgreSQLContainer<PostgresTestContainer> {
 
@@ -42,4 +43,11 @@ protected void containerIsStarted(final InspectContainerResponse containerInfo,
             throw new RuntimeException(e);
         }
     }
+
+    public void stopWhenNotReusing() {
+        if (!TestcontainersConfiguration.getInstance().environmentSupportsReuse() || !isShouldBeReused()) {
+            stop();
+        }
+    }
+
 }
diff --git a/src/test/java/org/dependencytrack/ResourceTest.java b/src/test/java/org/dependencytrack/ResourceTest.java
@@ -145,7 +145,7 @@ public void after() {
     @AfterClass
     public static void tearDownClass() {
         if (postgresContainer != null) {
-            postgresContainer.stop();
+            postgresContainer.stopWhenNotReusing();
         }
     }