Skip to content

armgit / core

Public Imported from GitHub
0

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

Added CONNECTED event for websocket connection and test fixes

Rich Turner41d2ac138da7
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
index 37bf46490..f2c80de2b 100644
--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
@@ -138,7 +138,8 @@ public class ClientEventService implements ContainerService {
.choice()
.when(header(WebsocketConstants.SESSION_OPEN))
.process(exchange -> {
- // Do nothing except stop the exchanges
+ String sessionKey = getSessionKey(exchange);
+ sendToSession(sessionKey, "CONNECTED");
})
.stop()
.when(or(
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 cb8684f8f..da6efb5f0 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
@@ -170,13 +170,14 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets[1].parentType == null
assets[1].realm == null
assets[1].path == null
- assets[1].getAttributesList().size() == 6
+ assets[1].getAttributesList().size() == 7
assets[1].getAttribute("ventilationAuto").isPresent()
assets[1].getAttribute("ventilationLevel").isPresent()
assets[1].getAttribute("alarmEnabled").isPresent()
assets[1].getAttribute("vacationUntil").isPresent()
assets[1].getAttribute("lastExecutedScene").isPresent()
assets[1].getAttribute("presenceDetected").isPresent()
+ assets[1].getAttribute("location").isPresent()
assets[1].getAttribute("alarmEnabled").get().meta.size() == 1
assets[1].getAttribute("alarmEnabled").get().getMetaItem(MetaItemType.LABEL).isPresent()
assets[1].getAttribute("alarmEnabled").get().getLabelOrName().get() == "Alarm enabled"
diff --git a/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/websocket/WebsocketClientTest.groovy
index 6e4f9a345..564f43458 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
@@ -92,6 +92,12 @@ class WebsocketClientTest extends Specification implements ManagerContainerTrait
assert connectionStatus == ConnectionStatus.CONNECTED
}
+ and: "the server should have sent a CONNECTED message"
+ conditions.eventually {
+ assert lastMessage != null
+ assert lastMessage == "CONNECTED"
+ }
+
when: "we subscribe to events produced by the server"
client.sendMessage(EventSubscription.SUBSCRIBE_MESSAGE_PREFIX + Container.JSON.writeValueAsString(
new EventSubscription(