Merge pull request #4418 from volodymyr-babak/edge/refactoring

Do not print disconnect error msg inside tests

@@ -696,7 +696,9 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
         Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());
         Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());
 
 
         edgeImitator.allowIgnoredTypes();
         edgeImitator.allowIgnoredTypes();
-        edgeImitator.disconnect();
+        try {
+            edgeImitator.disconnect();
+        } catch (Exception ignored) {}
 
 
         doDelete("/api/device/" + savedDevice.getId().getId().toString())
         doDelete("/api/device/" + savedDevice.getId().getId().toString())
                 .andExpect(status().isOk());
                 .andExpect(status().isOk());

@@ -103,7 +103,7 @@ public class BaseEdgeEventControllerTest extends AbstractControllerTest {
                             new TypeReference<PageData<EdgeEvent>>() {}, new TimePageLink(4)).getData();
                             new TypeReference<PageData<EdgeEvent>>() {}, new TimePageLink(4)).getData();
             attempt++;
             attempt++;
             Thread.sleep(100);
             Thread.sleep(100);
-        } while (edgeEvents.size() != 4 || attempt < 5);
+        } while (edgeEvents.size() != 4 && attempt < 5);
         Assert.assertEquals(4, edgeEvents.size());
         Assert.assertEquals(4, edgeEvents.size());
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.RULE_CHAIN.equals(ee.getType())));
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.RULE_CHAIN.equals(ee.getType())));
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.DEVICE.equals(ee.getType())));
         Assert.assertTrue(edgeEvents.stream().anyMatch(ee -> EdgeEventType.DEVICE.equals(ee.getType())));

@@ -178,7 +178,9 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
 
 
     @After
     @After
     public void afterTest() throws Exception {
     public void afterTest() throws Exception {
-        edgeImitator.disconnect();
+        try {
+            edgeImitator.disconnect();
+        } catch (Exception ignored) {}
 
 
         loginSysAdmin();
         loginSysAdmin();