Skip to content

armgit / core

Public Imported from GitHub
0

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

Moved test rules to test module

Rich Turner3c8f0eccf41b
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
index cd5b3e911..9f127fd7b 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
@@ -53,15 +53,6 @@ public class RulesDemoSetup extends AbstractManagerSetup {
// ################################ Rules demo data ###################################
- // People counter
-// try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoSmartCityCamera.groovy")) {
-// String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
-// Ruleset ruleset = new AssetRuleset(
-// managerDemoSetup.peopleCounter3AssetId, "PeopleCounter 3 Rules", GROOVY, rules
-// );
-// rulesetStorageService.merge(ruleset);
-// }
-
// SmartCity geofences
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/smartcity/DeKuip.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java
index ce7f92911..dbb6915bb 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesTestSetup.java
@@ -58,35 +58,35 @@ public class RulesTestSetup extends AbstractManagerSetup {
// ################################ Rules demo data ###################################
// Apartment 1
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidencePresenceDetection.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidencePresenceDetection.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id, "Demo Residence - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidenceVacationMode.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidenceVacationMode.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id, "Demo Residence - Vacation Mode", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAutoVentilation.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidenceAutoVentilation.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id, "Demo Residence - Auto Ventilation", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id, "Demo Residence - Notify Alarm Trigger", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidenceSmartSwitch.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidenceSmartSwitch.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id, "Demo Residence - Smart Start Switch", Ruleset.Lang.GROOVY, rules
@@ -96,7 +96,7 @@ public class RulesTestSetup extends AbstractManagerSetup {
}
// Apartment 2
-// try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAllLightsOff.js")) {
+// try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ResidenceAllLightsOff.js")) {
// String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
// Ruleset ruleset = new AssetRuleset(
// managerTestSetup.apartment2Id, "Demo Residence - All Lights Off", Ruleset.Lang.JAVASCRIPT, rules
@@ -104,7 +104,7 @@ public class RulesTestSetup extends AbstractManagerSetup {
// apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
// }
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoConsoleLocation.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/ConsoleLocation.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
keycloakTestSetup.tenantBuilding.getRealm(), "Demo Console Location", Ruleset.Lang.GROOVY, rules
@@ -113,7 +113,7 @@ public class RulesTestSetup extends AbstractManagerSetup {
}
// People counter
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoSmartCityCamera.groovy")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/SmartCityCamera.groovy")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new AssetRuleset(
managerTestSetup.peopleCounter3AssetId, "PeopleCounter 3 Rules", GROOVY, rules
@@ -122,7 +122,7 @@ public class RulesTestSetup extends AbstractManagerSetup {
}
// SmartCity geofences
- try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/demo/rules/DemoGeofence.json")) {
+ try (InputStream inputStream = RulesTestSetup.class.getResourceAsStream("/org/openremote/test/rules/Geofence.json")) {
String rules = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
Ruleset ruleset = new TenantRuleset(
keycloakTestSetup.tenantCity.getRealm(), "Demo Geofences", Ruleset.Lang.JSON, rules
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index 0716c4d04..02e265d71 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -98,7 +98,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
keycloakTestSetup.tenantBuilding.realm,
"Demo Tenant Building - Console Location",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoConsoleLocation.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ConsoleLocation.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engine to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
index 37d81f355..dad42b106 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
@@ -42,7 +42,7 @@ class ResidenceAllLightsOffTest extends Specification implements ManagerContaine
managerTestSetup.apartment2Id,
"Demo Apartment - All Lights Off",
Ruleset.Lang.JAVASCRIPT,
- getClass().getResource("/demo/rules/DemoResidenceAllLightsOff.js").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceAllLightsOff.js").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
index 42a715de0..b6941d1e3 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
@@ -48,7 +48,7 @@ class ResidenceAutoVentilationTest extends Specification implements ManagerConta
managerTestSetup.apartment1Id,
"Demo Apartment - Auto Ventilation",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceAutoVentilation.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceAutoVentilation.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available, running and settled"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
index bad0e6ff9..0134920d0 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
@@ -86,7 +86,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCo
Ruleset ruleset = new AssetRuleset(
managerTestSetup.apartment1Id,
"Demo Apartment - Notify Alarm Trigger",
- Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy").text)
+ Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
index ace1a8884..350e03ecf 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
@@ -46,7 +46,7 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon
managerTestSetup.apartment1Id,
"Demo Apartment - Presence Detection with motion and CO2 sensors",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidencePresenceDetection.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -205,7 +205,7 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon
managerTestSetup.apartment1Id,
"Demo Apartment - Presence Detection with motion sensor",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidencePresenceDetection.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
index 3bd85b102..4a7fba391 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
@@ -43,7 +43,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
managerTestSetup.apartment1Id,
"Demo Apartment - Smart Start",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -173,7 +173,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
managerTestSetup.apartment1Id,
"Demo Apartment - Smart Start",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -271,7 +271,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
managerTestSetup.apartment1Id,
"Demo Apartment - Smart Start",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -393,7 +393,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
managerTestSetup.apartment1Id,
"Demo Apartment - Smart Start",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -492,7 +492,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
managerTestSetup.apartment1Id,
"Demo Apartment - Smart Start",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
index 2eb9d6b1f..d549c17fb 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
@@ -60,7 +60,7 @@ class ResidenceVacationModeTest extends Specification implements ManagerContaine
managerTestSetup.apartment1Id,
"Demo Apartment - Vacation Mode",
Ruleset.Lang.GROOVY,
- getClass().getResource("/demo/rules/DemoResidenceVacationMode.groovy").text)
+ getClass().getResource("/org/openremote/test/rules/ResidenceVacationMode.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/manager/src/main/resources/demo/rules/DemoConsoleLocation.groovy b/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
similarity index 97%
rename from manager/src/main/resources/demo/rules/DemoConsoleLocation.groovy
rename to test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
index 1d32811d5..96ac647ea 100644
--- a/manager/src/main/resources/demo/rules/DemoConsoleLocation.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
@@ -1,9 +1,9 @@
-package demo.rules
+package org.openremote.test.rules
import org.openremote.manager.rules.RulesBuilder
import org.openremote.manager.setup.builtin.ManagerTestSetup
import org.openremote.model.asset.Asset
-import org.openremote.model.asset.impl.ConsoleAsset
+import org.openremote.model.asset.impl.*
import org.openremote.model.notification.Notification
import org.openremote.model.notification.PushNotificationMessage
import org.openremote.model.query.AssetQuery
diff --git a/manager/src/main/resources/demo/rules/DemoGeofence.json b/test/src/test/resources/org/openremote/test/rules/Geofence.json
similarity index 100%
rename from manager/src/main/resources/demo/rules/DemoGeofence.json
rename to test/src/test/resources/org/openremote/test/rules/Geofence.json
diff --git a/manager/src/main/resources/demo/rules/DemoResidenceAllLightsOff.js b/test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
similarity index 100%
rename from manager/src/main/resources/demo/rules/DemoResidenceAllLightsOff.js
rename to test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
diff --git a/manager/src/main/resources/demo/rules/DemoResidenceAutoVentilation.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoResidenceAutoVentilation.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
index 543863a1d..33fbb581f 100644
--- a/manager/src/main/resources/demo/rules/DemoResidenceAutoVentilation.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
@@ -1,4 +1,4 @@
-package demo.rules
+package org.openremote.test.rules
import org.openremote.manager.rules.RulesBuilder
import org.openremote.manager.rules.RulesFacts
diff --git a/manager/src/main/resources/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
index feb91ef06..10a498116 100644
--- a/manager/src/main/resources/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
@@ -1,4 +1,4 @@
-package demo.rules
+package org.openremote.test.rules
import groovy.transform.ToString
import org.openremote.manager.rules.RulesBuilder
diff --git a/manager/src/main/resources/demo/rules/DemoResidencePresenceDetection.groovy b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoResidencePresenceDetection.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
index e381ad7fe..d571feaf1 100644
--- a/manager/src/main/resources/demo/rules/DemoResidencePresenceDetection.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
@@ -7,7 +7,7 @@ in a room over a time window that is internal to the sensor (e.g. the last minut
'presenceDetected' attribute of the residence is set depending on whether any child room
assets have presence set.
*/
-package demo.rules
+package org.openremote.test.rules
import org.openremote.manager.rules.RulesBuilder
import org.openremote.model.asset.impl.BuildingAsset
diff --git a/manager/src/main/resources/demo/rules/DemoResidenceSmartSwitch.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoResidenceSmartSwitch.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
index b367a364c..af5bd08ef 100644
--- a/manager/src/main/resources/demo/rules/DemoResidenceSmartSwitch.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
@@ -1,4 +1,4 @@
-package demo.rules
+package org.openremote.test.rules
import org.openremote.manager.rules.RulesBuilder
import org.openremote.manager.rules.RulesFacts
diff --git a/manager/src/main/resources/demo/rules/DemoResidenceVacationMode.groovy b/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoResidenceVacationMode.groovy
rename to test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
index abbe33c99..9a49fc536 100644
--- a/manager/src/main/resources/demo/rules/DemoResidenceVacationMode.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
@@ -1,4 +1,4 @@
-package demo.rules
+package org.openremote.test.rules
import groovy.transform.ToString
import org.openremote.manager.rules.RulesBuilder
diff --git a/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy b/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy
similarity index 99%
rename from manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy
rename to test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy
index db6874972..86533d557 100644
--- a/manager/src/main/resources/demo/rules/DemoSmartCityCamera.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy
@@ -1,4 +1,4 @@
-package demo.rules
+package org.openremote.test.rules
import org.openremote.manager.rules.RulesBuilder
import org.openremote.model.attribute.AttributeEvent