100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Moved test setup code into its' own module
Rich Turner77eedf6a5126
diff --git a/project.gradle b/project.gradleindex 2fc3b230c..e5712c6a8 100644--- a/project.gradle+++ b/project.gradle@@ -50,7 +50,7 @@ if (project == rootProject) {moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.manager.main" : ".manager.main")}"Test Setup"(Application) {- moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.test.main" : ".test.main")+ moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.test.test" : ".test.test")}"Empty with Proxy"(Application) {moduleName = getProject().idea.module.name + (isCustomProject() ? ".openremote.manager.main" : ".manager.main")diff --git a/setup/build.gradle b/setup/build.gradlenew file mode 100644index 000000000..9cd29e486--- /dev/null+++ b/setup/build.gradle@@ -0,0 +1,5 @@+apply plugin: "java-library"++dependencies {+ api resolveProject(":manager")+}diff --git a/test/src/main/java/org/openremote/test/model/TestAssetModelProvider.java b/setup/src/main/java/org/openremote/test/model/TestAssetModelProvider.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/model/TestAssetModelProvider.javarename to setup/src/main/java/org/openremote/test/model/TestAssetModelProvider.javadiff --git a/test/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.java b/setup/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.javarename to setup/src/main/java/org/openremote/test/protocol/KNXTestingNetworkLink.javadiff --git a/test/src/main/java/org/openremote/test/protocol/MockAgent.java b/setup/src/main/java/org/openremote/test/protocol/MockAgent.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/MockAgent.javarename to setup/src/main/java/org/openremote/test/protocol/MockAgent.javadiff --git a/test/src/main/java/org/openremote/test/protocol/MockAgentLink.java b/setup/src/main/java/org/openremote/test/protocol/MockAgentLink.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/MockAgentLink.javarename to setup/src/main/java/org/openremote/test/protocol/MockAgentLink.javadiff --git a/test/src/main/java/org/openremote/test/protocol/MockProtocol.java b/setup/src/main/java/org/openremote/test/protocol/MockProtocol.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/MockProtocol.javarename to setup/src/main/java/org/openremote/test/protocol/MockProtocol.javadiff --git a/test/src/main/java/org/openremote/test/protocol/http/HTTPServerTestAgent.java b/setup/src/main/java/org/openremote/test/protocol/http/HTTPServerTestAgent.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/http/HTTPServerTestAgent.javarename to setup/src/main/java/org/openremote/test/protocol/http/HTTPServerTestAgent.javadiff --git a/test/src/main/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.java b/setup/src/main/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.javarename to setup/src/main/java/org/openremote/test/protocol/http/TestHTTPServerProtocol.javadiff --git a/test/src/main/java/org/openremote/test/protocol/http/TestResource.java b/setup/src/main/java/org/openremote/test/protocol/http/TestResource.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/http/TestResource.javarename to setup/src/main/java/org/openremote/test/protocol/http/TestResource.javadiff --git a/test/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.java b/setup/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.javarename to setup/src/main/java/org/openremote/test/protocol/http/TestResourceImpl.javadiff --git a/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.java b/setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javarename to setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusAgent.javadiff --git a/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.java b/setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.javarename to setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusClient.javadiff --git a/test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.java b/setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javarename to setup/src/main/java/org/openremote/test/protocol/velbus/MockVelbusProtocol.javadiff --git a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java b/setup/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javasimilarity index 99%rename from test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javarename to setup/src/main/java/org/openremote/test/setup/KeycloakTestSetup.javaindex e4c03b08a..a6c846ec5 100644--- a/test/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java+++ b/setup/src/main/java/org/openremote/test/setup/KeycloakTestSetup.java@@ -107,7 +107,7 @@ public class KeycloakTestSetup extends AbstractKeycloakSetup {serviceUser = new User().setServiceAccount(true).setEnabled(true)- .setUsername("test");+ .setUsername("org/openremote/test");serviceUser = keycloakProvider.createUpdateUser(tenantBuilding.getRealm(), serviceUser, UniqueIdentifierGenerator.generateId("serviceusertest"));keycloakProvider.updateUserRoles(tenantBuilding.getRealm(),diff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.java b/setup/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.javarename to setup/src/main/java/org/openremote/test/setup/ManagerTestAgentSetup.javadiff --git a/test/src/main/java/org/openremote/test/setup/ManagerTestSetup.java b/setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/setup/ManagerTestSetup.javarename to setup/src/main/java/org/openremote/test/setup/ManagerTestSetup.javadiff --git a/test/src/main/java/org/openremote/test/setup/RulesTestSetup.java b/setup/src/main/java/org/openremote/test/setup/RulesTestSetup.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/setup/RulesTestSetup.javarename to setup/src/main/java/org/openremote/test/setup/RulesTestSetup.javadiff --git a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java b/setup/src/main/java/org/openremote/test/setup/TestSetupTasks.javasimilarity index 55%rename from test/src/main/java/org/openremote/test/setup/TestSetupTasks.javarename to setup/src/main/java/org/openremote/test/setup/TestSetupTasks.javaindex 984a1fa39..aa218728e 100644--- a/test/src/main/java/org/openremote/test/setup/TestSetupTasks.java+++ b/setup/src/main/java/org/openremote/test/setup/TestSetupTasks.java@@ -26,31 +26,11 @@ import org.openremote.model.Container;import java.util.List;-import static org.openremote.container.util.MapAccess.getBoolean;-/*** Test setup tasks.*/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";-- static boolean isImportUsers(Container container) {- return isImportAssets(container)- || getBoolean(container.getConfig(), SETUP_CREATE_USERS, container.isDevMode());- }-- static boolean isImportAssets(Container container) {- return isImportRules(container)- || getBoolean(container.getConfig(), SETUP_CREATE_ASSETS, container.isDevMode());- }-- static boolean isImportRules(Container container) {- return getBoolean(container.getConfig(), SETUP_CREATE_RULES, container.isDevMode());- }-@Overridepublic List<Setup> createTasks(Container container) {super.createTasks(container);@@ -58,17 +38,9 @@ public class TestSetupTasks extends EmptySetupTasks {// Basic vs Keycloak identity providerif (container.getService(ManagerIdentityService.class).isKeycloakEnabled()) {- if (isImportUsers(container)) {- addTask(new KeycloakTestSetup(container));- }-- if (isImportAssets(container)) {- addTask(new ManagerTestSetup(container));- }-- if (isImportRules(container)) {- addTask(new RulesTestSetup(container));- }+ addTask(new KeycloakTestSetup(container));+ addTask(new ManagerTestSetup(container));+ //addTask(new RulesTestSetup(container));addTask(new ManagerTestAgentSetup(container));}diff --git a/test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasks b/setup/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTaskssimilarity index 100%rename from test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasksrename to setup/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTasksdiff --git a/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider b/setup/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvidersimilarity index 100%rename from test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProviderrename to setup/src/main/resources/META-INF/services/org.openremote.model.AssetModelProviderdiff --git a/test/build.gradle b/test/build.gradleindex 79ea3da5f..fa73d2a40 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -6,7 +6,7 @@ apply plugin: "groovy"dependencies {- api resolveProject(":manager")+ api resolveProject(":setup")api "org.codehaus.groovy:groovy-all:$groovyVersion"diff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovyindex 53d549190..a1d0fef85 100644--- a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy+++ b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy@@ -17,7 +17,6 @@ import static org.openremote.container.timer.TimerService.Clock.REALimport static org.openremote.container.timer.TimerService.TIMER_CLOCK_TYPEimport static org.openremote.container.web.WebService.WEBSERVER_LISTEN_PORTimport static org.openremote.manager.mqtt.MqttBrokerService.MQTT_SERVER_LISTEN_HOST-import static org.openremote.test.setup.TestSetupTasks.*trait ManagerContainerTrait extends ContainerTrait {@@ -27,9 +26,6 @@ trait ManagerContainerTrait extends ContainerTrait {}[(WEBSERVER_LISTEN_PORT) : Integer.toString(serverPort),- (SETUP_CREATE_ASSETS) : "true",- (SETUP_CREATE_USERS) : "true",- (SETUP_CREATE_RULES) : "false",(MQTT_SERVER_LISTEN_HOST) : "127.0.0.1", // Works best for cross platform test running(TIMER_CLOCK_TYPE) : PSEUDO.name()]diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex e784bbdef..ec58c2477 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -1,10 +1,8 @@package org.openremote.test.assetsimport org.openremote.manager.setup.SetupService-import org.openremote.model.asset.impl.ThingAssetimport org.openremote.model.attribute.AttributeStateimport org.openremote.model.attribute.AttributeWriteFailure-import org.openremote.model.util.ValueUtilimport org.openremote.test.setup.KeycloakTestSetupimport org.openremote.test.setup.ManagerTestSetupimport org.openremote.model.asset.Assetdiff --git a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovyindex 4f3ab9fd5..1581a0e68 100644--- a/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/users/UserResourceTest.groovy@@ -39,7 +39,6 @@ import static org.openremote.container.util.MapAccess.getStringimport static org.openremote.model.Constants.KEYCLOAK_CLIENT_IDimport static org.openremote.model.Constants.MASTER_REALMimport static org.openremote.model.Constants.MASTER_REALM_ADMIN_USER-import static org.openremote.model.Constants.RESTRICTED_USER_REALM_ROLEclass UserResourceTest extends Specification implements ManagerContainerTrait {