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 resources to main module so the manager can be started using the test setup

Rich Turner02159ead5d37
diff --git a/test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasks b/test/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
similarity index 100%
rename from test/src/test/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
rename to test/src/main/resources/META-INF/services/org.openremote.manager.setup.SetupTasks
diff --git a/test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider b/test/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider
similarity index 100%
rename from test/src/test/resources/META-INF/services/org.openremote.model.AssetModelProvider
rename to test/src/main/resources/META-INF/services/org.openremote.model.AssetModelProvider
diff --git a/test/src/test/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy b/test/src/main/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
rename to test/src/main/resources/org/openremote/test/failure/RulesFailureActionThrowsException.groovy
diff --git a/test/src/test/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy b/test/src/main/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
rename to test/src/main/resources/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy
diff --git a/test/src/test/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy b/test/src/main/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
rename to test/src/main/resources/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy
diff --git a/test/src/test/resources/org/openremote/test/failure/RulesFailureLoop.groovy b/test/src/main/resources/org/openremote/test/failure/RulesFailureLoop.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/failure/RulesFailureLoop.groovy
rename to test/src/main/resources/org/openremote/test/failure/RulesFailureLoop.groovy
diff --git a/test/src/test/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj b/test/src/main/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
similarity index 100%
rename from test/src/test/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
rename to test/src/main/resources/org/openremote/test/protocol/knx/knx-import-testproject.knxproj
diff --git a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml b/test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
similarity index 100%
rename from test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
rename to test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config-mac.xml
diff --git a/test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml b/test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config.xml
similarity index 100%
rename from test/src/test/resources/org/openremote/test/protocol/knx/knx-server-config.xml
rename to test/src/main/resources/org/openremote/test/protocol/knx/knx-server-config.xml
diff --git a/test/src/test/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp b/test/src/main/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
similarity index 100%
rename from test/src/test/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
rename to test/src/main/resources/org/openremote/test/protocol/velbus/VelbusProject.vlp
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy b/test/src/main/resources/org/openremote/test/rules/BasicBrokenRules.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicBrokenRules.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicBrokenRules.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicFlowRules.json b/test/src/main/resources/org/openremote/test/rules/BasicFlowRules.json
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicFlowRules.json
rename to test/src/main/resources/org/openremote/test/rules/BasicFlowRules.json
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json b/test/src/main/resources/org/openremote/test/rules/BasicJsonRules.json
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicJsonRules.json
rename to test/src/main/resources/org/openremote/test/rules/BasicJsonRules.json
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy b/test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy b/test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicLocationPredicates2.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy b/test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy b/test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy b/test/src/main/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
rename to test/src/main/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl b/test/src/main/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
rename to test/src/main/resources/org/openremote/test/rules/BasicTimedExecutionRules.drl
diff --git a/test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy b/test/src/main/resources/org/openremote/test/rules/ConsoleLocation.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ConsoleLocation.groovy
rename to test/src/main/resources/org/openremote/test/rules/ConsoleLocation.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/Geofence.json b/test/src/main/resources/org/openremote/test/rules/Geofence.json
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/Geofence.json
rename to test/src/main/resources/org/openremote/test/rules/Geofence.json
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js b/test/src/main/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
rename to test/src/main/resources/org/openremote/test/rules/ResidenceAllLightsOff.js
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy b/test/src/main/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
rename to test/src/main/resources/org/openremote/test/rules/ResidenceAutoVentilation.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy b/test/src/main/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
rename to test/src/main/resources/org/openremote/test/rules/ResidenceNotifyAlarmTrigger.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy b/test/src/main/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
rename to test/src/main/resources/org/openremote/test/rules/ResidencePresenceDetection.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy b/test/src/main/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
rename to test/src/main/resources/org/openremote/test/rules/ResidenceSmartSwitch.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy b/test/src/main/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
rename to test/src/main/resources/org/openremote/test/rules/ResidenceVacationMode.groovy
diff --git a/test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy b/test/src/main/resources/org/openremote/test/rules/SmartCityCamera.groovy
similarity index 100%
rename from test/src/test/resources/org/openremote/test/rules/SmartCityCamera.groovy
rename to test/src/main/resources/org/openremote/test/rules/SmartCityCamera.groovy
diff --git a/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
new file mode 100644
index 000000000..f8de53534
--- /dev/null
+++ b/test/src/test/groovy/org/openremote/test/energy/EnergyOptimisationAssetTest.groovy
@@ -0,0 +1,32 @@
+package org.openremote.test.energy
+
+import org.openremote.test.ContainerTrait
+import org.openremote.test.ManagerContainerTrait
+import spock.lang.Specification
+
+/*
+ * Copyright 2021, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class EnergyOptimisationAssetTest extends Specification implements ManagerContainerTrait {
+ def "Test storage asset with consumer and producer"() {
+
+ when: "a storage asset is added"
+ }
+}