From 714b7bd7798bde87e15da2aeb8ae985363d58353 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Fri, 26 Jun 2020 13:49:54 +0300
Subject: [PATCH] Tests Fix

---
 .../BaseEntityQueryControllerTest.java           |  3 +++
 .../dao/service/BaseEntityServiceTest.java       | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java
index 2763d14b46..75de7293f0 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java
@@ -102,6 +102,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
             device.setType("default");
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
             devices.add(doPost("/api/device", device, Device.class));
+            Thread.sleep(1);
         }
         DeviceTypeFilter filter = new DeviceTypeFilter();
         filter.setDeviceType("default");
@@ -141,6 +142,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
             device.setType("default");
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
             devices.add(doPost("/api/device", device, Device.class));
+            Thread.sleep(1);
         }
 
         DeviceTypeFilter filter = new DeviceTypeFilter();
@@ -210,6 +212,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
             device.setType("default");
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
             devices.add(doPost("/api/device?accessToken=" + name, device, Device.class));
+            Thread.sleep(1);
             long temperature = (long) (Math.random() * 100);
             temperatures.add(temperature);
             if (temperature > 45) {
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java
index 20b2484f9e..2521a359af 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java
@@ -88,7 +88,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
     }
 
     @Test
-    public void testCountEntitiesByQuery() {
+    public void testCountEntitiesByQuery() throws InterruptedException {
         List<Device> devices = new ArrayList<>();
         for (int i = 0; i < 97; i++) {
             Device device = new Device();
@@ -131,7 +131,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
     }
 
     @Test
-    public void testCountHierarchicalEntitiesByQuery() {
+    public void testCountHierarchicalEntitiesByQuery() throws InterruptedException {
         List<Asset> assets = new ArrayList<>();
         List<Device> devices = new ArrayList<>();
         createTestHierarchy(assets, devices, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
@@ -408,7 +408,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
         deviceService.deleteDevicesByTenantId(tenantId);
     }
 
-    private void createTestHierarchy(List<Asset> assets, List<Device> devices, List<Long> consumptions, List<Long> highConsumptions, List<Long> temperatures, List<Long> highTemperatures) {
+    private void createTestHierarchy(List<Asset> assets, List<Device> devices, List<Long> consumptions, List<Long> highConsumptions, List<Long> temperatures, List<Long> highTemperatures) throws InterruptedException {
         for (int i = 0; i < 5; i++) {
             Asset asset = new Asset();
             asset.setTenantId(tenantId);
@@ -416,6 +416,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
             asset.setType("type" + i);
             asset.setLabel("AssetLabel" + i);
             asset = assetService.saveAsset(asset);
+            //TO make sure devices have different created time
+            Thread.sleep(1);
             assets.add(asset);
             EntityRelation er = new EntityRelation();
             er.setFrom(tenantId);
@@ -435,6 +437,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
                 device.setType("default" + j);
                 device.setLabel("testLabel" + (int) (Math.random() * 1000));
                 device = deviceService.saveDevice(device);
+                //TO make sure devices have different created time
+                Thread.sleep(1);
                 devices.add(device);
                 er = new EntityRelation();
                 er.setFrom(asset.getId());
@@ -452,7 +456,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
     }
 
     @Test
-    public void testSimpleFindEntityDataByQuery() {
+    public void testSimpleFindEntityDataByQuery() throws InterruptedException {
         List<Device> devices = new ArrayList<>();
         for (int i = 0; i < 97; i++) {
             Device device = new Device();
@@ -460,6 +464,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
             device.setName("Device" + i);
             device.setType("default");
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
+            //TO make sure devices have different created time
+            Thread.sleep(1);
             devices.add(deviceService.saveDevice(device));
         }
 
@@ -529,6 +535,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
             device.setType("default");
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
             devices.add(deviceService.saveDevice(device));
+            //TO make sure devices have different created time
+            Thread.sleep(1);
             long temperature = (long) (Math.random() * 100);
             temperatures.add(temperature);
             if (temperature > 45) {