BaseTenantControllerTest refactored and reformatted
This commit is contained in:
parent
6a8800a845
commit
3084c2d701
@ -34,9 +34,7 @@ import org.thingsboard.server.common.data.page.PageData;
|
|||||||
import org.thingsboard.server.common.data.page.PageLink;
|
import org.thingsboard.server.common.data.page.PageLink;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
@ -50,7 +48,6 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
static final TypeReference<PageData<TenantInfo>> PAGE_DATA_TENANT_INFO_TYPE_REF = new TypeReference<>(){};
|
static final TypeReference<PageData<TenantInfo>> PAGE_DATA_TENANT_INFO_TYPE_REF = new TypeReference<>(){};
|
||||||
static final int TIMEOUT = 30;
|
static final int TIMEOUT = 30;
|
||||||
|
|
||||||
List<ListenableFuture<Boolean>> createFutures = new ArrayList<>();
|
|
||||||
List<ListenableFuture<ResultActions>> deleteFutures = new ArrayList<>();
|
List<ListenableFuture<ResultActions>> deleteFutures = new ArrayList<>();
|
||||||
ListeningExecutorService executor;
|
ListeningExecutorService executor;
|
||||||
|
|
||||||
@ -151,20 +148,21 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testFindTenants() throws Exception {
|
public void testFindTenants() throws Exception {
|
||||||
loginSysAdmin();
|
loginSysAdmin();
|
||||||
Collection<Tenant> tenants = new ConcurrentLinkedQueue<>();
|
List<Tenant> tenants = new ArrayList<>();
|
||||||
PageLink pageLink = new PageLink(17);
|
PageLink pageLink = new PageLink(17);
|
||||||
PageData<Tenant> pageData = doGetTypedWithPageLink("/api/tenants?", PAGE_DATA_TENANT_TYPE_REF, pageLink);
|
PageData<Tenant> pageData = doGetTypedWithPageLink("/api/tenants?", PAGE_DATA_TENANT_TYPE_REF, pageLink);
|
||||||
Assert.assertFalse(pageData.hasNext());
|
Assert.assertFalse(pageData.hasNext());
|
||||||
Assert.assertEquals(1, pageData.getData().size());
|
Assert.assertEquals(1, pageData.getData().size());
|
||||||
tenants.addAll(pageData.getData());
|
tenants.addAll(pageData.getData());
|
||||||
|
|
||||||
|
List<ListenableFuture<Tenant>> createFutures = new ArrayList<>(56);
|
||||||
for (int i = 0; i < 56; i++) {
|
for (int i = 0; i < 56; i++) {
|
||||||
Tenant tenant = new Tenant();
|
Tenant tenant = new Tenant();
|
||||||
tenant.setTitle("Tenant" + i);
|
tenant.setTitle("Tenant" + i);
|
||||||
createFutures.add(executor.submit(() ->
|
createFutures.add(executor.submit(() ->
|
||||||
tenants.add(doPost("/api/tenant", tenant, Tenant.class))));
|
doPost("/api/tenant", tenant, Tenant.class)));
|
||||||
}
|
}
|
||||||
Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
|
||||||
|
|
||||||
List<Tenant> loadedTenants = new ArrayList<>();
|
List<Tenant> loadedTenants = new ArrayList<>();
|
||||||
pageLink = new PageLink(17);
|
pageLink = new PageLink(17);
|
||||||
@ -199,25 +197,22 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
loginSysAdmin();
|
loginSysAdmin();
|
||||||
log.debug("test started");
|
log.debug("test started");
|
||||||
String title1 = "Tenant title 1";
|
String title1 = "Tenant title 1";
|
||||||
Collection<Tenant> tenantsTitle1 = new ConcurrentLinkedQueue<>();
|
List<ListenableFuture<Tenant>> createFutures = new ArrayList<>(134);
|
||||||
createFutures.clear();
|
|
||||||
for (int i = 0; i < 134; i++) {
|
for (int i = 0; i < 134; i++) {
|
||||||
Tenant tenant = new Tenant();
|
Tenant tenant = new Tenant();
|
||||||
String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10));
|
String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10));
|
||||||
String title = title1 + suffix;
|
String title = title1 + suffix;
|
||||||
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
|
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
|
||||||
tenant.setTitle(title);
|
tenant.setTitle(title);
|
||||||
|
|
||||||
createFutures.add(executor.submit(() ->
|
createFutures.add(executor.submit(() ->
|
||||||
tenantsTitle1.add(doPost("/api/tenant", tenant, Tenant.class))));
|
doPost("/api/tenant", tenant, Tenant.class)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
List<Tenant> tenantsTitle1 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
||||||
log.debug("saved '{}', qty {}", title1, 134);
|
log.debug("saved '{}', qty {}", title1, tenantsTitle1.size());
|
||||||
|
|
||||||
String title2 = "Tenant title 2";
|
String title2 = "Tenant title 2";
|
||||||
Collection<Tenant> tenantsTitle2 = new ConcurrentLinkedQueue<>();
|
createFutures = new ArrayList<>(127);
|
||||||
createFutures.clear();
|
|
||||||
for (int i = 0; i < 127; i++) {
|
for (int i = 0; i < 127; i++) {
|
||||||
Tenant tenant = new Tenant();
|
Tenant tenant = new Tenant();
|
||||||
String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10));
|
String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10));
|
||||||
@ -225,13 +220,13 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
|
title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
|
||||||
tenant.setTitle(title);
|
tenant.setTitle(title);
|
||||||
createFutures.add(executor.submit(() ->
|
createFutures.add(executor.submit(() ->
|
||||||
tenantsTitle2.add(doPost("/api/tenant", tenant, Tenant.class))));
|
doPost("/api/tenant", tenant, Tenant.class)));
|
||||||
}
|
}
|
||||||
|
|
||||||
Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
List<Tenant> tenantsTitle2 = Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
||||||
log.debug("saved '{}', qty {}", title2, 127);
|
log.debug("saved '{}', qty {}", title2, tenantsTitle2.size());
|
||||||
|
|
||||||
List<Tenant> loadedTenantsTitle1 = new ArrayList<>();
|
List<Tenant> loadedTenantsTitle1 = new ArrayList<>(134);
|
||||||
PageLink pageLink = new PageLink(15, 0, title1);
|
PageLink pageLink = new PageLink(15, 0, title1);
|
||||||
PageData<Tenant> pageData = null;
|
PageData<Tenant> pageData = null;
|
||||||
do {
|
do {
|
||||||
@ -247,7 +242,7 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
assertThat(tenantsTitle1).as(title1).containsExactlyInAnyOrderElementsOf(loadedTenantsTitle1);
|
assertThat(tenantsTitle1).as(title1).containsExactlyInAnyOrderElementsOf(loadedTenantsTitle1);
|
||||||
log.debug("asserted");
|
log.debug("asserted");
|
||||||
|
|
||||||
List<Tenant> loadedTenantsTitle2 = new ArrayList<>();
|
List<Tenant> loadedTenantsTitle2 = new ArrayList<>(127);
|
||||||
pageLink = new PageLink(4, 0, title2);
|
pageLink = new PageLink(4, 0, title2);
|
||||||
do {
|
do {
|
||||||
pageData = doGetTypedWithPageLink("/api/tenants?", PAGE_DATA_TENANT_TYPE_REF, pageLink);
|
pageData = doGetTypedWithPageLink("/api/tenants?", PAGE_DATA_TENANT_TYPE_REF, pageLink);
|
||||||
@ -298,20 +293,21 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testFindTenantInfos() throws Exception {
|
public void testFindTenantInfos() throws Exception {
|
||||||
loginSysAdmin();
|
loginSysAdmin();
|
||||||
Collection<TenantInfo> tenants = new ConcurrentLinkedQueue<>();
|
List<TenantInfo> tenants = new ArrayList<>();
|
||||||
PageLink pageLink = new PageLink(17);
|
PageLink pageLink = new PageLink(17);
|
||||||
PageData<TenantInfo> pageData = doGetTypedWithPageLink("/api/tenantInfos?", PAGE_DATA_TENANT_INFO_TYPE_REF, pageLink);
|
PageData<TenantInfo> pageData = doGetTypedWithPageLink("/api/tenantInfos?", PAGE_DATA_TENANT_INFO_TYPE_REF, pageLink);
|
||||||
Assert.assertFalse(pageData.hasNext());
|
Assert.assertFalse(pageData.hasNext());
|
||||||
Assert.assertEquals(1, pageData.getData().size());
|
Assert.assertEquals(1, pageData.getData().size());
|
||||||
tenants.addAll(pageData.getData());
|
tenants.addAll(pageData.getData());
|
||||||
|
|
||||||
|
List<ListenableFuture<TenantInfo>> createFutures = new ArrayList<>(56);
|
||||||
for (int i = 0; i < 56; i++) {
|
for (int i = 0; i < 56; i++) {
|
||||||
Tenant tenant = new Tenant();
|
Tenant tenant = new Tenant();
|
||||||
tenant.setTitle("Tenant" + i);
|
tenant.setTitle("Tenant" + i);
|
||||||
createFutures.add(executor.submit(() ->
|
createFutures.add(executor.submit(() ->
|
||||||
tenants.add(new TenantInfo(doPost("/api/tenant", tenant, Tenant.class), "Default"))));
|
new TenantInfo(doPost("/api/tenant", tenant, Tenant.class), "Default")));
|
||||||
}
|
}
|
||||||
Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS);
|
tenants.addAll(Futures.allAsList(createFutures).get(TIMEOUT, TimeUnit.SECONDS));
|
||||||
|
|
||||||
List<TenantInfo> loadedTenants = new ArrayList<>();
|
List<TenantInfo> loadedTenants = new ArrayList<>();
|
||||||
pageLink = new PageLink(17);
|
pageLink = new PageLink(17);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user