tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #8328 from dashevchenko/testFixes 

Flaky test fixes
pull/5311/head
Andrew Shvayka 4 years ago
committed by GitHub
parent
828eb18870 c07eb9e920
commit
d295844a7a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java
  2. 30
      application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java

18
application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java
View File

@ -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();
filter2.setEntityType(EntityType.DEVICE);
EntityCountQuery countQuery2 = new EntityCountQuery(filter2);
Long count2 = doPostWithResponse("/api/entitiesQuery/count", countQuery2, Long.class);
Assert.assertEquals(97, count2.longValue());
Long count2 = doPostWithResponse("/api/entitiesQuery/count", query, Long.class);
Assert.assertEquals(initialCount + 97, count2.longValue());
}
@Test

30
application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java
View File

@ -79,7 +79,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
//For system administrator
@Test
public void testTenantsCountWsCmd() throws Exception {
loginSysAdmin();
Long initialCount = getInitialEntityCount(EntityType.TENANT);
List<Tenant> tenants = new ArrayList<>();
for (int i = 0; i < 100; i++) {
@ -94,7 +94,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
getWsClient().send(cmd);
EntityCountUpdate update = getWsClient().parseCountReply(getWsClient().waitForReply());
Assert.assertEquals(1, update.getCmdId());
Assert.assertEquals(101, update.getCount());
Assert.assertEquals(initialCount + 100, update.getCount());
for (Tenant tenant : tenants) {
doDelete("/api/tenant/" + tenant.getId().toString());
@ -103,7 +103,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
@Test
public void testTenantProfilesCountWsCmd() throws Exception {
loginSysAdmin();
Long initialCount = getInitialEntityCount(EntityType.TENANT_PROFILE);
List<TenantProfile> tenantProfiles = new ArrayList<>();
for (int i = 0; i < 100; i++) {
@ -118,7 +118,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
getWsClient().send(cmd);
EntityCountUpdate update = getWsClient().parseCountReply(getWsClient().waitForReply());
Assert.assertEquals(1, update.getCmdId());
Assert.assertEquals(101, update.getCount());
Assert.assertEquals(initialCount + 100, update.getCount());
for (TenantProfile tenantProfile : tenantProfiles) {
doDelete("/api/tenantProfile/" + tenantProfile.getId().toString());
@ -127,7 +127,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
@Test
public void testUsersCountWsCmd() throws Exception {
loginSysAdmin();
Long initialCount = getInitialEntityCount(EntityType.USER);
List<User> users = new ArrayList<>();
for (int i = 0; i < 100; i++) {
@ -144,7 +144,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
getWsClient().send(cmd);
EntityCountUpdate update = getWsClient().parseCountReply(getWsClient().waitForReply());
Assert.assertEquals(1, update.getCmdId());
Assert.assertEquals(103, update.getCount());
Assert.assertEquals(initialCount + 100, update.getCount());
for (User user : users) {
doDelete("/api/user/" + user.getId().toString());
@ -153,6 +153,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
@Test
public void testCustomersCountWsCmd() throws Exception {
Long initialCount = getInitialEntityCount(EntityType.CUSTOMER);
loginTenantAdmin();
List<Customer> customers = new ArrayList<>();
@ -169,7 +170,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
getWsClient().send(cmd);
EntityCountUpdate update = getWsClient().parseCountReply(getWsClient().waitForReply());
Assert.assertEquals(1, update.getCmdId());
Assert.assertEquals(101, update.getCount());
Assert.assertEquals(initialCount + 100, update.getCount());
loginTenantAdmin();
for (Customer customer : customers) {
@ -179,6 +180,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
@Test
public void testDevicesCountWsCmd() throws Exception {
Long initialCount = getInitialEntityCount(EntityType.DEVICE);
loginTenantAdmin();
List<Device> devices = new ArrayList<>();
@ -195,7 +197,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) {
@ -205,6 +207,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
@Test
public void testAssetsCountWsCmd() throws Exception {
Long initialCount = getInitialEntityCount(EntityType.ASSET);
loginTenantAdmin();
List<Asset> assets = new ArrayList<>();
@ -221,7 +224,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 (Asset asset : assets) {
@ -431,6 +434,15 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest {
Assert.assertEquals(dashboards.size(), usageInfo.getDashboards());
}
private Long getInitialEntityCount(EntityType entityType) throws Exception {
loginSysAdmin();
EntityTypeFilter allEntityFilter = new EntityTypeFilter();
allEntityFilter.setEntityType(entityType);
EntityCountQuery query = new EntityCountQuery(allEntityFilter);
return doPostWithResponse("/api/entitiesQuery/count", query, Long.class);
}
private OAuth2Info createDefaultOAuth2Info() {
return new OAuth2Info(true, Lists.newArrayList(
OAuth2ParamsInfo.builder()

Write Preview
Loading…
Cancel
Save