From f2eea6d82ba8a691df99f224a4849421dd124c60 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 15 Apr 2021 16:31:03 +0300 Subject: [PATCH 1/2] Do not print disconnect error msg --- .../thingsboard/server/controller/BaseEdgeControllerTest.java | 4 +++- .../test/java/org/thingsboard/server/edge/BaseEdgeTest.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java index cc50cdd00d..246749881f 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java @@ -696,7 +696,9 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest { Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent()); edgeImitator.allowIgnoredTypes(); - edgeImitator.disconnect(); + try { + edgeImitator.disconnect(); + } catch (Exception ignored) {} doDelete("/api/device/" + savedDevice.getId().getId().toString()) .andExpect(status().isOk()); diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java index 2d38fa9299..92548bb621 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java @@ -178,7 +178,9 @@ abstract public class BaseEdgeTest extends AbstractControllerTest { @After public void afterTest() throws Exception { - edgeImitator.disconnect(); + try { + edgeImitator.disconnect(); + } catch (Exception ignored) {} loginSysAdmin(); From b034fe04e6e392de00389a6307c7651ec77f4188 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 15 Apr 2021 16:33:57 +0300 Subject: [PATCH 2/2] Fix test wait condition --- .../server/controller/BaseEdgeEventControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java index f7ed71f177..c07a499f83 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java @@ -103,7 +103,7 @@ public class BaseEdgeEventControllerTest extends AbstractControllerTest { new TypeReference>() {}, new TimePageLink(4)).getData(); attempt++; Thread.sleep(100); - } while (edgeEvents.size() != 4 || attempt < 5); + } while (edgeEvents.size() != 4 && attempt < 5); Assert.assertEquals(4, edgeEvents.size()); Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.RULE_CHAIN.equals(ee.getType()))); Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.DEVICE.equals(ee.getType())));