Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix broken tests

Rich Turner4f557ac21cf5
diff --git a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
index 886df6e3c..52101d64a 100644
--- a/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/AbstractManagerSetup.java
@@ -186,7 +186,6 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(RULE_EVENT_EXPIRES, Values.create("45m")),
new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),
new MetaItem(READ_ONLY, Values.create(true)),
- new MetaItem(STORE_DATA_POINTS, Values.create(true)),
new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),
new MetaItem(FORMAT, Values.create("%4d ppm")),
new MetaItem(STORE_DATA_POINTS)
@@ -204,7 +203,6 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(RULE_EVENT_EXPIRES, Values.create("45m")),
new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),
new MetaItem(READ_ONLY, Values.create(true)),
- new MetaItem(STORE_DATA_POINTS, Values.create(true)),
new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),
new MetaItem(FORMAT, Values.create("%3d %%")),
new MetaItem(STORE_DATA_POINTS)
@@ -222,7 +220,6 @@ public abstract class AbstractManagerSetup implements Setup {
new MetaItem(RULE_STATE, Values.create(true)),
new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),
new MetaItem(READ_ONLY, Values.create(true)),
- new MetaItem(STORE_DATA_POINTS, Values.create(true)),
new MetaItem(SHOW_ON_DASHBOARD, Values.create(true)),
new MetaItem(FORMAT, Values.create("%0.1f° C")),
new MetaItem(STORE_DATA_POINTS)
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
index dede9c2b4..01692fa6e 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
@@ -59,7 +59,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
public static final int DEMO_RULE_STATES_APARTMENT_3 = 0;
public static final int DEMO_RULE_STATES_SMART_OFFICE = 1;
public static final int DEMO_RULE_STATES_SMART_BUILDING = DEMO_RULE_STATES_APARTMENT_1 + DEMO_RULE_STATES_APARTMENT_2 + DEMO_RULE_STATES_APARTMENT_3;
- public static final int DEMO_RULE_STATES_SMART_CITY = 65;
+ public static final int DEMO_RULE_STATES_SMART_CITY = 47;
public static final int DEMO_RULE_STATES_CUSTOMER_A = DEMO_RULE_STATES_SMART_BUILDING;
public static final int DEMO_RULE_STATES_GLOBAL = DEMO_RULE_STATES_CUSTOMER_A + DEMO_RULE_STATES_SMART_OFFICE + DEMO_RULE_STATES_SMART_CITY;
public static final int DEMO_RULE_STATES_APARTMENT_1_WITH_SCENES = DEMO_RULE_STATES_APARTMENT_1 + 28;
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index e6d5c94b9..8679bc48b 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -32,6 +32,7 @@ import static org.openremote.model.Constants.MASTER_REALM
import static org.openremote.model.asset.AssetType.AGENT
import static org.openremote.model.asset.AssetType.AREA
import static org.openremote.model.asset.AssetType.BUILDING
+import static org.openremote.model.asset.AssetType.LIGHT_CONTROLLER
import static org.openremote.model.asset.AssetType.PEOPLE_COUNTER
import static org.openremote.model.asset.AssetType.CITY
import static org.openremote.model.asset.AssetType.CONSOLE
@@ -41,6 +42,7 @@ import static org.openremote.model.asset.AssetType.LIGHT
import static org.openremote.model.asset.AssetType.MICROPHONE
import static org.openremote.model.asset.AssetType.RESIDENCE
import static org.openremote.model.asset.AssetType.ROOM
+import static org.openremote.model.asset.AssetType.SOUND_EVENT
import static org.openremote.model.asset.AssetType.THING
class AssetModelResourceTest extends Specification implements ManagerContainerTrait {
@@ -69,7 +71,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
def assetDescriptors = assetModelResource.getAssetDescriptors(null)
then: "the default asset types should be present"
- assetDescriptors.size() == 13
+ assetDescriptors.size() == 15
assetDescriptors[0].name == BUILDING.name
assetDescriptors[0].attributeDescriptors.length == 5
assetDescriptors[0].attributeDescriptors.find {it.attributeName == AttributeType.SURFACE_AREA.attributeName}.valueDescriptor.valueType == ValueType.NUMBER
@@ -81,10 +83,12 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
assetDescriptors[6].name == AGENT.name
assetDescriptors[7].name == CONSOLE.name
assetDescriptors[8].name == MICROPHONE.name
- assetDescriptors[9].name == ENVIRONMENT_SENSOR.name
- assetDescriptors[10].name == LIGHT.name
- assetDescriptors[11].name == PEOPLE_COUNTER.name
- assetDescriptors[12].name == THING.name
+ assetDescriptors[9].name == SOUND_EVENT.name
+ assetDescriptors[10].name == ENVIRONMENT_SENSOR.name
+ assetDescriptors[11].name == LIGHT.name
+ assetDescriptors[12].name == LIGHT_CONTROLLER.name
+ assetDescriptors[13].name == PEOPLE_COUNTER.name
+ assetDescriptors[14].name == THING.name
when: "a request for Attribute types is made"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
index 3e623cff0..8c60d471a 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy
@@ -584,23 +584,23 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
Asset apartment1Livingroom = assets[1]
apartment1Livingroom.id == managerDemoSetup.apartment1LivingroomId
- apartment1Livingroom.name == "Living Room"
+ apartment1Livingroom.name == "Living Room 1"
Asset apartment1Kitchen = assets[2]
apartment1Kitchen.id == managerDemoSetup.apartment1KitchenId
- apartment1Kitchen.name == "Kitchen"
+ apartment1Kitchen.name == "Kitchen 1"
Asset apartment1Hallway = assets[3]
apartment1Hallway.id == managerDemoSetup.apartment1HallwayId
- apartment1Hallway.name == "Hallway"
+ apartment1Hallway.name == "Hallway 1"
Asset apartment1Bedroom1 = assets[4]
apartment1Bedroom1.id == managerDemoSetup.apartment1Bedroom1Id
- apartment1Bedroom1.name == "Bedroom"
+ apartment1Bedroom1.name == "Bedroom 1"
Asset apartment1Bathroom = assets[5]
apartment1Bathroom.id == managerDemoSetup.apartment1BathroomId
- apartment1Bathroom.name == "Bathroom"
+ apartment1Bathroom.name == "Bathroom 1"
when: "the root assets of a foreign realm are retrieved"
assets = assetResource.queryAssets(null,
@@ -670,7 +670,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
then: "the restricted asset details should be available"
apartment1Livingroom.id == managerDemoSetup.apartment1LivingroomId
- apartment1Livingroom.name == "Living Room"
+ apartment1Livingroom.name == "Living Room 1"
def resultAttributes = apartment1Livingroom.getAttributesList()
resultAttributes.size() == 7
def currentTemperature = apartment1Livingroom.getAttribute("currentTemperature").get()
@@ -736,7 +736,7 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTrai
testAsset = assetResource.get(null, managerDemoSetup.apartment1LivingroomId)
then: "the update should be ignored"
- assert testAsset.getName() == "Living Room"
+ assert testAsset.getName() == "Living Room 1"
when: "an asset is created in the authenticated realm"
testAsset = new Asset("Test Room", AssetType.ROOM, null, keycloakDemoSetup.tenantBuilding.realm)
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
index 94f03958a..2013a2c36 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
@@ -421,7 +421,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
!assets.get(1).getAttribute("currentTemperature").get().getValue().isPresent()
assets.get(1).getAttribute("currentTemperature").get().meta.size() == 6
!assets.get(1).getAttribute("targetTemperature").get().getValue().isPresent()
- assets.get(1).getAttribute("targetTemperature").get().meta.size() == 4
+ assets.get(1).getAttribute("targetTemperature").get().meta.size() == 5
assets.get(2).id == managerDemoSetup.apartment1KitchenId
assets.get(3).id == managerDemoSetup.apartment1HallwayId
assets.get(4).id == managerDemoSetup.apartment1Bedroom1Id
@@ -629,7 +629,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.id == managerDemoSetup.apartment1LivingroomId
asset.version == 0
asset.createdOn.time < System.currentTimeMillis()
- asset.name == "Living Room"
+ asset.name == "Living Room 1"
asset.wellKnownType == AssetType.ROOM
asset.parentId != null
asset.parentName == "Apartment 1"
@@ -642,7 +642,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.getAttribute("lastPresenceDetected").isPresent()
asset.getAttribute("lastPresenceDetected").get().meta.size() == 3
asset.getAttribute("motionSensor").isPresent()
- asset.getAttribute("motionSensor").get().meta.size() == 6
+ asset.getAttribute("motionSensor").get().meta.size() == 7
when: "a query is executed to select a subset of protected attributes"
asset = assetStorageService.find(
@@ -656,7 +656,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
asset.id == managerDemoSetup.apartment1LivingroomId
asset.version == 0
asset.createdOn.time < System.currentTimeMillis()
- asset.name == "Living Room"
+ asset.name == "Living Room 1"
asset.wellKnownType == AssetType.ROOM
asset.parentId != null
asset.parentName == "Apartment 1"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
index 2c73d2f7f..8d83644af 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetUserLinkingTest.groovy
@@ -64,7 +64,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.id.realm == keycloakDemoSetup.tenantBuilding.realm &&
it.id.userId == keycloakDemoSetup.testuser3Id &&
it.id.assetId == managerDemoSetup.apartment1LivingroomId &&
- it.assetName == "Living Room" &&
+ it.assetName == "Living Room 1" &&
it.parentAssetName == "Apartment 1" &&
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
@@ -72,7 +72,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.id.realm == keycloakDemoSetup.tenantBuilding.realm &&
it.id.userId == keycloakDemoSetup.testuser3Id &&
it.id.assetId == managerDemoSetup.apartment1KitchenId &&
- it.assetName == "Kitchen" &&
+ it.assetName == "Kitchen 1" &&
it.parentAssetName == "Apartment 1" &&
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
@@ -80,7 +80,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.id.realm == keycloakDemoSetup.tenantBuilding.realm &&
it.id.userId == keycloakDemoSetup.testuser3Id &&
it.id.assetId == managerDemoSetup.apartment1HallwayId &&
- it.assetName == "Hallway" &&
+ it.assetName == "Hallway 1" &&
it.parentAssetName == "Apartment 1" &&
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
@@ -88,7 +88,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.id.realm == keycloakDemoSetup.tenantBuilding.realm &&
it.id.userId == keycloakDemoSetup.testuser3Id &&
it.id.assetId == managerDemoSetup.apartment1Bedroom1Id &&
- it.assetName == "Bedroom" &&
+ it.assetName == "Bedroom 1" &&
it.parentAssetName == "Apartment 1" &&
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
@@ -96,7 +96,7 @@ class AssetUserLinkingTest extends Specification implements ManagerContainerTrai
it.id.realm == keycloakDemoSetup.tenantBuilding.realm &&
it.id.userId == keycloakDemoSetup.testuser3Id &&
it.id.assetId == managerDemoSetup.apartment1BathroomId &&
- it.assetName == "Bathroom" &&
+ it.assetName == "Bathroom 1" &&
it.parentAssetName == "Apartment 1" &&
it.userFullName == "testuser3 (DemoA3 DemoLast)"
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
index c1a7666a2..036edc02a 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
@@ -209,8 +209,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
conditions.eventually {
def livingroomAsset = assetStorageService.find(managerDemoSetup.apartment2LivingroomId, true)
assert !livingroomAsset.getAttribute("lightSwitch").get().valueAsBoolean.get()
- assert livingroomAsset.getAttribute("lightSwitchTriggerTimes").get().valueAsArray.get().length() == 3
- assert livingroomAsset.getAttribute("plantsWaterLevels").get().valueAsObject.get().getNumber("cactus").get() == 0.7
+ assert livingroomAsset.getAttribute("lightSwitchTriggerTimes").get().valueAsArray.get().length() == 2
+ assert livingroomAsset.getAttribute("plantsWaterLevels").get().valueAsObject.get().getNumber("cactus").get() == 0.8
def bathRoomAsset = assetStorageService.find(managerDemoSetup.apartment2BathroomId, true)
assert !bathRoomAsset.getAttribute("lightSwitch").get().valueAsBoolean.get()
}
diff --git a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
index b51321555..20183f7c3 100644
--- a/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
+++ b/test/src/test/resources/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy
@@ -12,7 +12,7 @@ rules.add()
.when(
{ facts ->
!facts.matchFirst("Living Room All").isPresent() &&
- facts.matchFirstAssetState(new AssetQuery().names("Living Room")).isPresent()
+ facts.matchFirstAssetState(new AssetQuery().names("Living Room 1")).isPresent()
})
.then(
{ facts ->
@@ -24,7 +24,7 @@ rules.add()
.when(
{ facts ->
!facts.matchFirst("Kitchen All").isPresent() &&
- facts.matchFirstAssetState(new AssetQuery().names("Kitchen")).isPresent()
+ facts.matchFirstAssetState(new AssetQuery().names("Kitchen 1")).isPresent()
})
.then(
{ facts ->
@@ -36,7 +36,7 @@ rules.add()
.when(
{ facts ->
!facts.matchFirst("Kitchen Number Attributes").isPresent() &&
- facts.matchAssetState(new AssetQuery().names("Kitchen"))
+ facts.matchAssetState(new AssetQuery().names("Kitchen 1"))
.filter({ assetState -> assetState.attributeValueType == AttributeValueType.NUMBER })
.findFirst().isPresent()
})