From 9bda4d8f8ddc536df06bc8e41e7707eda9492ca4 Mon Sep 17 00:00:00 2001
From: hsiegeln <37154749+hsiegeln@users.noreply.github.com>
Date: Tue, 21 Apr 2026 21:43:29 +0200
Subject: [PATCH] fix(test): de-couple Flyway/ConfigEnvIsolation ITs from
 cross-test state

Both Testcontainers Postgres ITs were asserting exact counts on rows that
other classes in the shared context had already written.

- FlywayMigrationIT: treat the non-seed tables (users, server_config,
  audit_log, application_config, app_settings) as "must exist; COUNT must
  return a non-negative integer" rather than expecting exactly 0. The
  seeded tables (roles=4, groups=1) still assert exact V1 baseline.
- ConfigEnvIsolationIT.findByEnvironment_excludesOtherEnvs: use unique
  prefixed app slugs and switch containsExactlyInAnyOrder to contains +
  doesNotContain, so the cross-env filter is still verified without
  coupling to other tests' inserts.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../app/storage/ConfigEnvIsolationIT.java     | 15 ++++++++----
 .../server/app/storage/FlywayMigrationIT.java | 23 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/ConfigEnvIsolationIT.java b/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/ConfigEnvIsolationIT.java
index e0a4f169..af7f1c85 100644
--- a/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/ConfigEnvIsolationIT.java
+++ b/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/ConfigEnvIsolationIT.java
@@ -70,18 +70,23 @@ class ConfigEnvIsolationIT extends AbstractPostgresIT {
 
     @Test
     void applicationConfig_findByEnvironment_excludesOtherEnvs() {
+        // Use a unique app-slug prefix so this test's rows don't collide with
+        // the other tests in this class — they all share a Testcontainers
+        // Postgres and @Transactional rollback isn't wired up here.
         ApplicationConfig a = new ApplicationConfig();
         a.setSamplingRate(1.0);
-        configRepo.save("a", "dev", a, "test");
-        configRepo.save("b", "dev", a, "test");
-        configRepo.save("a", "prod", a, "test");
+        configRepo.save("fbe-a", "dev", a, "test");
+        configRepo.save("fbe-b", "dev", a, "test");
+        configRepo.save("fbe-a", "prod", a, "test");
 
         assertThat(configRepo.findByEnvironment("dev"))
                 .extracting(ApplicationConfig::getApplication)
-                .containsExactlyInAnyOrder("a", "b");
+                .contains("fbe-a", "fbe-b")
+                .doesNotContain("fbe-a-prod-sentinel");
         assertThat(configRepo.findByEnvironment("prod"))
                 .extracting(ApplicationConfig::getApplication)
-                .containsExactly("a");
+                .contains("fbe-a")
+                .doesNotContain("fbe-b");
     }
 
     @Test
diff --git a/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/FlywayMigrationIT.java b/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/FlywayMigrationIT.java
index 17a6f400..b6a07f8f 100644
--- a/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/FlywayMigrationIT.java
+++ b/cameleer-server-app/src/test/java/com/cameleer/server/app/storage/FlywayMigrationIT.java
@@ -14,34 +14,39 @@ class FlywayMigrationIT extends AbstractPostgresIT {
 
     @Test
     void allMigrationsApplySuccessfully() {
-        // Verify RBAC tables exist
+        // Tables-exist check: queryForObject on COUNT(*) throws SQLException on a
+        // missing relation, so a successful call IS the existence assertion. The
+        // seed-only tables (roles/groups) assert the V1 baseline numbers exactly;
+        // the other tables accumulate state from prior tests in the shared
+        // Testcontainers Postgres, so we only assert "table exists & COUNT is
+        // a non-negative integer" rather than coupling to other ITs' write state.
+
         Integer userCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM users", Integer.class);
-        assertEquals(0, userCount);
+        assertTrue(userCount != null && userCount >= 0);
 
         Integer roleCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM roles", Integer.class);
-        assertEquals(4, roleCount); // AGENT, VIEWER, OPERATOR, ADMIN
+        assertEquals(4, roleCount); // AGENT, VIEWER, OPERATOR, ADMIN — seeded in V1
 
         Integer groupCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM groups", Integer.class);
-        assertEquals(1, groupCount); // Admins
+        assertEquals(1, groupCount); // Admins — seeded in V1
 
-        // Verify config/audit tables exist
         Integer configCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM server_config", Integer.class);
-        assertEquals(0, configCount);
+        assertTrue(configCount != null && configCount >= 0);
 
         Integer auditCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM audit_log", Integer.class);
-        assertEquals(0, auditCount);
+        assertTrue(auditCount != null && auditCount >= 0);
 
         Integer appConfigCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM application_config", Integer.class);
-        assertEquals(0, appConfigCount);
+        assertTrue(appConfigCount != null && appConfigCount >= 0);
 
         Integer appSettingsCount = jdbcTemplate.queryForObject(
                 "SELECT COUNT(*) FROM app_settings", Integer.class);
-        assertEquals(0, appSettingsCount);
+        assertTrue(appSettingsCount != null && appSettingsCount >= 0);
     }
 }