diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index 282e07caa1..55f3bb58c8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -18,6 +18,8 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.After; +import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -47,44 +49,17 @@ import org.thingsboard.server.common.data.id.HasId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.ota.ChecksumAlgorithm; import org.thingsboard.server.common.data.ota.OtaPackageType; -import org.thingsboard.server.dao.alarm.AlarmCommentService; -import org.thingsboard.server.dao.alarm.AlarmService; -import org.thingsboard.server.dao.asset.AssetProfileService; -import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.audit.AuditLogLevelFilter; import org.thingsboard.server.dao.audit.AuditLogLevelMask; import org.thingsboard.server.dao.audit.AuditLogLevelProperties; -import org.thingsboard.server.dao.component.ComponentDescriptorService; -import org.thingsboard.server.dao.customer.CustomerService; -import org.thingsboard.server.dao.dashboard.DashboardService; -import org.thingsboard.server.dao.device.DeviceCredentialsService; -import org.thingsboard.server.dao.device.DeviceProfileService; -import org.thingsboard.server.dao.device.DeviceService; -import org.thingsboard.server.dao.edge.EdgeEventService; -import org.thingsboard.server.dao.edge.EdgeService; -import org.thingsboard.server.dao.entity.EntityService; -import org.thingsboard.server.dao.entityview.EntityViewService; -import org.thingsboard.server.dao.event.EventService; -import org.thingsboard.server.dao.ota.OtaPackageService; -import org.thingsboard.server.dao.queue.QueueService; -import org.thingsboard.server.dao.relation.RelationService; -import org.thingsboard.server.dao.resource.ResourceService; -import org.thingsboard.server.dao.rpc.RpcService; -import org.thingsboard.server.dao.rule.RuleChainService; -import org.thingsboard.server.dao.settings.AdminSettingsService; -import org.thingsboard.server.dao.tenant.TenantProfileService; import org.thingsboard.server.dao.tenant.TenantService; -import org.thingsboard.server.dao.timeseries.TimeseriesService; -import org.thingsboard.server.dao.usagerecord.ApiUsageStateService; -import org.thingsboard.server.dao.user.UserService; -import org.thingsboard.server.dao.widget.WidgetTypeService; -import org.thingsboard.server.dao.widget.WidgetsBundleService; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Comparator; import java.util.HashMap; import java.util.Map; +import java.util.UUID; import static org.junit.Assert.assertNotNull; @@ -103,6 +78,18 @@ public abstract class AbstractServiceTest { @Autowired protected TenantService tenantService; + protected TenantId tenantId; + + @Before + public void beforeAbstractService() { + tenantId = createTenant(); + } + + @After + public void afterAbstractService() { + tenantService.deleteTenants(); + } + public class IdComparator implements Comparator { @Override public int compare(D o1, D o2) { @@ -187,7 +174,7 @@ public abstract class AbstractServiceTest { public TenantId createTenant() { Tenant tenant = new Tenant(); - tenant.setTitle("My tenant " + Uuids.timeBased()); + tenant.setTitle("My tenant " + UUID.randomUUID()); Tenant savedTenant = tenantService.saveTenant(tenant); assertNotNull(savedTenant); return savedTenant.getId(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java index 8448650dcf..1144ec6513 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java @@ -23,14 +23,12 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils; import org.thingsboard.common.util.JacksonUtil; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmComment; import org.thingsboard.server.common.data.alarm.AlarmCommentInfo; import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.id.AssetId; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; @@ -54,18 +52,11 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest { UserService userService; public static final String TEST_ALARM = "TEST_ALARM"; - private TenantId tenantId; private Alarm alarm; private User user; @Before public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - alarm = Alarm.builder().tenantId(tenantId).originator(new AssetId(Uuids.timeBased())) .type(TEST_ALARM) .severity(AlarmSeverity.CRITICAL) @@ -84,7 +75,6 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest { @After public void after() { alarmService.deleteAlarm(tenantId, alarm.getId()); - tenantService.deleteTenant(tenantId); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java index f914bc63f7..73a489ab68 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java @@ -16,15 +16,12 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmCreateOrUpdateActiveRequest; @@ -37,7 +34,6 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.alarm.AlarmUpdateRequest; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.SortOrder; import org.thingsboard.server.common.data.page.TimePageLink; @@ -84,23 +80,6 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest { private static final String TEST_TENANT_FIRST_NAME = "testtenantfirstname"; private static final String TEST_TENANT_LAST_NAME = "testtenantlastname"; - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - - @Test public void testSaveAndFetchAlarm() throws ExecutionException, InterruptedException { AssetId parentId = new AssetId(Uuids.timeBased()); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java index 2c325654a1..2ee2f74b3e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java @@ -15,15 +15,11 @@ */ package org.thingsboard.server.dao.service; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.ApiUsageStateValue; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.ApiUsageState; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.usagerecord.ApiUsageStateService; @@ -32,22 +28,6 @@ public abstract class BaseApiUsageStateServiceTest extends AbstractServiceTest { @Autowired ApiUsageStateService apiUsageStateService; - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testFindApiUsageStateByTenantId() { ApiUsageState apiUsageState = apiUsageStateService.findTenantApiUsageState(tenantId); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java index 90f68b0207..df0cb464fc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java @@ -19,18 +19,14 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.common.util.ThingsBoardThreadFactory; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.asset.AssetProfile; import org.thingsboard.server.common.data.asset.AssetProfileInfo; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.asset.AssetProfileService; @@ -54,22 +50,6 @@ public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest { @Autowired AssetService assetService; - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveAssetProfile() { AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java index ab81764015..9f4c8fe363 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java @@ -16,9 +16,7 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; @@ -51,22 +49,6 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveAsset() { Asset asset = new Asset(); @@ -228,12 +210,6 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest { @Test public void testFindAssetsByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List assets = new ArrayList<>(); for (int i=0;i<178;i++) { Asset asset = new Asset(); @@ -265,8 +241,6 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest { pageData = assetService.findAssetsByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test @@ -427,12 +401,6 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest { @Test public void testFindAssetsByTenantIdAndCustomerId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -471,8 +439,6 @@ public abstract class BaseAssetServiceTest extends AbstractServiceTest { pageData = assetService.findAssetInfosByTenantIdAndCustomerId(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java index 46a28cf36e..371d8abb99 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java @@ -51,24 +51,14 @@ public abstract class BaseCustomerServiceTest extends AbstractServiceTest { ListeningExecutorService executor; - private TenantId tenantId; - @Before public void before() { executor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(8, getClass())); - - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } + } @After public void after() { executor.shutdownNow(); - - tenantService.deleteTenant(tenantId); } @Test @@ -158,11 +148,6 @@ public abstract class BaseCustomerServiceTest extends AbstractServiceTest { @Test public void testFindCustomersByTenantId() throws Exception { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); List> futures = new ArrayList<>(135); for (int i = 0; i < 135; i++) { @@ -193,8 +178,6 @@ public abstract class BaseCustomerServiceTest extends AbstractServiceTest { pageData = customerService.findCustomersByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java index 9305e55450..7ccd5e6211 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java @@ -16,9 +16,7 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; @@ -56,22 +54,6 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveDashboard() throws IOException { Dashboard dashboard = new Dashboard(); @@ -187,12 +169,6 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { @Test public void testFindDashboardsByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List dashboards = new ArrayList<>(); for (int i=0;i<165;i++) { Dashboard dashboard = new Dashboard(); @@ -223,18 +199,10 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test public void testFindMobileDashboardsByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List mobileDashboards = new ArrayList<>(); for (int i=0;i<165;i++) { Dashboard dashboard = new Dashboard(); @@ -283,8 +251,6 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { pageData = dashboardService.findMobileDashboardsByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test @@ -364,12 +330,6 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { @Test public void testFindDashboardsByTenantIdAndCustomerId() throws ExecutionException, InterruptedException { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -407,8 +367,6 @@ public abstract class BaseDashboardServiceTest extends AbstractServiceTest { pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java index e06c55b5d6..4512a5fa4f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java @@ -16,17 +16,13 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.Device; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.DeviceCredentialsId; import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.device.DeviceCredentialsService; @@ -40,22 +36,6 @@ public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTe @Autowired DeviceService deviceService; - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testCreateDeviceCredentials() { DeviceCredentials deviceCredentials = new DeviceCredentials(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java index bb2caa41fd..cdfa73fac9 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java @@ -19,9 +19,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.junit.jupiter.api.Assertions; @@ -32,9 +30,7 @@ import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.DeviceProfileInfo; import org.thingsboard.server.common.data.DeviceTransportType; import org.thingsboard.server.common.data.OtaPackage; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.ota.ChecksumAlgorithm; -import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.device.DeviceProfileService; @@ -48,7 +44,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; @@ -66,22 +61,6 @@ public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator deviceProfileInfoIdComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveDeviceProfile() { DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java index 0fdefa7e16..ddd3553194 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java @@ -73,13 +73,10 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest { TenantProfileService tenantProfileService; private IdComparator idComparator = new IdComparator<>(); - - private TenantId tenantId; private TenantId anotherTenantId; @Before public void before() { - tenantId = createTenant(); anotherTenantId = createTenant(); } @@ -409,12 +406,6 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest { @Test public void testFindDevicesByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List devices = new ArrayList<>(); for (int i = 0; i < 178; i++) { Device device = new Device(); @@ -446,8 +437,6 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest { pageData = deviceService.findDevicesByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test @@ -608,12 +597,6 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest { @Test public void testFindDevicesByTenantIdAndCustomerId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -652,8 +635,6 @@ public abstract class BaseDeviceServiceTest extends AbstractServiceTest { pageData = deviceService.findDeviceInfosByTenantIdAndCustomerId(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java index 7ed318f58f..9b307b2f8c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java @@ -17,9 +17,7 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; @@ -60,22 +58,6 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveEdge() { Edge edge = constructEdge("My edge", "default"); @@ -215,12 +197,6 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest { @Test public void testFindEdgesByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List edges = new ArrayList<>(); for (int i = 0; i < 178; i++) { Edge edge = constructEdge(tenantId, "Edge " + i, "default"); @@ -249,8 +225,6 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest { pageData = edgeService.findEdgesByTenantId(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test @@ -399,12 +373,6 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest { @Test public void testFindEdgesByTenantIdAndCustomerId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -440,8 +408,6 @@ public abstract class BaseEdgeServiceTest extends AbstractServiceTest { pageData = edgeService.findEdgesByTenantIdAndCustomerId(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test 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 75dc250e63..1af63c0ed7 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 @@ -21,9 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; import org.hamcrest.Matchers; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.ResultSetExtractor; @@ -31,7 +29,6 @@ import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.StringUtils; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.id.CustomerId; @@ -121,24 +118,6 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @Autowired TimeseriesService timeseriesService; - private TenantId tenantId; - - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - - @Test public void testCountEntitiesByQuery() throws InterruptedException { List devices = new ArrayList<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java index 22396e25a9..0458a09e31 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java @@ -29,7 +29,6 @@ import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.OtaPackage; import org.thingsboard.server.common.data.OtaPackageInfo; import org.thingsboard.server.common.data.StringUtils; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.TenantProfile; import org.thingsboard.server.common.data.id.DeviceProfileId; import org.thingsboard.server.common.data.id.TenantId; @@ -65,8 +64,6 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { private final IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - private DeviceProfileId deviceProfileId; @Autowired @@ -80,12 +77,6 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { @Before public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - DeviceProfile deviceProfile = this.createDeviceProfile(tenantId, "Device Profile"); DeviceProfile savedDeviceProfile = deviceProfileService.saveDeviceProfile(deviceProfile); Assert.assertNotNull(savedDeviceProfile); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java index 3890aa257c..9d2c2bac5a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java @@ -91,7 +91,7 @@ public abstract class BaseQueueServiceTest extends AbstractServiceTest { Tenant tenant = new Tenant(); tenant.setTitle("My tenant"); - tenant.setTenantProfileId(tenantProfileId); + tenant.setTenantProfileId(tenantProfileId); //custom profile Tenant savedTenant = tenantService.saveTenant(tenant); Assert.assertNotNull(savedTenant); tenantId = savedTenant.getId(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java index e21138d25c..e3c5234942 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java @@ -17,9 +17,7 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; @@ -57,22 +55,6 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator ruleNodeIdComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveRuleChain() throws IOException { RuleChain ruleChain = new RuleChain(); @@ -141,12 +123,6 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @Test public void testFindRuleChainsByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - List ruleChains = new ArrayList<>(); for (int i = 0; i < 165; i++) { RuleChain ruleChain = new RuleChain(); @@ -177,8 +153,6 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.CORE, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - - tenantService.deleteTenant(tenantId); } @Test diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java index becb148b82..6d41da2965 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.service; import com.fasterxml.jackson.databind.node.NullNode; import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,14 @@ public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator tenantProfileInfoIdComparator = new IdComparator<>(); + @Before + public void before() { + //this test requires no Tenants in the database + tenantId = null; + tenantService.deleteTenants(); + tenantProfileService.deleteTenantProfiles(TenantId.SYS_TENANT_ID); + } + @After public void after() { tenantProfileService.deleteTenantProfiles(TenantId.SYS_TENANT_ID); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java index 00aac94585..938272c0a8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java @@ -177,6 +177,7 @@ public abstract class BaseTenantServiceTest extends AbstractServiceTest { @Test public void testFindTenants() { + tenantService.deleteTenants(); List tenants = new ArrayList<>(); PageLink pageLink = new PageLink(17); PageData pageData = tenantService.findTenants(pageLink); @@ -291,7 +292,7 @@ public abstract class BaseTenantServiceTest extends AbstractServiceTest { @Test public void testFindTenantInfos() { - + tenantService.deleteTenants(); List tenants = new ArrayList<>(); PageLink pageLink = new PageLink(17); PageData pageData = tenantService.findTenantInfos(pageLink); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java index 7698c2d129..14917f6807 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -51,17 +50,10 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; private UserSettings userSettings; @Before public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - User tenantAdmin = new User(); tenantAdmin.setAuthority(Authority.TENANT_ADMIN); tenantAdmin.setTenantId(tenantId); @@ -83,11 +75,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { userSettings = createUserSettings(customerUser.getId()); } - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testFindUserByEmail() { User user = userService.findUserByEmail(SYSTEM_TENANT_ID, "sysadmin@thingsboard.org"); @@ -217,17 +204,13 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { Assert.assertEquals(1, users.size()); Assert.assertEquals(tenantAdminUser, users.get(0)); - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); + TenantId secondTenantId = createTenant(); List tenantAdmins = new ArrayList<>(); for (int i = 0; i < 124; i++) { User user = new User(); user.setAuthority(Authority.TENANT_ADMIN); - user.setTenantId(tenantId); + user.setTenantId(secondTenantId); user.setEmail("testTenant" + i + "@thingsboard.org"); tenantAdmins.add(userService.saveUser(user)); } @@ -235,7 +218,7 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { List loadedTenantAdmins = new ArrayList<>(); PageLink pageLink = new PageLink(33); do { - pageData = userService.findTenantAdmins(tenantId, pageLink); + pageData = userService.findTenantAdmins(secondTenantId, pageLink); loadedTenantAdmins.addAll(pageData.getData()); if (pageData.hasNext()) { pageLink = pageLink.nextPageLink(); @@ -247,10 +230,10 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { Assert.assertEquals(tenantAdmins, loadedTenantAdmins); - tenantService.deleteTenant(tenantId); + tenantService.deleteTenant(secondTenantId); pageLink = new PageLink(33); - pageData = userService.findTenantAdmins(tenantId, pageLink); + pageData = userService.findTenantAdmins(secondTenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); @@ -258,12 +241,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { @Test public void testFindTenantAdminsByEmail() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - String email1 = "testEmail1"; List tenantAdminsEmail1 = new ArrayList<>(); @@ -340,8 +317,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { pageData = userService.findTenantAdmins(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - - tenantService.deleteTenant(tenantId); } @Test @@ -354,12 +329,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { Assert.assertEquals(1, users.size()); Assert.assertEquals(customerUser, users.get(0)); - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -402,12 +371,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { @Test public void testFindCustomerUsersByEmail() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); - Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); @@ -493,8 +456,6 @@ public abstract class BaseUserServiceTest extends AbstractServiceTest { pageData = userService.findCustomerUsers(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - - tenantService.deleteTenant(tenantId); } private UserSettings createUserSettings(UserId userId) { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java index ba5d149910..b04053f6d9 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java @@ -18,13 +18,10 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; @@ -48,22 +45,6 @@ public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveWidgetType() throws IOException { WidgetsBundle widgetsBundle = new WidgetsBundle(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java index dd1b92263b..8f04eaec62 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java @@ -16,13 +16,10 @@ package org.thingsboard.server.dao.service; import com.datastax.oss.driver.api.core.uuid.Uuids; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; -import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; @@ -43,22 +40,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); - private TenantId tenantId; - - @Before - public void before() { - Tenant tenant = new Tenant(); - tenant.setTitle("My tenant"); - Tenant savedTenant = tenantService.saveTenant(tenant); - Assert.assertNotNull(savedTenant); - tenantId = savedTenant.getId(); - } - - @After - public void after() { - tenantService.deleteTenant(tenantId); - } - @Test public void testSaveWidgetsBundle() throws IOException { WidgetsBundle widgetsBundle = new WidgetsBundle(); @@ -254,11 +235,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { @Test public void testFindTenantWidgetsBundlesByTenantId() { - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); List widgetsBundles = new ArrayList<>(); for (int i=0;i<127;i++) { @@ -291,7 +267,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - tenantService.deleteTenant(tenantId); } @Test @@ -299,11 +274,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { List systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles(tenantId); - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); TenantId systemTenantId = TenantId.fromUUID(ModelConstants.NULL_UUID); List createdWidgetsBundles = new ArrayList<>(); @@ -376,8 +346,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { Collections.sort(loadedWidgetsBundles, idComparator); Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles); - - tenantService.deleteTenant(tenantId); } @Test @@ -385,11 +353,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { List systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles(tenantId); - Tenant tenant = new Tenant(); - tenant.setTitle("Test tenant"); - tenant = tenantService.saveTenant(tenant); - - TenantId tenantId = tenant.getId(); TenantId systemTenantId = TenantId.fromUUID(ModelConstants.NULL_UUID); List createdWidgetsBundles = new ArrayList<>(); @@ -437,8 +400,6 @@ public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { Collections.sort(loadedWidgetsBundles, idComparator); Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles); - - tenantService.deleteTenant(tenantId); } }