fixes for flaky tests

application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java

@@ -145,6 +145,15 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
 
     @Test
     public void testSysAdminCountEntitiesByQuery() throws Exception {
+        loginSysAdmin();
+
+        EntityTypeFilter allDeviceFilter = new EntityTypeFilter();
+        allDeviceFilter.setEntityType(EntityType.DEVICE);
+        EntityCountQuery query = new EntityCountQuery(allDeviceFilter);
+        Long initialCount = doPostWithResponse("/api/entitiesQuery/count", query, Long.class);
+
+        loginTenantAdmin();
+
         List<Device> devices = new ArrayList<>();
         for (int i = 0; i < 97; i++) {
             Device device = new Device();
@@ -184,13 +193,8 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
         count = doPostWithResponse("/api/entitiesQuery/count", countQuery, Long.class);
         Assert.assertEquals(97, count.longValue());
 
-        EntityTypeFilter filter2 = new EntityTypeFilter();
+        Long count2 = doPostWithResponse("/api/entitiesQuery/count", query, Long.class);
-        filter2.setEntityType(EntityType.DEVICE);
+        Assert.assertEquals(initialCount + 97, count2.longValue());
-
-        EntityCountQuery countQuery2 = new EntityCountQuery(filter2);
-
-        Long count2 = doPostWithResponse("/api/entitiesQuery/count", countQuery2, Long.class);
-        Assert.assertEquals(97, count2.longValue());
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java

@@ -179,6 +179,13 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
 
     @Test
     public void testDevicesCountWsCmd() throws Exception {
+        loginSysAdmin();
+
+        EntityTypeFilter allDeviceFilter = new EntityTypeFilter();
+        allDeviceFilter.setEntityType(EntityType.DEVICE);
+        EntityCountQuery query = new EntityCountQuery(allDeviceFilter);
+        Long initialCount = doPostWithResponse("/api/entitiesQuery/count", query, Long.class);
+
         loginTenantAdmin();
 
         List<Device> devices = new ArrayList<>();
@@ -195,7 +202,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
         getWsClient().send(cmd);
         EntityCountUpdate update = getWsClient().parseCountReply(getWsClient().waitForReply());
         Assert.assertEquals(1, update.getCmdId());
-        Assert.assertEquals(100, update.getCount());
+        Assert.assertEquals(initialCount + 100, update.getCount());
 
         loginTenantAdmin();
         for (Device device : devices) {