简柏林 / thingskit · Commits

Commit 714b7bd7798bde87e15da2aeb8ae985363d58353

Authored by Andrii Shvaika
1 parent 9942231d

Tests Fix

Inline Side-by-side
Showing 2 changed files with 15 additions and 4 deletions
@@ -102,6 +102,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe @@ -102,6 +102,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
102 device.setType("default"); 102 device.setType("default");
103 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 103 device.setLabel("testLabel" + (int) (Math.random() * 1000));
104 devices.add(doPost("/api/device", device, Device.class)); 104 devices.add(doPost("/api/device", device, Device.class));
  105 + Thread.sleep(1);
105 } 106 }
106 DeviceTypeFilter filter = new DeviceTypeFilter(); 107 DeviceTypeFilter filter = new DeviceTypeFilter();
107 filter.setDeviceType("default"); 108 filter.setDeviceType("default");
@@ -141,6 +142,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe @@ -141,6 +142,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
141 device.setType("default"); 142 device.setType("default");
142 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 143 device.setLabel("testLabel" + (int) (Math.random() * 1000));
143 devices.add(doPost("/api/device", device, Device.class)); 144 devices.add(doPost("/api/device", device, Device.class));
  145 + Thread.sleep(1);
144 } 146 }
145 147
146 DeviceTypeFilter filter = new DeviceTypeFilter(); 148 DeviceTypeFilter filter = new DeviceTypeFilter();
@@ -210,6 +212,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe @@ -210,6 +212,7 @@ public abstract class BaseEntityQueryControllerTest extends AbstractControllerTe
210 device.setType("default"); 212 device.setType("default");
211 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 213 device.setLabel("testLabel" + (int) (Math.random() * 1000));
212 devices.add(doPost("/api/device?accessToken=" + name, device, Device.class)); 214 devices.add(doPost("/api/device?accessToken=" + name, device, Device.class));
  215 + Thread.sleep(1);
213 long temperature = (long) (Math.random() * 100); 216 long temperature = (long) (Math.random() * 100);
214 temperatures.add(temperature); 217 temperatures.add(temperature);
215 if (temperature > 45) { 218 if (temperature > 45) {
@@ -88,7 +88,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -88,7 +88,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
88 } 88 }
89 89
90 @Test 90 @Test
91 - public void testCountEntitiesByQuery() { 91 + public void testCountEntitiesByQuery() throws InterruptedException {
92 List<Device> devices = new ArrayList<>(); 92 List<Device> devices = new ArrayList<>();
93 for (int i = 0; i < 97; i++) { 93 for (int i = 0; i < 97; i++) {
94 Device device = new Device(); 94 Device device = new Device();
@@ -131,7 +131,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -131,7 +131,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
131 } 131 }
132 132
133 @Test 133 @Test
134 - public void testCountHierarchicalEntitiesByQuery() { 134 + public void testCountHierarchicalEntitiesByQuery() throws InterruptedException {
135 List<Asset> assets = new ArrayList<>(); 135 List<Asset> assets = new ArrayList<>();
136 List<Device> devices = new ArrayList<>(); 136 List<Device> devices = new ArrayList<>();
137 createTestHierarchy(assets, devices, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>()); 137 createTestHierarchy(assets, devices, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
@@ -408,7 +408,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -408,7 +408,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
408 deviceService.deleteDevicesByTenantId(tenantId); 408 deviceService.deleteDevicesByTenantId(tenantId);
409 } 409 }
410 410
411 - private void createTestHierarchy(List<Asset> assets, List<Device> devices, List<Long> consumptions, List<Long> highConsumptions, List<Long> temperatures, List<Long> highTemperatures) { 411 + private void createTestHierarchy(List<Asset> assets, List<Device> devices, List<Long> consumptions, List<Long> highConsumptions, List<Long> temperatures, List<Long> highTemperatures) throws InterruptedException {
412 for (int i = 0; i < 5; i++) { 412 for (int i = 0; i < 5; i++) {
413 Asset asset = new Asset(); 413 Asset asset = new Asset();
414 asset.setTenantId(tenantId); 414 asset.setTenantId(tenantId);
@@ -416,6 +416,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -416,6 +416,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
416 asset.setType("type" + i); 416 asset.setType("type" + i);
417 asset.setLabel("AssetLabel" + i); 417 asset.setLabel("AssetLabel" + i);
418 asset = assetService.saveAsset(asset); 418 asset = assetService.saveAsset(asset);
  419 + //TO make sure devices have different created time
  420 + Thread.sleep(1);
419 assets.add(asset); 421 assets.add(asset);
420 EntityRelation er = new EntityRelation(); 422 EntityRelation er = new EntityRelation();
421 er.setFrom(tenantId); 423 er.setFrom(tenantId);
@@ -435,6 +437,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -435,6 +437,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
435 device.setType("default" + j); 437 device.setType("default" + j);
436 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 438 device.setLabel("testLabel" + (int) (Math.random() * 1000));
437 device = deviceService.saveDevice(device); 439 device = deviceService.saveDevice(device);
  440 + //TO make sure devices have different created time
  441 + Thread.sleep(1);
438 devices.add(device); 442 devices.add(device);
439 er = new EntityRelation(); 443 er = new EntityRelation();
440 er.setFrom(asset.getId()); 444 er.setFrom(asset.getId());
@@ -452,7 +456,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -452,7 +456,7 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
452 } 456 }
453 457
454 @Test 458 @Test
455 - public void testSimpleFindEntityDataByQuery() { 459 + public void testSimpleFindEntityDataByQuery() throws InterruptedException {
456 List<Device> devices = new ArrayList<>(); 460 List<Device> devices = new ArrayList<>();
457 for (int i = 0; i < 97; i++) { 461 for (int i = 0; i < 97; i++) {
458 Device device = new Device(); 462 Device device = new Device();
@@ -460,6 +464,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -460,6 +464,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
460 device.setName("Device" + i); 464 device.setName("Device" + i);
461 device.setType("default"); 465 device.setType("default");
462 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 466 device.setLabel("testLabel" + (int) (Math.random() * 1000));
  467 + //TO make sure devices have different created time
  468 + Thread.sleep(1);
463 devices.add(deviceService.saveDevice(device)); 469 devices.add(deviceService.saveDevice(device));
464 } 470 }
465 471
@@ -529,6 +535,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -529,6 +535,8 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
529 device.setType("default"); 535 device.setType("default");
530 device.setLabel("testLabel" + (int) (Math.random() * 1000)); 536 device.setLabel("testLabel" + (int) (Math.random() * 1000));
531 devices.add(deviceService.saveDevice(device)); 537 devices.add(deviceService.saveDevice(device));
  538 + //TO make sure devices have different created time
  539 + Thread.sleep(1);
532 long temperature = (long) (Math.random() * 100); 540 long temperature = (long) (Math.random() * 100);
533 temperatures.add(temperature); 541 temperatures.add(temperature);
534 if (temperature > 45) { 542 if (temperature > 45) {