From 9a1b2c923c710093adff29d46ba0eb5f78403fa5 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 26 Dec 2023 15:46:02 +0200 Subject: [PATCH] Fixed testSyncEdge - moved creation of edge before device/asset creation to have time to process set edge root rule chain before activation --- .../thingsboard/server/controller/EdgeControllerTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java index a0b0455b9e..96c4ecde95 100644 --- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java @@ -864,6 +864,8 @@ public class EdgeControllerTest extends AbstractControllerTest { doPost("/api/admin/jwtSettings", settings).andExpect(status().isOk()); loginTenantAdmin(); + Edge edge = doPost("/api/edge", constructEdge("Test Sync Edge", "test"), Edge.class); + Asset asset = new Asset(); asset.setName("Test Sync Edge Asset 1"); asset.setType("test"); @@ -874,8 +876,6 @@ public class EdgeControllerTest extends AbstractControllerTest { device.setType("default"); Device savedDevice = doPost("/api/device", device, Device.class); - Edge edge = doPost("/api/edge", constructEdge("Test Sync Edge", "test"), Edge.class); - simulateEdgeActivation(edge); doPost("/api/edge/" + edge.getId().getId().toString() @@ -896,6 +896,10 @@ public class EdgeControllerTest extends AbstractControllerTest { Assert.assertTrue(popDeviceMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Device 1")); Assert.assertTrue(popAssetProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "test")); Assert.assertTrue(popAssetMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Asset 1")); + Thread.sleep(1000); + for (AbstractMessage downlinkMsg : edgeImitator.getDownlinkMsgs()) { + System.out.println(" A " + downlinkMsg); + } Assert.assertTrue(edgeImitator.getDownlinkMsgs().isEmpty()); edgeImitator.expectMessageAmount(20);