The bulk of my integration tests are outdated and still assume outdated architecture from previous stages of this project. Fixing some issues w/ how my container base files are setup so the Integration Tests can start and pass w/o issue. (Flesh out more modern Integration Tests later).

Author: timan-z

springqpro-backend/src/test/java/com/springqprobackend/springqpro/SpringQueueProApplicationTests.java

@@ -1,11 +1,12 @@
 package com.springqprobackend.springqpro;
 
+import com.springqprobackend.springqpro.testcontainers.IntegrationTestBase;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class SpringQueueProApplicationTests {
+class SpringQueueProApplicationTests extends IntegrationTestBase {
 
 	@Test
 	void contextLoads() {

springqpro-backend/src/test/java/com/springqprobackend/springqpro/integration/CreateAndProcessTaskIntegrationTest.java

@@ -54,7 +54,7 @@ public void sweepQueuedTasks() {
 - Uses Awaitility to wait for ProcessingService's asynchronous processing.
 */
 //@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Tag("disable_temp")
+//@Tag("disable_temp")
 class CreateAndProcessTaskIntegrationTest extends IntegrationTestBase {
     @Autowired
     private TestRestTemplate rest;

springqpro-backend/src/test/java/com/springqprobackend/springqpro/testcontainers/BasePostgresContainer.java

@@ -16,15 +16,16 @@
 */
 // CENTRAL PostgreSQL Testcontainer USED FOR ALL MY INTEGRATION TESTS:
 public abstract class BasePostgresContainer {
+    /*@Container
     @ServiceConnection
     protected static final PostgreSQLContainer<?> POSTGRES =
             new PostgreSQLContainer<>("postgres:18")
                     .withDatabaseName("springqpro")
                     .withUsername("springqpro")
                     .withPassword("springqpro")
-                    .withReuse(true);
+                    .withReuse(true);*/
     // 2025-11-23-DEBUG: TEMP BELOW.
-    @Container
+    /*@Container
     @ServiceConnection
     static final RedisContainer REDIS =
             new RedisContainer(DockerImageName.parse("redis:7.2"));
@@ -33,5 +34,5 @@ public abstract class BasePostgresContainer {
     static {
         POSTGRES.start();   // This is meant to boot once for the entire Integration Test Suite.
         REDIS.start();  // 2025-11-23-DEBUG: TEMP.
-    }
+    }*/
 }

springqpro-backend/src/test/java/com/springqprobackend/springqpro/testcontainers/BaseRedisContainer.java

@@ -4,12 +4,12 @@
 import org.testcontainers.containers.GenericContainer;
 
 public abstract class BaseRedisContainer {
-    @ServiceConnection
+    /*@ServiceConnection
     protected static final GenericContainer<?> REDIS
             = new GenericContainer<>("redis:7-alpine")
             .withExposedPorts(6379)
             .withReuse(true);
     static {
         REDIS.start();
-    }
+    }*/
 }

springqpro-backend/src/test/java/com/springqprobackend/springqpro/testcontainers/IntegrationTestBase.java

@@ -1,6 +1,13 @@
 package com.springqprobackend.springqpro.testcontainers;
 
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /* BASE CLASS FOR ALL MY INTEGRATION TESTS THAT PROVIDES:
@@ -9,7 +16,35 @@
 - Testcontainers lifecycle.
 - PostgreSQL datasource auto-wiring from BasePostgresContainer.
 */
+//public abstract class IntegrationTestBase extends BasePostgresContainer {
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "spring.main.allow-bean-definition-overriding=true")
 @Testcontainers
-public abstract class IntegrationTestBase extends BasePostgresContainer {
+@ActiveProfiles("test")
+public abstract class IntegrationTestBase {
+
+    @Container
+    static final PostgreSQLContainer<?> POSTGRES =
+            new PostgreSQLContainer<>("postgres:18")
+                    .withDatabaseName("springqpro")
+                    .withUsername("springqpro")
+                    .withPassword("springqpro")
+                    .withReuse(true);
+
+    @Container
+    static final GenericContainer<?> REDIS =
+            new GenericContainer<>("redis:7-alpine")
+                    .withExposedPorts(6379)
+                    .withReuse(true);
+
+    @DynamicPropertySource
+    static void registerDynamicProps(DynamicPropertyRegistry registry) {
+        // postgres
+        registry.add("spring.datasource.url", POSTGRES::getJdbcUrl);
+        registry.add("spring.datasource.username", POSTGRES::getUsername);
+        registry.add("spring.datasource.password", POSTGRES::getPassword);
+
+        // redis
+        registry.add("spring.redis.host", REDIS::getHost);
+        registry.add("spring.redis.port", () -> REDIS.getMappedPort(6379));
+    }
 }

springqpro-backend/src/test/java/com/springqprobackend/springqpro/testcontainers/RedisIntegrationTestBase.java

@@ -7,6 +7,8 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 @DataRedisTest
@@ -17,9 +19,15 @@
         org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration.class,
         org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration.class
 })
-public abstract class RedisIntegrationTestBase extends BaseRedisContainer {
+public abstract class RedisIntegrationTestBase {
+    @Container
+    static final GenericContainer<?> REDIS =
+            new GenericContainer<>("redis:7-alpine")
+                    .withExposedPorts(6379)
+                    .withReuse(true);
+
     @DynamicPropertySource
-    static void overrideRedisProps(DynamicPropertyRegistry registry) {
+    static void redisProps(DynamicPropertyRegistry registry) {
         registry.add("spring.redis.host", REDIS::getHost);
         registry.add("spring.redis.port", () -> REDIS.getMappedPort(6379));
     }