From cd93673d17f053159049850b4b30d3590f2673f9 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 22 Aug 2020 11:51:13 -0400
Subject: [PATCH] use unique redis prefix for tests

---
 .../wizardtest/resources/AbstractResourceIT.java    | 13 ++++++++++++-
 .../wizard/server/config/DatabaseConfiguration.java |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
index 43a59e6..dc85a8d 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.cobbzilla.util.http.HttpStatusCodes;
 import org.cobbzilla.util.json.JsonUtil;
+import org.cobbzilla.wizard.cache.redis.HasRedisConfiguration;
+import org.cobbzilla.wizard.cache.redis.RedisConfiguration;
 import org.cobbzilla.wizard.client.ApiClientBase;
 import org.cobbzilla.wizard.client.script.ApiRunner;
 import org.cobbzilla.wizard.client.script.ApiRunnerListenerBase;
@@ -91,6 +93,11 @@ public abstract class AbstractResourceIT<C extends PgRestServerConfiguration, S
 
         final boolean hasDb = configuration instanceof HasDatabaseConfiguration;
         final boolean hasQuartz = configuration instanceof HasQuartzConfiguration;
+        final boolean hasRedis = configuration instanceof HasRedisConfiguration;
+        if (hasRedis) {
+            final RedisConfiguration redis = ((HasRedisConfiguration) configuration).getRedis();
+            redis.setPrefix(redis.getPrefix()+"_"+testNameToken()+"_"+randomAlphanumeric(10));
+        }
         if (hasDb) {
             final DatabaseConfiguration database = ((HasDatabaseConfiguration) configuration).getDatabase();
             if (useTestSpecificDatabase()) {
@@ -272,7 +279,11 @@ public abstract class AbstractResourceIT<C extends PgRestServerConfiguration, S
     protected boolean allowPreExistingDatabase() { return false; }
 
     private String getTempDbNamePrefix(String url) {
-        return truncate(url.substring(url.lastIndexOf('/') + 1), 15) + "_" + truncate(camelCaseToSnakeCase(getClass().getSimpleName()), 35).toLowerCase();
+        return truncate(url.substring(url.lastIndexOf('/') + 1), 15) + "_" + testNameToken();
+    }
+
+    private String testNameToken() {
+        return truncate(camelCaseToSnakeCase(getClass().getSimpleName()), 35).toLowerCase();
     }
 
     protected Map<String, String> getServerEnvironment() throws Exception { return null; }
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
index 2fab292..64f5d90 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java
@@ -39,7 +39,7 @@ public class DatabaseConfiguration {
 
     @Getter @Setter private boolean migrationEnabled = true;
 
-    private List<Runnable> postDataSourceSetupHandlers = new ArrayList<>();
+    private final List<Runnable> postDataSourceSetupHandlers = new ArrayList<>();
     public void addPostDataSourceSetupHandler (Runnable handler) { postDataSourceSetupHandlers.add(handler); }
     public void runPostDataSourceSetupHandlers () {
         for (Runnable r : postDataSourceSetupHandlers) r.run();