Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Updated test setup

Rich Turner45fddd5d562c
diff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.java b/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.java
index 1ed76d703..cb410878a 100644
--- a/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.java
+++ b/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.java
@@ -33,13 +33,13 @@ public class ManagerTestAgentSetup extends ManagerSetup {
private static final Logger LOG = Logger.getLogger(ManagerTestAgentSetup.class.getName());
- public static final String SETUP_IMPORT_DEMO_AGENT_KNX = "SETUP_IMPORT_DEMO_AGENT_KNX";
- public static final String SETUP_IMPORT_DEMO_AGENT_KNX_GATEWAY_IP = "SETUP_IMPORT_DEMO_AGENT_KNX_GATEWAY_IP";
- public static final String SETUP_IMPORT_DEMO_AGENT_KNX_LOCAL_IP = "SETUP_IMPORT_DEMO_AGENT_KNX_LOCAL_IP";
+ public static final String SETUP_CREATE_AGENT_KNX = "SETUP_CREATE_AGENT_KNX";
+ public static final String SETUP_CREATE_AGENT_KNX_GATEWAY_IP = "SETUP_CREATE_AGENT_KNX_GATEWAY_IP";
+ public static final String SETUP_CREATE_AGENT_KNX_LOCAL_IP = "SETUP_CREATE_AGENT_KNX_LOCAL_IP";
- public static final String SETUP_IMPORT_DEMO_AGENT_VELBUS = "SETUP_IMPORT_DEMO_AGENT_VELBUS";
- public static final String SETUP_IMPORT_DEMO_AGENT_VELBUS_HOST = "SETUP_IMPORT_DEMO_AGENT_VELBUS_HOST";
- public static final String SETUP_IMPORT_DEMO_AGENT_VELBUS_PORT = "SETUP_IMPORT_DEMO_AGENT_VELBUS_PORT";
+ public static final String SETUP_CREATE_AGENT_VELBUS = "SETUP_CREATE_AGENT_VELBUS";
+ public static final String SETUP_CREATE_AGENT_VELBUS_HOST = "SETUP_CREATE_AGENT_VELBUS_HOST";
+ public static final String SETUP_CREATE_AGENT_VELBUS_PORT = "SETUP_CREATE_AGENT_VELBUS_PORT";
public String masterRealm;
@@ -54,13 +54,13 @@ public class ManagerTestAgentSetup extends ManagerSetup {
public ManagerTestAgentSetup(Container container) {
super(container);
- this.knx = getBoolean(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_KNX, false);
- this.knxGatewayIp = getString(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_KNX_GATEWAY_IP, "localhost");
- this.knxLocalIp = getString(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_KNX_LOCAL_IP, "localhost");
+ this.knx = getBoolean(container.getConfig(), SETUP_CREATE_AGENT_KNX, false);
+ this.knxGatewayIp = getString(container.getConfig(), SETUP_CREATE_AGENT_KNX_GATEWAY_IP, "localhost");
+ this.knxLocalIp = getString(container.getConfig(), SETUP_CREATE_AGENT_KNX_LOCAL_IP, "localhost");
- this.velbus = getBoolean(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_VELBUS, false);
- this.velbusHost = getString(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_VELBUS_HOST, "localhost");
- this.velbusPort = getInteger(container.getConfig(), SETUP_IMPORT_DEMO_AGENT_VELBUS_PORT, 6000);
+ this.velbus = getBoolean(container.getConfig(), SETUP_CREATE_AGENT_VELBUS, false);
+ this.velbusHost = getString(container.getConfig(), SETUP_CREATE_AGENT_VELBUS_HOST, "localhost");
+ this.velbusPort = getInteger(container.getConfig(), SETUP_CREATE_AGENT_VELBUS_PORT, 6000);
}
@Override
diff --git a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java
index 2d649261c..0bb92b310 100644
--- a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java
+++ b/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java
@@ -37,28 +37,22 @@ public class TestSetupTasks extends EmptySetupTasks {
public static final String SETUP_CREATE_USERS = "SETUP_CREATE_USERS";
public static final String SETUP_CREATE_ASSETS = "SETUP_CREATE_ASSETS";
public static final String SETUP_CREATE_RULES = "SETUP_CREATE_RULES";
- public static final String SETUP_IMPORT_DEMO_AGENT = "SETUP_CREATE_AGENT";
- static boolean isImportDemoUsers(Container container) {
- return isImportDemoAssets(container)
+ static boolean isImportUsers(Container container) {
+ return isImportAssets(container)
|| getBoolean(container.getConfig(), SETUP_CREATE_USERS, container.isDevMode());
}
- static boolean isImportDemoAssets(Container container) {
- return isImportDemoAgent(container)
- || isImportDemoRules(container)
+ static boolean isImportAssets(Container container) {
+ return isImportRules(container)
|| getBoolean(container.getConfig(), SETUP_CREATE_ASSETS, container.isDevMode());
}
- static boolean isImportDemoRules(Container container) {
+ static boolean isImportRules(Container container) {
return getBoolean(container.getConfig(), SETUP_CREATE_RULES, container.isDevMode());
}
- // Defaults to always disabled as agents might require actual protocol-specific hardware
- static boolean isImportDemoAgent(Container container) {
- return getBoolean(container.getConfig(), SETUP_IMPORT_DEMO_AGENT, false);
- }
- static boolean isImportDemoScenes(Container container) {
+ static boolean isImportScenes(Container container) {
return getBoolean(container.getConfig(), SETUP_CREATE_SCENES, container.isDevMode());
}
@@ -69,21 +63,19 @@ public class TestSetupTasks extends EmptySetupTasks {
// Basic vs Keycloak identity provider
if (container.getService(ManagerIdentityService.class).isKeycloakEnabled()) {
- if (isImportDemoUsers(container)) {
+ if (isImportUsers(container)) {
addTask(new KeycloakTestSetup(container));
}
- if (isImportDemoAssets(container) || isImportDemoScenes(container)) {
- addTask(new ManagerTestSetup(container, isImportDemoScenes(container)));
+ if (isImportAssets(container) || isImportScenes(container)) {
+ addTask(new ManagerTestSetup(container, isImportScenes(container)));
}
- if (isImportDemoRules(container)) {
+ if (isImportRules(container)) {
addTask(new RulesTestSetup(container));
}
- if (isImportDemoAgent(container)) {
- addTask(new ManagerTestAgentSetup(container));
- }
+ addTask(new ManagerTestAgentSetup(container));
}
return getTasks();