Преглед на файлове

use unique redis prefix for tests

tags/2.0.1
Jonathan Cobb преди 4 години
родител
ревизия
cd93673d17
променени са 2 файла, в които са добавени 13 реда и са изтрити 2 реда
  1. +12
    -1
      wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
  2. +1
    -1
      wizard-server/src/main/java/org/cobbzilla/wizard/server/config/DatabaseConfiguration.java

+ 12
- 1
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; }


+ 1
- 1
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();


Зареждане…
Отказ
Запис