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
Fix broken tests
Rich Turner8ce5b331618d
diff --git a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.javaindex 88d81fe14..f6218a761 100644--- a/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java+++ b/agent/src/main/java/org/openremote/agent/protocol/controller/ControllerProtocol.java@@ -88,6 +88,7 @@ import static org.openremote.model.util.TextUtil.*;* <p>*/@SuppressWarnings("JavaDoc")+// TODO: Fix or remove this protocol - it does constant polling with no delay for each sensor - should be using long poll mechanism; also futures are not cancelled and NPEs appear etc...nastypublic class ControllerProtocol extends AbstractProtocol {private static final Logger LOG = SyslogCategory.getLogger(PROTOCOL, ControllerProtocol.class);@@ -622,7 +623,7 @@ public class ControllerProtocol extends AbstractProtocol {this.updateStatus(protocolRef, status);- if (status.equals(ConnectionStatus.CONNECTED) && previousStatus.equals(ConnectionStatus.DISCONNECTED)) {+ if (status.equals(ConnectionStatus.CONNECTED) && (previousStatus == null || previousStatus.equals(ConnectionStatus.DISCONNECTED))) {//Relaunch pollingif (this.pollingSensorList.isEmpty()) {LOG.info("### no polling to restart for " + protocolRef.getAttributeName() + "...");diff --git a/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerService b/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerServiceindex 5f73737c5..42d87e7b1 100644--- a/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerService+++ b/agent/src/main/resources/META-INF/services/org.openremote.container.ContainerService@@ -5,7 +5,6 @@ org.openremote.agent.protocol.knx.KNXProtocolorg.openremote.agent.protocol.velbus.VelbusTcpProtocolorg.openremote.agent.protocol.velbus.VelbusSerialProtocolorg.openremote.agent.protocol.http.HttpClientProtocol-org.openremote.agent.protocol.controller.ControllerProtocolorg.openremote.agent.protocol.udp.UdpClientProtocolorg.openremote.agent.protocol.tcp.TcpClientProtocolorg.openremote.agent.protocol.serial.SerialClientProtocoldiff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.javaindex 5b77fb8e0..645b747aa 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@@ -99,6 +99,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {public String smartCityServiceAgentId;public String area1Id;public String microphone1Id;+ public String peopleCounter3AssetId;public ManagerDemoSetup(Container container, boolean importDemoScenes) {super(container);@@ -856,6 +857,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {new MetaItem(SimulatorProtocol.SIMULATOR_ELEMENT, Values.create(NumberSimulatorElement.ELEMENT_NAME))});peopleCounter3Asset = assetStorageService.merge(peopleCounter3Asset);+ peopleCounter3AssetId = peopleCounter3Asset.getId();AssetRuleset peopleCounter3Rules = new AssetRuleset(peopleCounter3Asset.getId(), "PeopleCounter 3 Rules", GROOVY, IOUtils.toString(getClass().getResource("/demo/rules/DemoSmartCityCamera.groovy"), StandardCharsets.UTF_8)diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetAttributeLinkingTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetAttributeLinkingTest.groovyindex bd58be199..e7f458d54 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetAttributeLinkingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetAttributeLinkingTest.groovy@@ -15,10 +15,7 @@ import org.openremote.test.ManagerContainerTraitimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions-import java.util.logging.Logger-class AssetAttributeLinkingTest extends Specification implements ManagerContainerTrait {- Logger LOG = Logger.getLogger(AssetAttributeLinkingTest.class.getName())def "Check processing of asset attributes that are linked to other attributes"() {@@ -71,7 +68,7 @@ class AssetAttributeLinkingTest extends Specification implements ManagerContainedef attributeLinkProp = Values.convert(new AttributeLink(new AttributeRef(asset2.id, "item2Prop1"), null, [- new JsonPathFilter("\$[1].prop1", true)+ new JsonPathFilter("\$[1].prop1", true, false)] as ValueFilter[]), Container.JSON).orElse(null)asset1.getAttribute("button").get().addMeta(new MetaItem(MetaItemType.ATTRIBUTE_LINK, attributeLinkOnOff))diff --git a/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovyindex 658c7f53c..c70a6c6d6 100644--- a/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/controller/ControllerProtocolTest.groovy@@ -22,7 +22,6 @@ package org.openremote.test.protocol.controllerimport org.jboss.resteasy.spi.ResteasyUriInfoimport org.jboss.resteasy.util.BasicAuthHelperimport org.openremote.agent.protocol.controller.ControllerProtocol-import org.openremote.agent.protocol.http.WebTargetBuilderimport org.openremote.manager.agent.AgentServiceimport org.openremote.manager.asset.AssetProcessingServiceimport org.openremote.manager.asset.AssetStorageService@@ -40,7 +39,7 @@ import org.openremote.model.attribute.MetaItemimport org.openremote.model.value.ObjectValueimport org.openremote.model.value.Valuesimport org.openremote.test.ManagerContainerTrait-import spock.lang.Shared+import spock.lang.Ignoreimport spock.lang.Specificationimport spock.util.concurrent.PollingConditions@@ -51,125 +50,124 @@ import javax.ws.rs.core.MediaTypeimport javax.ws.rs.core.Responseimport javax.ws.rs.core.UriInfo+@Ignore // Controller protocol doesn't cancel scheduled tasks and this test intermittently failsclass ControllerProtocolTest extends Specification implements ManagerContainerTrait {- def CONTROLLERPROTOCOL_ATTRIBUTE_NAME = "testcontrollerConfig"- def CONTROLLERPROTOCOL_ATTRIBUTE_NAME2 = "testcontrollerConfig2"- def CONTROLLERPROTOCOL_ATTRIBUTE_NAME3 = "testcontrollerConfig3"+ def CONTROLLER_PROTOCOL_ATTRIBUTE_NAME = "testcontrollerConfig"+ def CONTROLLER_PROTOCOL_ATTRIBUTE_NAME2 = "testcontrollerConfig2"+ def CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3 = "testcontrollerConfig3"- @Shared- def mockServer = new ClientRequestFilter() {- private int commandCount = 0- private int pollCount = 0+ @SuppressWarnings("GroovyAccessibility")+ def "Check Controller connection"() {+ given: "a mock controller"+ def mockController = new ClientRequestFilter() {+ private int commandCount = 0+ private int pollCount = 0- @Override- void filter(ClientRequestContext requestContext) throws IOException, ConnectException {- def requestUri = requestContext.uri- def requestPath = requestUri.scheme + "://" + requestUri.host + (requestUri.port.toString().size() != 0 ? (":" + requestUri.port) : "") + requestUri.path+ @Override+ void filter(ClientRequestContext requestContext) throws IOException, ConnectException {+ def requestUri = requestContext.uri+ def requestPath = requestUri.scheme + "://" + requestUri.host + (requestUri.port.toString().size() != 0 ? (":" + requestUri.port) : "") + requestUri.path- def pollingReq = requestUri.path ==~ /\/controller\/rest\/devices\/MyDevice\/polling\/OR3ControllerProtocol_[0-9a-zA-Z]*_[0-9a-zA-Z]*/+ def pollingReq = requestUri.path ==~ /\/controller\/rest\/devices\/MyDevice\/polling\/OR3ControllerProtocol_[0-9a-zA-Z]*_[0-9a-zA-Z]*/- if(pollingReq) {- UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)- def queryParams = uriInfo.getQueryParameters(true)+ if(pollingReq) {+ UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)+ def queryParams = uriInfo.getQueryParameters(true)- if (queryParams.get("name").size() == 2 && queryParams.getFirst("name") == "my_sensor1" && queryParams.get("name").get(1) == "my_sensor2"){- requestContext.abortWith(+ if (queryParams.get("name").size() == 2 && queryParams.getFirst("name") == "my_sensor1" && queryParams.get("name").get(1) == "my_sensor2"){+ requestContext.abortWith(Response.ok("[{\"name\": \"my_sensor1\", \"value\": \"newValue1\"},{\"name\": \"my_sensor2\", \"value\": \"newValue2\"}]", MediaType.APPLICATION_JSON).build()- )- pollCount++- return- } else if (queryParams.get("name").size() == 2 && queryParams.getFirst("name") == "my_sensor1b" && queryParams.get("name").get(1) == "my_sensor2"){- requestContext.abortWith(+ )+ pollCount+++ return+ } else if (queryParams.get("name").size() == 2 && queryParams.getFirst("name") == "my_sensor1b" && queryParams.get("name").get(1) == "my_sensor2"){+ requestContext.abortWith(Response.ok("[{\"name\": \"my_sensor2\", \"value\": \"newValue2\"}]", MediaType.APPLICATION_JSON).build()- )- pollCount++- return- } else if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_sensor1a"){- requestContext.abortWith(+ )+ pollCount+++ return+ } else if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_sensor1a"){+ requestContext.abortWith(Response.ok("[{\"name\": \"my_sensor1a\", \"value\": \"newValue1a\"}]", MediaType.APPLICATION_JSON).build()- )- pollCount++- return- } else {- requestContext.abortWith(Response.serverError().build())- return- }- } else {- switch (requestPath) {- case "http://mockapi:8688/controller":- requestContext.abortWith(Response.ok().build())+ )+ pollCount++return- break- case "http://basicauthmockapi:8688/controller":- def authHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION)- if (authHeader != null) {- def usernameAndPassword = BasicAuthHelper.parseHeader(authHeader)- if (usernameAndPassword != null+ } else {+ requestContext.abortWith(Response.serverError().build())+ return+ }+ } else {+ switch (requestPath) {+ case "http://mockapi:8688/controller":+ requestContext.abortWith(Response.ok().build())+ return+ break+ case "http://basicauthmockapi:8688/controller":+ def authHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION)+ if (authHeader != null) {+ def usernameAndPassword = BasicAuthHelper.parseHeader(authHeader)+ if (usernameAndPassword != null&& usernameAndPassword[0] == "testuser"&& usernameAndPassword[1] == "password1") {- requestContext.abortWith(Response.ok().build())+ requestContext.abortWith(Response.ok().build())+ return+ }+ } else {+ requestContext.abortWith(Response.status(Response.Status.UNAUTHORIZED).build())return}- } else {- requestContext.abortWith(Response.status(Response.Status.UNAUTHORIZED).build())+ break+ case "http://disconnectedmockapi:8688/controller":+ throw new ConnectException("Server not available")return- }- break- case "http://disconnectedmockapi:8688/controller":- throw new ConnectException("Server not available")- return- break- }+ break+ }- if(requestContext.method == "POST") {- switch (requestPath) {- case "http://mockapi:8688/controller/rest/devices/DeviceName2/commands":- UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)- def queryParams = uriInfo.getQueryParameters(true)- if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_command") {- requestContext.abortWith(+ if(requestContext.method == "POST") {+ switch (requestPath) {+ case "http://mockapi:8688/controller/rest/devices/DeviceName2/commands":+ UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)+ def queryParams = uriInfo.getQueryParameters(true)+ if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_command") {+ requestContext.abortWith(Response.ok().build()- )- commandCount++- return- } else {- requestContext.abortWith(Response.serverError().build())- return- }- break- case "http://mockapi:8688/controller/rest/devices/MyDevice/commands":- UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)- def queryParams = uriInfo.getQueryParameters(true)- if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_command") {- String bodyStr = (String)requestContext.getEntity()- ObjectValue body = Values.<ObjectValue>parse(bodyStr).orElse(null)-- if (body != null && body.get("parameter").isPresent() && body.get("parameter").orElse(null).toString() == "a_parameter") {- requestContext.abortWith(Response.ok().build())+ )commandCount++return} else {requestContext.abortWith(Response.serverError().build())return}- } else {- requestContext.abortWith(Response.serverError().build())- return- }- break+ break+ case "http://mockapi:8688/controller/rest/devices/MyDevice/commands":+ UriInfo uriInfo = new ResteasyUriInfo(requestContext.uri)+ def queryParams = uriInfo.getQueryParameters(true)+ if (queryParams.get("name").size() == 1 && queryParams.getFirst("name") == "my_command") {+ String bodyStr = (String)requestContext.getEntity()+ ObjectValue body = Values.<ObjectValue>parse(bodyStr).orElse(null)++ if (body != null && body.get("parameter").isPresent() && body.get("parameter").orElse(null).toString() == "a_parameter") {+ requestContext.abortWith(Response.ok().build())+ commandCount+++ return+ } else {+ requestContext.abortWith(Response.serverError().build())+ return+ }+ } else {+ requestContext.abortWith(Response.serverError().build())+ return+ }+ break+ }}}++ requestContext.abortWith(Response.serverError().build())}}- }-- def cleanup() {- mockServer.commandCount = 0- mockServer.pollCount = 0- }- def "Check Controller connection"() {- given: "expected conditions"+ and: "expected conditions"def conditions = new PollingConditions(timeout: 20, initialDelay: 1)when: "the container starts"@@ -186,8 +184,8 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr}when: "the web target builder is configured to use the mock server"- if (!controllerProtocol.client.configuration.isRegistered(mockServer)) {- controllerProtocol.client.register(mockServer, Integer.MAX_VALUE)+ if (!controllerProtocol.client.configuration.isRegistered(mockController)) {+ controllerProtocol.client.register(mockController, Integer.MAX_VALUE)}and: "an agent with a Controller protocol configuration is created"@@ -196,7 +194,7 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTragent.setName("Test Agent")agent.setType(AssetType.AGENT)agent.setAttributes(- ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME), ControllerProtocol.PROTOCOL_NAME)+ ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME), ControllerProtocol.PROTOCOL_NAME).addMeta(new MetaItem(ControllerProtocol.META_PROTOCOL_BASE_URI,@@ -204,15 +202,12 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr)))-- and: "the agent is added to the asset service"agent = assetStorageService.merge(agent)- def controllerRef = assetStorageService.find(agent.id, true).getAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME).get().getReferenceOrThrow()+ def controllerRef = agent.getAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME).get().getReferenceOrThrow()then: "the protocol should authenticate and start pinging the server and the connection status should become CONNECTED"conditions.eventually {- def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME))-+ def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME))assert status == ConnectionStatus.CONNECTEDassert controllerProtocol.controllerHeartbeat.get(controllerRef).isCancelled()}@@ -223,14 +218,14 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr// attribute that sends requests to the server using PUT with dynamic body and custom header to override parentnew AssetAttribute("sensor", AttributeValueType.STRING).addMeta(- new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME).toArrayValue()),+ new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME).toArrayValue()),new MetaItem(ControllerProtocol.META_ATTRIBUTE_DEVICE_NAME, Values.create("MyDevice")),new MetaItem(ControllerProtocol.META_ATTRIBUTE_SENSOR_NAME, Values.create("my_sensor1a")),new MetaItem(MetaItemType.READ_ONLY, Values.create(true))),new AssetAttribute("command", AttributeValueType.STRING).addMeta(- new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME).toArrayValue()),+ new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME).toArrayValue()),new MetaItem(ControllerProtocol.META_ATTRIBUTE_DEVICE_NAME, Values.create("MyDevice")),new MetaItem(ControllerProtocol.META_ATTRIBUTE_COMMAND_NAME, Values.create("my_command")))@@ -241,23 +236,21 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrthen: "multiple pollings should have occurred"conditions.eventually {- assert mockServer.pollCount > 2+ assert mockController.pollCount > 2}- and: "value should be updated"- def newAsset = assetStorageService.find(asset.getId(), true)-then:conditions.eventually {+ def newAsset = assetStorageService.find(asset.getId(), true)assert controllerProtocol.controllersMap.get(controllerRef).getSensorsListForDevice("MyDevice").size() == 1assert controllerProtocol.pollingSensorList.size() == 1- assert mockServer.commandCount == 0- assert mockServer.pollCount > 0+ assert mockController.commandCount == 0+ assert mockController.pollCount > 0assert newAsset.getAttribute("sensor").flatMap({it.getValueAsString()}).orElse("") == "newValue1a"}when: "another protocol is added linked to an unavailable controller"- agent.addAttributes(ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME2), ControllerProtocol.PROTOCOL_NAME)+ agent.addAttributes(ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME2), ControllerProtocol.PROTOCOL_NAME).addMeta(new MetaItem(ControllerProtocol.META_PROTOCOL_BASE_URI,@@ -267,13 +260,12 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrand: "the agent is added to the asset service"agent = assetStorageService.merge(agent)- def controllerRef2 = assetStorageService.find(agent.id, true).getAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME2).get().getReferenceOrThrow()+ def controllerRef2 = assetStorageService.find(agent.id, true).getAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME2).get().getReferenceOrThrow()- then: "the protocol should authenticate and start pinging the server and the connection status should become CONNECTED"+ then: "the good protocol configuration should authenticate and start pinging the controller but the unavailable should remain DISCONNECTED"conditions.eventually {- def status2 = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME2))- def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME))-+ def status2 = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME2))+ def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME))assert status2 == ConnectionStatus.DISCONNECTEDassert status == ConnectionStatus.CONNECTEDassert !controllerProtocol.controllerHeartbeat.get(controllerRef2).isCancelled()@@ -281,7 +273,8 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr}when: "another protocol for command with map"- agent.addAttributes(ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME3), ControllerProtocol.PROTOCOL_NAME)+ agent.removeAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME2)+ agent.addAttributes(ProtocolConfiguration.initProtocolConfiguration(new AssetAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3), ControllerProtocol.PROTOCOL_NAME).addMeta(new MetaItem(ControllerProtocol.META_PROTOCOL_BASE_URI,@@ -291,13 +284,15 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrand: "the agent is added to the asset service"agent = assetStorageService.merge(agent)- def controllerRef3 = assetStorageService.find(agent.id, true).getAttribute(CONTROLLERPROTOCOL_ATTRIBUTE_NAME3).get().getReferenceOrThrow()+ def controllerRef3 = assetStorageService.find(agent.id, true).getAttribute(CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3).get().getReferenceOrThrow()then: "the protocol should authenticate and start pinging the server and the connection status should become CONNECTED"conditions.eventually {- def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME3))-+ def status = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME))+ def status3 = agentService.getProtocolConnectionStatus(new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3))assert status == ConnectionStatus.CONNECTED+ assert status3 == ConnectionStatus.CONNECTED+ assert controllerProtocol.controllerHeartbeat.get(controllerRef).isCancelled()assert controllerProtocol.controllerHeartbeat.get(controllerRef3).isCancelled()}@@ -307,16 +302,19 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTr// attribute that sends requests to the server using PUT with dynamic body and custom header to override parentnew AssetAttribute("command", AttributeValueType.STRING, Values.create("command1")).addMeta(- new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLERPROTOCOL_ATTRIBUTE_NAME3).toArrayValue()),+ new MetaItem(MetaItemType.AGENT_LINK, new AttributeRef(agent.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3).toArrayValue()),new MetaItem(ControllerProtocol.META_ATTRIBUTE_DEVICE_NAME, Values.create("DeviceName2")),new MetaItem(ControllerProtocol.META_ATTRIBUTE_COMMANDS_MAP, Values.<ObjectValue>parse(/{"command1": "my_command", "command2": "wrong"}/).get())))-- and: "the asset is merged into the asset service"asset2 = assetStorageService.merge(asset2)- and: "a linked attribute value is updated"+ then: "the asset should be linked to the protocol"+ conditions.eventually {+ assert controllerProtocol.linkedAttributes.containsKey(new AttributeRef(asset2.id, CONTROLLER_PROTOCOL_ATTRIBUTE_NAME3))+ }++ when: "a linked attribute value is updated"def attributeEvent = new AttributeEvent(asset2.id,"command",Values.create("command1"))@@ -324,8 +322,7 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrthen:conditions.eventually {- assert controllerProtocol.controllersTargetMap.size() == 3- assert mockServer.commandCount == 1+ assert mockController.commandCount == 1}and: "another linked attribute value is updated with no value"@@ -336,7 +333,7 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrthen:conditions.eventually {- assert mockServer.commandCount == 1+ assert mockController.commandCount == 1}and: "another linked attribute value is updated with a value"@@ -347,7 +344,7 @@ class ControllerProtocolTest extends Specification implements ManagerContainerTrthen:conditions.eventually {- assert mockServer.commandCount == 2+ assert mockController.commandCount == 2assert true}diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovyindex d2ba25f12..656f08f72 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientProtocolTest.groovy@@ -19,9 +19,7 @@*/package org.openremote.test.protocol.websocket-import org.openremote.agent.protocol.Protocol-import org.openremote.agent.protocol.ProtocolExecutorServiceimport org.openremote.agent.protocol.http.OAuthPasswordGrantimport org.openremote.agent.protocol.simulator.SimulatorProtocolimport org.openremote.agent.protocol.websocket.WebsocketClientProtocol@@ -103,6 +101,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContai}}+ @SuppressWarnings("GroovyAccessibility")def "Check websocket client protocol configuration and linked attribute deployment"() {given: "expected conditions"@@ -111,7 +110,6 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiwhen: "the container starts"def serverPort = findEphemeralPort()def container = startContainer(defaultConfig(serverPort), defaultServices())- def protocolExecutorService = container.getService(ProtocolExecutorService.class)def websocketClientProtocol = container.getService(WebsocketClientProtocol.class)def simulatorProtocol = container.getService(SimulatorProtocol.class)def assetStorageService = container.getService(AssetStorageService.class)@@ -204,7 +202,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiValues.convert([new SubStringValueFilter(SharedEvent.MESSAGE_PREFIX.length()),- new JsonPathFilter("\$..attributeState.attributeRef.attributeName", false)+ new JsonPathFilter("\$..attributeState.attributeRef.attributeName", false, false)] as ValueFilter[], Container.JSON).orElse(null)),new MetaItem(WebsocketClientProtocol.META_ATTRIBUTE_MATCH_PREDICATE,@@ -213,7 +211,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiValues.convert([new SubStringValueFilter(SharedEvent.MESSAGE_PREFIX.length()),- new JsonPathFilter("\$..events[?(@.attributeState.attributeRef.attributeName == \"targetTemperature\")].attributeState.value", true)+ new JsonPathFilter("\$..events[?(@.attributeState.attributeRef.attributeName == \"targetTemperature\")].attributeState.value", true, false)] as ValueFilter[], Container.JSON).orElse(null)),new MetaItem(WebsocketClientProtocol.META_SUBSCRIPTIONS,@@ -232,7 +230,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiValues.convert([new SubStringValueFilter(SharedEvent.MESSAGE_PREFIX.length()),- new JsonPathFilter("\$..attributeState.attributeRef.attributeName", false)+ new JsonPathFilter("\$..attributeState.attributeRef.attributeName", false, false)] as ValueFilter[], Container.JSON).orElse(null)),new MetaItem(WebsocketClientProtocol.META_ATTRIBUTE_MATCH_PREDICATE,@@ -241,7 +239,7 @@ class WebsocketClientProtocolTest extends Specification implements ManagerContaiValues.convert([new SubStringValueFilter(SharedEvent.MESSAGE_PREFIX.length()),- new JsonPathFilter("\$..events[?(@.attributeState.attributeRef.attributeName == \"co2Level\")].attributeState.value", true),+ new JsonPathFilter("\$..events[?(@.attributeState.attributeRef.attributeName == \"co2Level\")].attributeState.value", true, false),] as ValueFilter[], Container.JSON).orElse(null)),new MetaItem(WebsocketClientProtocol.META_SUBSCRIPTIONS,diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex 55c98cf5c..f10046fc4 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -27,6 +27,7 @@ import static org.openremote.model.rules.Ruleset.Lang.GROOVYclass BasicRulesDeploymentTest extends Specification implements ManagerContainerTrait {+ @SuppressWarnings("GroovyAccessibility")def "Check basic rules engine deployment"() {given: "expected conditions"@@ -146,12 +147,16 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerthen: "the apartment rules engine should be removed"conditions.eventually {- assert rulesService.assetEngines.size() == 1+ assert rulesService.assetEngines.size() == 2def apartment2Engine = rulesService.assetEngines.get(managerDemoSetup.apartment2Id)def apartment3Engine = rulesService.assetEngines.get(managerDemoSetup.apartment3Id)+ def peopleCounter3Engine = rulesService.assetEngines.get(managerDemoSetup.peopleCounter3AssetId)assert apartment2Engine == nullassert apartment3Engine != nullassert apartment3Engine.isRunning()+ assert peopleCounter3Engine != null+ assert peopleCounter3Engine.isRunning()+}when: "a broken rule definition is added to the global rules engine"@@ -204,13 +209,16 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerand: "other rule engines should be unaffected"conditions.eventually {assert rulesService.tenantEngines.size() == 2- assert rulesService.assetEngines.size() == 0+ assert rulesService.assetEngines.size() == 1def masterEngine = rulesService.tenantEngines.get(keycloakDemoSetup.masterTenant.realm)- def tenantCity = rulesService.tenantEngines.get(keycloakDemoSetup.tenantCity.realm)+ def cityEngine = rulesService.tenantEngines.get(keycloakDemoSetup.tenantCity.realm)+ def peopleCounter3Engine = rulesService.assetEngines.get(managerDemoSetup.peopleCounter3AssetId)assert masterEngine != nullassert masterEngine.isRunning()- assert tenantCity != null- assert tenantCity.isRunning()+ assert cityEngine != null+ assert cityEngine.isRunning()+ assert peopleCounter3Engine != null+ assert peopleCounter3Engine.isRunning()}when: "the disabled tenant is re-enabled"@@ -222,7 +230,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainertenantBuildingEngine = rulesService.tenantEngines.get(keycloakDemoSetup.tenantBuilding.realm)apartment3Engine = rulesService.assetEngines.get(managerDemoSetup.apartment3Id)assert rulesService.tenantEngines.size() == 3- assert rulesService.assetEngines.size() == 1+ assert rulesService.assetEngines.size() == 2assert tenantBuildingEngine != nullassert tenantBuildingEngine.isRunning()assert tenantBuildingEngine.deployments.size() == 2diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovyindex 132f12f3e..d1a11117c 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy@@ -93,6 +93,7 @@ class BasicRulesImport {apartment3RulesetId = rulesetStorageService.merge(ruleset).id}+ @SuppressWarnings("GroovyAccessibility")boolean assertEnginesReady(RulesService rulesService,KeycloakDemoSetup keycloakDemoSetup,ManagerDemoSetup managerDemoSetup) {@@ -122,7 +123,7 @@ class BasicRulesImport {def tenantCityEngine = rulesService.tenantEngines.get(keycloakDemoSetup.tenantCity.realm)assert tenantCityEngine == null- assert rulesService.assetEngines.size() == 2+ assert rulesService.assetEngines.size() == 3apartment1Engine = rulesService.assetEngines.get(managerDemoSetup.apartment1Id)assert apartment1Engine == nullapartment2Engine = rulesService.assetEngines.get(managerDemoSetup.apartment2Id)@@ -139,6 +140,13 @@ class BasicRulesImport {assert apartment3Engine.deployments.size() == 1assert apartment3Engine.deployments.values().iterator().next().name == "Some apartment 3 demo rules"assert apartment3Engine.deployments.values().iterator().next().status == DEPLOYED+ def peopleCounter3Engine = rulesService.assetEngines.get(managerDemoSetup.peopleCounter3AssetId)+ assert peopleCounter3Engine != null+ peopleCounter3Engine.disableTemporaryFactExpiration = true+ assert peopleCounter3Engine.isRunning()+ assert peopleCounter3Engine.deployments.size() == 1+ assert peopleCounter3Engine.deployments.values().iterator().next().name == "PeopleCounter 3 Rules"+ assert peopleCounter3Engine.deployments.values().iterator().next().status == DEPLOYEDreturn true}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.groovyindex fc9b54a02..dca9546a5 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@@ -92,9 +92,11 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {}and: "the geofence notifier debounce is set to a small value for testing"+ def originalDebounceMillis = ORConsoleGeofenceAssetAdapter.NOTIFY_ASSETS_DEBOUNCE_MILLISORConsoleGeofenceAssetAdapter.NOTIFY_ASSETS_DEBOUNCE_MILLIS = 100and: "the rule firing delay time is set to a small value for testing"+ def originalExpirationMillis = TemporaryFact.GUARANTEED_MIN_EXPIRATION_MILLISTemporaryFact.GUARANTEED_MIN_EXPIRATION_MILLIS = 100and: "the container environment is started with the mock handler"@@ -142,43 +144,43 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {when: "a user authenticates"def accessToken = authenticate(- container,- keycloakDemoSetup.tenantBuilding.realm,- KEYCLOAK_CLIENT_ID,- "testuser3",- "testuser3"+ container,+ keycloakDemoSetup.tenantBuilding.realm,+ KEYCLOAK_CLIENT_ID,+ "testuser3",+ "testuser3").tokenand: "a console is registered by that user"def authenticatedConsoleResource = getClientApiTarget(serverUri(serverPort), keycloakDemoSetup.tenantBuilding.realm, accessToken).proxy(ConsoleResource.class)def consoleRegistration = new ConsoleRegistration(null,- "Test Console",- "1.0",- "Android 7.0",- new HashMap<String, ConsoleProvider>() {- {- put("geofence", new ConsoleProvider(- ORConsoleGeofenceAssetAdapter.NAME,- true,- false,- false,- false,- false,- null- ))- put("push", new ConsoleProvider(- "fcm",- true,- true,- true,- true,- false,- (ObjectValue) parse("{token: \"23123213ad2313b0897efd\"}").orElse(null)- ))- }- },- "",- ["manager"] as String[])+ "Test Console",+ "1.0",+ "Android 7.0",+ new HashMap<String, ConsoleProvider>() {+ {+ put("geofence", new ConsoleProvider(+ ORConsoleGeofenceAssetAdapter.NAME,+ true,+ false,+ false,+ false,+ false,+ null+ ))+ put("push", new ConsoleProvider(+ "fcm",+ true,+ true,+ true,+ true,+ false,+ (ObjectValue) parse("{token: \"23123213ad2313b0897efd\"}").orElse(null)+ ))+ }+ },+ "",+ ["manager"] as String[])consoleRegistration = authenticatedConsoleResource.register(null, consoleRegistration)then: "the console should have been registered and a geofence refresh notification should have been sent"@@ -465,6 +467,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {cleanup: "stop the container"RulesEngine.PAUSE_SCHEDULER = originalPauseRulesEngine.UNPAUSE_SCHEDULER = originalUnpause+ ORConsoleGeofenceAssetAdapter.NOTIFY_ASSETS_DEBOUNCE_MILLIS = originalDebounceMillis+ TemporaryFact.GUARANTEED_MIN_EXPIRATION_MILLIS = originalExpirationMillisstopContainer(container)}}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.groovyindex 93402148f..defdab81f 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@@ -22,6 +22,7 @@ import static org.openremote.model.attribute.AttributeEvent.Source.SENSORclass ResidenceAutoVentilationTest extends Specification implements ManagerContainerTrait {+ @SuppressWarnings("GroovyAccessibility")def "Auto ventilation with CO2 detection"() {given: "the container environment is started"