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
Fixes for tests
Rich Turnerb47a7eea7772
diff --git a/test/src/main/groovy/org/openremote/test/ClientEventService.groovy b/test/src/main/groovy/org/openremote/test/ClientEventService.groovyindex 3ca875e54..44f86539c 100644--- a/test/src/main/groovy/org/openremote/test/ClientEventService.groovy+++ b/test/src/main/groovy/org/openremote/test/ClientEventService.groovy@@ -22,6 +22,7 @@ package org.openremote.testimport com.fasterxml.jackson.databind.ObjectMapperimport org.openremote.app.client.event.SubscriptionFailureEventimport org.openremote.app.client.event.EventService+import org.openremote.model.event.TriggeredEventSubscriptionimport org.openremote.model.event.bus.EventBusimport org.openremote.model.event.shared.*@@ -57,29 +58,18 @@ class ClientEventService implements EventService {data = data.substring(SharedEvent.MESSAGE_PREFIX.length())if (data.startsWith("{")) {- SharedEvent event = objectMapper.readValue(data, SharedEvent.class)- eventBus.dispatch(event)+ TriggeredEventSubscription event = objectMapper.readValue(data, TriggeredEventSubscription.class)+ if (event.events != null) {+ for (SharedEvent evt : event.events) {+ eventBus.dispatch(evt)+ }+ }} else if (data.startsWith("[")) {// Handle array of eventsSharedEvent[] events = objectMapper.readValue(data, SharedEvent[].class)for (SharedEvent event : events) {eventBus.dispatch(event)}- } else {- String[] dataArr = data.split(":(.+)")- if (dataArr.length == 2) {- String subscriptionId = dataArr[0]- if (dataArr[1].startsWith("[")) {- // Handle array of events- SharedEvent[] events = objectMapper.readValue(data, SharedEvent[].class)- for (SharedEvent event : events) {- eventBus.dispatch(event)- }- } else {- SharedEvent event = objectMapper.readValue(data, SharedEvent.class)- eventBus.dispatch(event)- }- }}}} catch (Throwable t) {diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovyindex e6b0f07d6..17c5fd078 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy@@ -22,6 +22,7 @@ package org.openremote.test.assetsimport org.openremote.container.Containerimport org.openremote.model.asset.AssetModelResourceimport org.openremote.model.attribute.AttributeType+import org.openremote.model.attribute.MetaItemTypeimport org.openremote.model.value.ValueTypeimport org.openremote.test.ManagerContainerTraitimport spock.lang.Shared@@ -105,6 +106,6 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTrdef metaItemDescriptors = assetModelResource.getMetaItemDescriptors(null)then: "the default MetaItem types should be present"- metaItemDescriptors.size() == 25+ metaItemDescriptors.size() == MetaItemType.values().length}}diff --git a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovyindex fe578e93b..672594353 100644--- a/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/BasicProtocolTest.groovy@@ -310,7 +310,7 @@ class BasicProtocolTest extends Specification implements ManagerContainerTrait,new AttributeRef(mockAgent.getId(), "mockConfig1").toArrayValue()),new MetaItem(- MetaItemType.META_VALUE_FILTERS,+ MetaItemType.VALUE_FILTERS,Values.createArray().add(Util.objectToValue(new RegexValueFilter("\\w(\\d+)", 1, 2)).get()))),@@ -322,7 +322,7 @@ class BasicProtocolTest extends Specification implements ManagerContainerTrait,new AttributeRef(mockAgent.getId(), "mockConfig1").toArrayValue()),new MetaItem(- MetaItemType.META_VALUE_FILTERS,+ MetaItemType.VALUE_FILTERS,Values.createArray().add(Util.objectToValue(new SubStringValueFilter(10, 12)).get()))),@@ -334,7 +334,7 @@ class BasicProtocolTest extends Specification implements ManagerContainerTrait,new AttributeRef(mockAgent.getId(), "mockConfig1").toArrayValue()),new MetaItem(- MetaItemType.META_VALUE_FILTERS,+ MetaItemType.VALUE_FILTERS,Values.createArray().add(Util.objectToValue(new SubStringValueFilter(23)).get()).add(Util.objectToValue(new RegexValueFilter("[a-z|\\s]+(\\d+)%\"}", 1, 0)).get())diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovyindex e3118ef8b..8fd8c8902 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpClientProtocolTest.groovy@@ -488,7 +488,7 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTrnew MetaItem(HttpClientProtocol.META_ATTRIBUTE_PATH, Values.create("get_poll_slow")),new MetaItem(HttpClientProtocol.META_POLLING_MILLIS, Values.create(50)), // This is ms in testingnew MetaItem(- MetaItemType.META_VALUE_FILTERS,+ MetaItemType.VALUE_FILTERS,Values.createArray().add(Util.objectToValue(new RegexValueFilter("\\d+", 0, 0)).get()))),@@ -499,7 +499,7 @@ class HttpClientProtocolTest extends Specification implements ManagerContainerTrnew MetaItem(HttpClientProtocol.META_ATTRIBUTE_PATH, Values.create("get_poll_fast")),new MetaItem(HttpClientProtocol.META_POLLING_MILLIS, Values.create(40)), // This is ms in testingnew MetaItem(- MetaItemType.META_VALUE_FILTERS,+ MetaItemType.VALUE_FILTERS,Values.createArray().add(Util.objectToValue(new RegexValueFilter("\\d+", 0, 1)).get())))diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovyindex f57fc9b37..4dc8a5dd5 100644--- a/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/http/WebTargetTest.groovy@@ -75,7 +75,7 @@ class WebTargetTest extends Specification {accessToken = "accesstoken" + accessTokenCount++def response = new OAuthServerResponse()response.accessToken = accessToken- response.expiresIn = requestPath == "https://oauthserver/token" ? 1 : 100+ response.expiresIn = requestPath == "https://oauthserver/token" ? 5 : 100response.tokenType = "Bearer"// Include refresh token if configured to support itdiff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovyindex e7cbb1819..6e4f9a345 100644--- a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy+++ b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy@@ -19,7 +19,6 @@*/package org.openremote.test.protocol.websocket-import org.apache.http.client.utils.URIBuilderimport org.openremote.agent.protocol.http.OAuthPasswordGrantimport org.openremote.agent.protocol.websocket.WebsocketClient