From 5d120a7c238fdaeeb5afe2f32e4eef74b647534b Mon Sep 17 00:00:00 2001 From: Dmytro Skarzhynets Date: Wed, 20 Sep 2023 14:38:37 +0300 Subject: [PATCH] Add mock test for new and a part of exisiting logic in core consumer; make changes according to review comments --- .../queue/DefaultTbCoreConsumerService.java | 8 +- .../state/DefaultDeviceStateService.java | 2 +- .../DefaultTbCoreConsumerServiceTest.java | 281 ++++++++++++++++++ .../state/DefaultDeviceStateServiceTest.java | 18 +- .../rule/engine/action/TbDeviceStateNode.java | 2 +- .../engine/action/TbDeviceStateNodeTest.java | 5 + 6 files changed, 297 insertions(+), 19 deletions(-) create mode 100644 application/src/test/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerServiceTest.java diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java index b4344c1cd6..8dbe9254eb 100644 --- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java +++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java @@ -601,7 +601,7 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService SUPPORTED_EVENTS = Set.of( + static final Set SUPPORTED_EVENTS = Set.of( TbMsgType.CONNECT_EVENT, TbMsgType.ACTIVITY_EVENT, TbMsgType.DISCONNECT_EVENT, TbMsgType.INACTIVITY_EVENT ); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java index 176136244d..cb81b4d2e4 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java @@ -41,6 +41,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.gen.transport.TransportProtos; import org.thingsboard.server.queue.TbQueueCallback; +import java.util.Set; import java.util.UUID; import java.util.stream.Stream; @@ -97,6 +98,10 @@ public class TbDeviceStateNodeTest { // THEN assertThat(config.getEvent()).isEqualTo(TbMsgType.ACTIVITY_EVENT); + assertThat(TbDeviceStateNode.SUPPORTED_EVENTS).isEqualTo(Set.of( + TbMsgType.CONNECT_EVENT, TbMsgType.ACTIVITY_EVENT, + TbMsgType.DISCONNECT_EVENT, TbMsgType.INACTIVITY_EVENT + )); } @Test