From 93c219c83e0aa09e31af643669b611af3d544c19 Mon Sep 17 00:00:00 2001 From: AndriiD Date: Thu, 4 May 2023 16:08:55 +0300 Subject: [PATCH] renamed base controller/service tests --- ...{BaseAdminControllerTest.java => AdminControllerTest.java} | 2 +- ...entControllerTest.java => AlarmCommentControllerTest.java} | 4 ++-- ...{BaseAlarmControllerTest.java => AlarmControllerTest.java} | 4 ++-- ...{BaseAssetControllerTest.java => AssetControllerTest.java} | 4 ++-- ...ileControllerTest.java => AssetProfileControllerTest.java} | 4 ++-- ...uditLogControllerTest.java => AuditLogControllerTest.java} | 2 +- .../{BaseAuthControllerTest.java => AuthControllerTest.java} | 2 +- ...rollerTest.java => ComponentDescriptorControllerTest.java} | 2 +- ...ustomerControllerTest.java => CustomerControllerTest.java} | 4 ++-- ...hboardControllerTest.java => DashboardControllerTest.java} | 4 ++-- ...aseDeviceControllerTest.java => DeviceControllerTest.java} | 4 ++-- ...leControllerTest.java => DeviceProfileControllerTest.java} | 4 ++-- .../{BaseEdgeControllerTest.java => EdgeControllerTest.java} | 4 ++-- ...eEventControllerTest.java => EdgeEventControllerTest.java} | 2 +- ...ueryControllerTest.java => EntityQueryControllerTest.java} | 2 +- ...nControllerTest.java => EntityRelationControllerTest.java} | 2 +- ...yViewControllerTest.java => EntityViewControllerTest.java} | 4 ++-- .../{BaseHomePageApiTest.java => HomePageApiTest.java} | 2 +- ...ckageControllerTest.java => OtaPackageControllerTest.java} | 2 +- .../{BaseRpcControllerTest.java => RpcControllerTest.java} | 2 +- ...eChainControllerTest.java => RuleChainControllerTest.java} | 4 ++-- ...ourceControllerTest.java => TbResourceControllerTest.java} | 2 +- ...emetryControllerTest.java => TelemetryControllerTest.java} | 2 +- ...aseTenantControllerTest.java => TenantControllerTest.java} | 2 +- ...leControllerTest.java => TenantProfileControllerTest.java} | 2 +- .../{BaseUserControllerTest.java => UserControllerTest.java} | 4 ++-- .../{BaseWebsocketApiTest.java => WebsocketApiTest.java} | 2 +- ...tTypeControllerTest.java => WidgetTypeControllerTest.java} | 2 +- ...leControllerTest.java => WidgetsBundleControllerTest.java} | 2 +- .../edge/{BaseAlarmEdgeTest.java => AlarmEdgeTest.java} | 2 +- .../edge/{BaseAssetEdgeTest.java => AssetEdgeTest.java} | 2 +- ...aseAssetProfileEdgeTest.java => AssetProfileEdgeTest.java} | 2 +- .../edge/{BaseCustomerEdgeTest.java => CustomerEdgeTest.java} | 2 +- .../{BaseDashboardEdgeTest.java => DashboardEdgeTest.java} | 2 +- .../edge/{BaseDeviceEdgeTest.java => DeviceEdgeTest.java} | 2 +- ...eDeviceProfileEdgeTest.java => DeviceProfileEdgeTest.java} | 2 +- .../server/edge/{BaseEdgeTest.java => EdgeTest.java} | 2 +- .../{BaseEntityViewEdgeTest.java => EntityViewEdgeTest.java} | 2 +- .../{BaseOtaPackageEdgeTest.java => OtaPackageEdgeTest.java} | 2 +- .../edge/{BaseQueueEdgeTest.java => QueueEdgeTest.java} | 2 +- .../edge/{BaseRelationEdgeTest.java => RelationEdgeTest.java} | 2 +- .../{BaseRuleChainEdgeTest.java => RuleChainEdgeTest.java} | 2 +- .../{BaseTelemetryEdgeTest.java => TelemetryEdgeTest.java} | 2 +- .../server/edge/{BaseUserEdgeTest.java => UserEdgeTest.java} | 2 +- .../edge/{BaseWidgetEdgeTest.java => WidgetEdgeTest.java} | 2 +- ...SettingsServiceTest.java => AdminSettingsServiceTest.java} | 2 +- ...rmCommentServiceTest.java => AlarmCommentServiceTest.java} | 2 +- .../{BaseAlarmServiceTest.java => AlarmServiceTest.java} | 2 +- ...ageStateServiceTest.java => ApiUsageStateServiceTest.java} | 2 +- ...etProfileServiceTest.java => AssetProfileServiceTest.java} | 2 +- .../{BaseAssetServiceTest.java => AssetServiceTest.java} | 2 +- ...{BaseCustomerServiceTest.java => CustomerServiceTest.java} | 2 +- ...aseDashboardServiceTest.java => DashboardServiceTest.java} | 2 +- ...dentialsCacheTest.java => DeviceCredentialsCacheTest.java} | 2 +- ...ialsServiceTest.java => DeviceCredentialsServiceTest.java} | 2 +- ...eProfileServiceTest.java => DeviceProfileServiceTest.java} | 2 +- .../{BaseDeviceServiceTest.java => DeviceServiceTest.java} | 2 +- ...aseEdgeEventServiceTest.java => EdgeEventServiceTest.java} | 2 +- .../{BaseEdgeServiceTest.java => EdgeServiceTest.java} | 2 +- ...erviceRegistryTest.java => EntityServiceRegistryTest.java} | 2 +- .../{BaseEntityServiceTest.java => EntityServiceTest.java} | 2 +- ...eServiceTest.java => OAuth2ConfigTemplateServiceTest.java} | 2 +- .../{BaseOAuth2ServiceTest.java => OAuth2ServiceTest.java} | 2 +- ...eOtaPackageServiceTest.java => OtaPackageServiceTest.java} | 2 +- .../{BaseQueueServiceTest.java => QueueServiceTest.java} | 2 +- .../{BaseRelationCacheTest.java => RelationCacheTest.java} | 2 +- ...{BaseRelationServiceTest.java => RelationServiceTest.java} | 2 +- ...aseRuleChainServiceTest.java => RuleChainServiceTest.java} | 2 +- ...tProfileServiceTest.java => TenantProfileServiceTest.java} | 2 +- .../{BaseTenantServiceTest.java => TenantServiceTest.java} | 4 ++-- .../{BaseUserServiceTest.java => UserServiceTest.java} | 2 +- ...eWidgetTypeServiceTest.java => WidgetTypeServiceTest.java} | 2 +- ...tsBundleServiceTest.java => WidgetsBundleServiceTest.java} | 2 +- .../thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java | 4 ++-- 74 files changed, 88 insertions(+), 88 deletions(-) rename application/src/test/java/org/thingsboard/server/controller/{BaseAdminControllerTest.java => AdminControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAlarmCommentControllerTest.java => AlarmCommentControllerTest.java} (98%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAlarmControllerTest.java => AlarmControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAssetControllerTest.java => AssetControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAssetProfileControllerTest.java => AssetProfileControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAuditLogControllerTest.java => AuditLogControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseAuthControllerTest.java => AuthControllerTest.java} (97%) rename application/src/test/java/org/thingsboard/server/controller/{BaseComponentDescriptorControllerTest.java => ComponentDescriptorControllerTest.java} (97%) rename application/src/test/java/org/thingsboard/server/controller/{BaseCustomerControllerTest.java => CustomerControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseDashboardControllerTest.java => DashboardControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseDeviceControllerTest.java => DeviceControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseDeviceProfileControllerTest.java => DeviceProfileControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseEdgeControllerTest.java => EdgeControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseEdgeEventControllerTest.java => EdgeEventControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseEntityQueryControllerTest.java => EntityQueryControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseEntityRelationControllerTest.java => EntityRelationControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseEntityViewControllerTest.java => EntityViewControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseHomePageApiTest.java => HomePageApiTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseOtaPackageControllerTest.java => OtaPackageControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseRpcControllerTest.java => RpcControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseRuleChainControllerTest.java => RuleChainControllerTest.java} (98%) rename application/src/test/java/org/thingsboard/server/controller/{BaseTbResourceControllerTest.java => TbResourceControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseTelemetryControllerTest.java => TelemetryControllerTest.java} (97%) rename application/src/test/java/org/thingsboard/server/controller/{BaseTenantControllerTest.java => TenantControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseTenantProfileControllerTest.java => TenantProfileControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseUserControllerTest.java => UserControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseWebsocketApiTest.java => WebsocketApiTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseWidgetTypeControllerTest.java => WidgetTypeControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/controller/{BaseWidgetsBundleControllerTest.java => WidgetsBundleControllerTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseAlarmEdgeTest.java => AlarmEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseAssetEdgeTest.java => AssetEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseAssetProfileEdgeTest.java => AssetProfileEdgeTest.java} (98%) rename application/src/test/java/org/thingsboard/server/edge/{BaseCustomerEdgeTest.java => CustomerEdgeTest.java} (98%) rename application/src/test/java/org/thingsboard/server/edge/{BaseDashboardEdgeTest.java => DashboardEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseDeviceEdgeTest.java => DeviceEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseDeviceProfileEdgeTest.java => DeviceProfileEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseEdgeTest.java => EdgeTest.java} (98%) rename application/src/test/java/org/thingsboard/server/edge/{BaseEntityViewEdgeTest.java => EntityViewEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseOtaPackageEdgeTest.java => OtaPackageEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseQueueEdgeTest.java => QueueEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseRelationEdgeTest.java => RelationEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseRuleChainEdgeTest.java => RuleChainEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseTelemetryEdgeTest.java => TelemetryEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseUserEdgeTest.java => UserEdgeTest.java} (99%) rename application/src/test/java/org/thingsboard/server/edge/{BaseWidgetEdgeTest.java => WidgetEdgeTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseAdminSettingsServiceTest.java => AdminSettingsServiceTest.java} (98%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseAlarmCommentServiceTest.java => AlarmCommentServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseAlarmServiceTest.java => AlarmServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseApiUsageStateServiceTest.java => ApiUsageStateServiceTest.java} (96%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseAssetProfileServiceTest.java => AssetProfileServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseAssetServiceTest.java => AssetServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseCustomerServiceTest.java => CustomerServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseDashboardServiceTest.java => DashboardServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseDeviceCredentialsCacheTest.java => DeviceCredentialsCacheTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseDeviceCredentialsServiceTest.java => DeviceCredentialsServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseDeviceProfileServiceTest.java => DeviceProfileServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseDeviceServiceTest.java => DeviceServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseEdgeEventServiceTest.java => EdgeEventServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseEdgeServiceTest.java => EdgeServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseEntityServiceRegistryTest.java => EntityServiceRegistryTest.java} (96%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseEntityServiceTest.java => EntityServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseOAuth2ConfigTemplateServiceTest.java => OAuth2ConfigTemplateServiceTest.java} (98%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseOAuth2ServiceTest.java => OAuth2ServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseOtaPackageServiceTest.java => OtaPackageServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseQueueServiceTest.java => QueueServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseRelationCacheTest.java => RelationCacheTest.java} (98%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseRelationServiceTest.java => RelationServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseRuleChainServiceTest.java => RuleChainServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseTenantProfileServiceTest.java => TenantProfileServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseTenantServiceTest.java => TenantServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseUserServiceTest.java => UserServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseWidgetTypeServiceTest.java => WidgetTypeServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{BaseWidgetsBundleServiceTest.java => WidgetsBundleServiceTest.java} (99%) diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java index 19ccf16779..dd15c60168 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java @@ -41,7 +41,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @DaoSqlTest -public class BaseAdminControllerTest extends AbstractControllerTest { +public class AdminControllerTest extends AbstractControllerTest { final JwtSettings defaultJwtSettings = new JwtSettings(9000, 604800, "thingsboard.io", "thingsboardDefaultSigningKey"); @Test diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java index 190621f19a..287ae7cfe1 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java @@ -49,9 +49,9 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -@ContextConfiguration(classes = {BaseAlarmCommentControllerTest.Config.class}) +@ContextConfiguration(classes = {AlarmCommentControllerTest.Config.class}) @DaoSqlTest -public class BaseAlarmCommentControllerTest extends AbstractControllerTest { +public class AlarmCommentControllerTest extends AbstractControllerTest { protected Device customerDevice; protected Alarm alarm; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java index 184dd3345f..05030f0091 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AlarmControllerTest.java @@ -49,9 +49,9 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -@ContextConfiguration(classes = {BaseAlarmControllerTest.Config.class}) +@ContextConfiguration(classes = {AlarmControllerTest.Config.class}) @DaoSqlTest -public class BaseAlarmControllerTest extends AbstractControllerTest { +public class AlarmControllerTest extends AbstractControllerTest { public static final String TEST_ALARM_TYPE = "Test"; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java index 4fd9624eaa..40b1707271 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java @@ -57,9 +57,9 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -@ContextConfiguration(classes = {BaseAssetControllerTest.Config.class}) +@ContextConfiguration(classes = {AssetControllerTest.Config.class}) @DaoSqlTest -public class BaseAssetControllerTest extends AbstractControllerTest { +public class AssetControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAssetProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseAssetProfileControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java index 7cd9f18e18..c84b058cc7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAssetProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java @@ -52,9 +52,9 @@ import java.util.stream.Collectors; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@ContextConfiguration(classes = {BaseAssetProfileControllerTest.Config.class}) +@ContextConfiguration(classes = {AssetProfileControllerTest.Config.class}) @DaoSqlTest -public class BaseAssetProfileControllerTest extends AbstractControllerTest { +public class AssetProfileControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator assetProfileInfoIdComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAuditLogControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseAuditLogControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java index 6de6a2fd34..a36a33bc6f 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAuditLogControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java @@ -52,7 +52,7 @@ import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseAuditLogControllerTest extends AbstractControllerTest { +public class AuditLogControllerTest extends AbstractControllerTest { private Tenant savedTenant; private User tenantAdmin; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java index 1fe4defaf0..b833e45d34 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java @@ -26,7 +26,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseAuthControllerTest extends AbstractControllerTest { +public class AuthControllerTest extends AbstractControllerTest { @Test public void testGetUser() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java index e742306811..cce4261e14 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/ComponentDescriptorControllerTest.java @@ -35,7 +35,7 @@ import java.util.List; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseComponentDescriptorControllerTest extends AbstractControllerTest { +public class ComponentDescriptorControllerTest extends AbstractControllerTest { private static final int AMOUNT_OF_DEFAULT_FILTER_NODES = 4; private Tenant savedTenant; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java index ec99b57e62..125e533471 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java @@ -54,9 +54,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@ContextConfiguration(classes = {BaseCustomerControllerTest.Config.class}) +@ContextConfiguration(classes = {CustomerControllerTest.Config.class}) @DaoSqlTest -public class BaseCustomerControllerTest extends AbstractControllerTest { +public class CustomerControllerTest extends AbstractControllerTest { static final TypeReference> PAGE_DATA_CUSTOMER_TYPE_REFERENCE = new TypeReference<>() { }; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java index f40fac0f65..9f8e63e3b0 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java @@ -52,9 +52,9 @@ import java.util.List; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@ContextConfiguration(classes = {BaseDashboardControllerTest.Config.class}) +@ContextConfiguration(classes = {DashboardControllerTest.Config.class}) @DaoSqlTest -public class BaseDashboardControllerTest extends AbstractControllerTest { +public class DashboardControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java index 5fa3e2cefe..11d11eccdd 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java @@ -85,9 +85,9 @@ import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -@ContextConfiguration(classes = {BaseDeviceControllerTest.Config.class}) +@ContextConfiguration(classes = {DeviceControllerTest.Config.class}) @DaoSqlTest -public class BaseDeviceControllerTest extends AbstractControllerTest { +public class DeviceControllerTest extends AbstractControllerTest { static final TypeReference> PAGE_DATA_DEVICE_TYPE_REF = new TypeReference<>() { }; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java index b50da8ce3e..d2bcfe2b88 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java @@ -63,9 +63,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE; -@ContextConfiguration(classes = {BaseDeviceProfileControllerTest.Config.class}) +@ContextConfiguration(classes = {DeviceProfileControllerTest.Config.class}) @DaoSqlTest -public class BaseDeviceProfileControllerTest extends AbstractControllerTest { +public class DeviceProfileControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator deviceProfileInfoIdComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java index d689be1996..c8a20a38f5 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java @@ -78,9 +78,9 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @TestPropertySource(properties = { "edges.enabled=true", }) -@ContextConfiguration(classes = {BaseEdgeControllerTest.Config.class}) +@ContextConfiguration(classes = {EdgeControllerTest.Config.class}) @DaoSqlTest -public class BaseEdgeControllerTest extends AbstractControllerTest { +public class EdgeControllerTest extends AbstractControllerTest { public static final String EDGE_HOST = "localhost"; public static final int EDGE_PORT = 7070; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java index 4c1551d8c0..255aa2bdf1 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java @@ -61,7 +61,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. }) @Slf4j @DaoSqlTest -public class BaseEdgeEventControllerTest extends AbstractControllerTest { +public class EdgeEventControllerTest extends AbstractControllerTest { private Tenant savedTenant; private User tenantAdmin; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java index 3107b085c7..2aa10992ed 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java @@ -64,7 +64,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseEntityQueryControllerTest extends AbstractControllerTest { +public class EntityQueryControllerTest extends AbstractControllerTest { private Tenant savedTenant; private User tenantAdmin; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java index 0a8ef4d063..d686be6f27 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EntityRelationControllerTest.java @@ -52,7 +52,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @DaoSqlTest -public class BaseEntityRelationControllerTest extends AbstractControllerTest { +public class EntityRelationControllerTest extends AbstractControllerTest { public static final String BASE_DEVICE_NAME = "Test dummy device"; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java index 78bc69e851..a65769f3f1 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java @@ -90,9 +90,9 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; "js.evaluator=mock", }) @Slf4j -@ContextConfiguration(classes = {BaseEntityViewControllerTest.Config.class}) +@ContextConfiguration(classes = {EntityViewControllerTest.Config.class}) @DaoSqlTest -public class BaseEntityViewControllerTest extends AbstractControllerTest { +public class EntityViewControllerTest extends AbstractControllerTest { static final TypeReference> PAGE_DATA_ENTITY_VIEW_TYPE_REF = new TypeReference<>() { }; static final TypeReference> PAGE_DATA_ENTITY_VIEW_INFO_TYPE_REF = new TypeReference<>() { diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java rename to application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java index 560e927e8c..c601be7272 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java @@ -75,7 +75,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @DaoSqlTest -public class BaseHomePageApiTest extends AbstractControllerTest { +public class HomePageApiTest extends AbstractControllerTest { @Autowired private TbApiUsageStateClient apiUsageStateClient; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java index 0250f1f122..f4472e83be 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java @@ -50,7 +50,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; @DaoSqlTest -public class BaseOtaPackageControllerTest extends AbstractControllerTest { +public class OtaPackageControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java index cea5aa6bfc..c060a7da96 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/RpcControllerTest.java @@ -38,7 +38,7 @@ import java.util.List; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseRpcControllerTest extends AbstractControllerTest { +public class RpcControllerTest extends AbstractControllerTest { private Tenant savedTenant; private User tenantAdmin; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java index 0cfae553de..16a266e485 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java @@ -54,9 +54,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@ContextConfiguration(classes = {BaseRuleChainControllerTest.Config.class}) +@ContextConfiguration(classes = {RuleChainControllerTest.Config.class}) @DaoSqlTest -public class BaseRuleChainControllerTest extends AbstractControllerTest { +public class RuleChainControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java index 168f05dd7c..de8f717c0d 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseTbResourceControllerTest extends AbstractControllerTest { +public class TbResourceControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseTelemetryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/controller/BaseTelemetryControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java index 34fcce83fc..47cac1b549 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTelemetryControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java @@ -25,7 +25,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseTelemetryControllerTest extends AbstractControllerTest { +public class TelemetryControllerTest extends AbstractControllerTest { @Test public void testConstraintValidator() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java index c8d762bdc3..a5b86fff85 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java @@ -71,7 +71,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. }) @Slf4j @DaoSqlTest -public class BaseTenantControllerTest extends AbstractControllerTest { +public class TenantControllerTest extends AbstractControllerTest { static final TypeReference> PAGE_DATA_TENANT_TYPE_REF = new TypeReference<>() { }; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java index db8fa296e7..e6b37143ad 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java @@ -49,7 +49,7 @@ import static org.mockito.Mockito.times; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseTenantProfileControllerTest extends AbstractControllerTest { +public class TenantProfileControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator tenantProfileInfoIdComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java index ca25df59ff..aebc33ec34 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java @@ -67,9 +67,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.thingsboard.server.dao.model.ModelConstants.SYSTEM_TENANT; -@ContextConfiguration(classes = {BaseUserControllerTest.Config.class}) +@ContextConfiguration(classes = {UserControllerTest.Config.class}) @DaoSqlTest -public class BaseUserControllerTest extends AbstractControllerTest { +public class UserControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator userDataIdComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java rename to application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java index 55b56036b7..88dc8f1da0 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java @@ -75,7 +75,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @DaoSqlTest -public class BaseWebsocketApiTest extends AbstractControllerTest { +public class WebsocketApiTest extends AbstractControllerTest { @Autowired private TelemetrySubscriptionService tsService; diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetTypeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseWidgetTypeControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java index 141e227eec..25e9027e4b 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetTypeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/WidgetTypeControllerTest.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseWidgetTypeControllerTest extends AbstractControllerTest { +public class WidgetTypeControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java rename to application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java index 0fc325f12f..ae96ee74a9 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java @@ -42,7 +42,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.dao.model.ModelConstants.SYSTEM_TENANT; @DaoSqlTest -public class BaseWidgetsBundleControllerTest extends AbstractControllerTest { +public class WidgetsBundleControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AlarmEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/AlarmEdgeTest.java index ae01ef1783..afccc634ed 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/AlarmEdgeTest.java @@ -41,7 +41,7 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseAlarmEdgeTest extends AbstractEdgeTest { +public class AlarmEdgeTest extends AbstractEdgeTest { @Test public void testSendAlarmToCloud() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AssetEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/AssetEdgeTest.java index 36cd482980..2f5848ece6 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/AssetEdgeTest.java @@ -34,7 +34,7 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseAssetEdgeTest extends AbstractEdgeTest { +public class AssetEdgeTest extends AbstractEdgeTest { @Test public void testAssets() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAssetProfileEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AssetProfileEdgeTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/edge/BaseAssetProfileEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/AssetProfileEdgeTest.java index b5c22ade5d..fd36c11db8 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAssetProfileEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/AssetProfileEdgeTest.java @@ -30,7 +30,7 @@ import java.nio.charset.StandardCharsets; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseAssetProfileEdgeTest extends AbstractEdgeTest { +public class AssetProfileEdgeTest extends AbstractEdgeTest { @Test public void testAssetProfiles() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseCustomerEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/CustomerEdgeTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/edge/BaseCustomerEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/CustomerEdgeTest.java index 32363b6b96..b9bf41fde6 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseCustomerEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/CustomerEdgeTest.java @@ -30,7 +30,7 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseCustomerEdgeTest extends AbstractEdgeTest { +public class CustomerEdgeTest extends AbstractEdgeTest { @Test public void testCreateUpdateDeleteCustomer() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseDashboardEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DashboardEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseDashboardEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/DashboardEdgeTest.java index 464dab1b77..988d6fdc98 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDashboardEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/DashboardEdgeTest.java @@ -33,7 +33,7 @@ import java.util.Set; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseDashboardEdgeTest extends AbstractEdgeTest { +public class DashboardEdgeTest extends AbstractEdgeTest { @Test public void testDashboards() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java index 095df1d843..2fa0ee321e 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java @@ -81,7 +81,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. "transport.mqtt.enabled=true" }) @DaoSqlTest -public class BaseDeviceEdgeTest extends AbstractEdgeTest { +public class DeviceEdgeTest extends AbstractEdgeTest { @Test public void testDevices() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceProfileEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseDeviceProfileEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java index b6bc94b43e..9d4cc0ca15 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceProfileEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java @@ -56,7 +56,7 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseDeviceProfileEdgeTest extends AbstractEdgeTest { +public class DeviceProfileEdgeTest extends AbstractEdgeTest { @Test public void testDeviceProfiles() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/EdgeTest.java similarity index 98% rename from application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/EdgeTest.java index 866b66d905..1f205af53a 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/EdgeTest.java @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.UUID; @DaoSqlTest -public class BaseEdgeTest extends AbstractEdgeTest { +public class EdgeTest extends AbstractEdgeTest { @Test public void testEdge_assignToCustomer_unassignFromCustomer() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/EntityViewEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/EntityViewEdgeTest.java index faf24df9ae..234a9473fa 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/EntityViewEdgeTest.java @@ -36,7 +36,7 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseEntityViewEdgeTest extends AbstractEdgeTest { +public class EntityViewEdgeTest extends AbstractEdgeTest { @Test public void testEntityViews() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseOtaPackageEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/OtaPackageEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseOtaPackageEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/OtaPackageEdgeTest.java index 7c9db884eb..5525d63f41 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseOtaPackageEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/OtaPackageEdgeTest.java @@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; @DaoSqlTest -public class BaseOtaPackageEdgeTest extends AbstractEdgeTest { +public class OtaPackageEdgeTest extends AbstractEdgeTest { @Test public void testOtaPackages_usesUrl() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseQueueEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/QueueEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseQueueEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/QueueEdgeTest.java index a870323b85..32e8e7f222 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseQueueEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/QueueEdgeTest.java @@ -31,7 +31,7 @@ import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseQueueEdgeTest extends AbstractEdgeTest { +public class QueueEdgeTest extends AbstractEdgeTest { @Test public void testQueues() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/RelationEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/RelationEdgeTest.java index 8fa3bbf870..04e6f3a3fb 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/RelationEdgeTest.java @@ -35,7 +35,7 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseRelationEdgeTest extends AbstractEdgeTest { +public class RelationEdgeTest extends AbstractEdgeTest { @Test diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseRuleChainEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseRuleChainEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java index 6b70adf504..6dec81e2e4 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseRuleChainEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/RuleChainEdgeTest.java @@ -39,7 +39,7 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseRuleChainEdgeTest extends AbstractEdgeTest { +public class RuleChainEdgeTest extends AbstractEdgeTest { @Test public void testRuleChains() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseTelemetryEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseTelemetryEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java index 7af6fea023..448915c10d 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseTelemetryEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; @DaoSqlTest -public class BaseTelemetryEdgeTest extends AbstractEdgeTest { +public class TelemetryEdgeTest extends AbstractEdgeTest { @Test public void testTimeseriesWithFailures() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java index c85d35e5a7..f376f50ac5 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java @@ -37,7 +37,7 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseUserEdgeTest extends AbstractEdgeTest { +public class UserEdgeTest extends AbstractEdgeTest { @Autowired private BCryptPasswordEncoder passwordEncoder; diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/WidgetEdgeTest.java similarity index 99% rename from application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java rename to application/src/test/java/org/thingsboard/server/edge/WidgetEdgeTest.java index fdc201907f..ba25d50f87 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/WidgetEdgeTest.java @@ -30,7 +30,7 @@ import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @DaoSqlTest -public class BaseWidgetEdgeTest extends AbstractEdgeTest { +public class WidgetEdgeTest extends AbstractEdgeTest { @Test public void testWidgetsBundleAndWidgetType() throws Exception { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java index 263dc2aa44..91675213ea 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @DaoSqlTest -public class BaseAdminSettingsServiceTest extends AbstractServiceTest { +public class AdminSettingsServiceTest extends AbstractServiceTest { @Autowired AdminSettingsService adminSettingsService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java index 26b4e3ac43..22257242f5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java @@ -44,7 +44,7 @@ import java.util.concurrent.ExecutionException; import static org.thingsboard.server.common.data.alarm.AlarmCommentType.OTHER; @DaoSqlTest -public class BaseAlarmCommentServiceTest extends AbstractServiceTest { +public class AlarmCommentServiceTest extends AbstractServiceTest { @Autowired AlarmService alarmService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java index c4e3a45e27..5b0981b44a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java @@ -63,7 +63,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; @DaoSqlTest -public class BaseAlarmServiceTest extends AbstractServiceTest { +public class AlarmServiceTest extends AbstractServiceTest { @Autowired AlarmService alarmService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/ApiUsageStateServiceTest.java similarity index 96% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/ApiUsageStateServiceTest.java index b36cd027cb..1db42409d6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseApiUsageStateServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/ApiUsageStateServiceTest.java @@ -24,7 +24,7 @@ import org.thingsboard.server.dao.usagerecord.ApiUsageStateService; @DaoSqlTest -public class BaseApiUsageStateServiceTest extends AbstractServiceTest { +public class ApiUsageStateServiceTest extends AbstractServiceTest { @Autowired ApiUsageStateService apiUsageStateService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java index 9a625f2bcb..391c00fa49 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java @@ -41,7 +41,7 @@ import java.util.concurrent.Executors; import java.util.stream.Collectors; @DaoSqlTest -public class BaseAssetProfileServiceTest extends AbstractServiceTest { +public class AssetProfileServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); private IdComparator assetProfileInfoIdComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java index 676ee41a4b..eb6feee500 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAssetServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java @@ -41,7 +41,7 @@ import java.util.List; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @DaoSqlTest -public class BaseAssetServiceTest extends AbstractServiceTest { +public class AssetServiceTest extends AbstractServiceTest { @Autowired AssetService assetService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceTest.java index 15fc560224..3256d231ad 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceTest.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; @DaoSqlTest -public class BaseCustomerServiceTest extends AbstractServiceTest { +public class CustomerServiceTest extends AbstractServiceTest { @Autowired CustomerService customerService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java index 8377bcb883..4cc9962f60 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceTest.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; @DaoSqlTest -public class BaseDashboardServiceTest extends AbstractServiceTest { +public class DashboardServiceTest extends AbstractServiceTest { @Autowired CustomerService customerService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java index d61a09e106..44119af87a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @DaoSqlTest -public class BaseDeviceCredentialsCacheTest extends AbstractServiceTest { +public class DeviceCredentialsCacheTest extends AbstractServiceTest { private final String CREDENTIALS_ID_1 = StringUtils.randomAlphanumeric(20); private final String CREDENTIALS_ID_2 = StringUtils.randomAlphanumeric(20); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceTest.java index 993123782b..ad260977fd 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceTest.java @@ -30,7 +30,7 @@ import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.exception.DataValidationException; @DaoSqlTest -public class BaseDeviceCredentialsServiceTest extends AbstractServiceTest { +public class DeviceCredentialsServiceTest extends AbstractServiceTest { @Autowired DeviceCredentialsService deviceCredentialsService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java index b78d57caed..16a80e438d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; @DaoSqlTest -public class BaseDeviceProfileServiceTest extends AbstractServiceTest { +public class DeviceProfileServiceTest extends AbstractServiceTest { @Autowired DeviceProfileService deviceProfileService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java index 4fc69527c2..b35d97f730 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java @@ -58,7 +58,7 @@ import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @DaoSqlTest -public class BaseDeviceServiceTest extends AbstractServiceTest { +public class DeviceServiceTest extends AbstractServiceTest { @Autowired CustomerService customerService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeEventServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java index a47715895c..63958fe1e4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeEventServiceTest.java @@ -43,7 +43,7 @@ import java.util.List; import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT; @DaoSqlTest -public class BaseEdgeEventServiceTest extends AbstractServiceTest { +public class EdgeEventServiceTest extends AbstractServiceTest { @Autowired EdgeEventService edgeEventService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/EdgeServiceTest.java index d2c6ee137b..5e632a7816 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/EdgeServiceTest.java @@ -48,7 +48,7 @@ import java.util.List; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @DaoSqlTest -public class BaseEdgeServiceTest extends AbstractServiceTest { +public class EdgeServiceTest extends AbstractServiceTest { @Autowired CustomerService customerService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceRegistryTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceRegistryTest.java similarity index 96% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceRegistryTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceRegistryTest.java index ef64b37c8a..e46cc96201 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceRegistryTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceRegistryTest.java @@ -26,7 +26,7 @@ import org.thingsboard.server.dao.rule.RuleChainService; @Slf4j @DaoSqlTest -public class BaseEntityServiceRegistryTest extends AbstractServiceTest { +public class EntityServiceRegistryTest extends AbstractServiceTest { @Autowired EntityServiceRegistry entityServiceRegistry; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java index 04de6f129d..77f5e87020 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceTest.java @@ -98,7 +98,7 @@ import static org.junit.Assert.assertEquals; @Slf4j @DaoSqlTest -public class BaseEntityServiceTest extends AbstractServiceTest { +public class EntityServiceTest extends AbstractServiceTest { static final int ENTITY_COUNT = 5; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ConfigTemplateServiceTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ConfigTemplateServiceTest.java index 81bc6d4ce5..f5403f4d13 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ConfigTemplateServiceTest.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.UUID; @DaoSqlTest -public class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest { +public class OAuth2ConfigTemplateServiceTest extends AbstractServiceTest { @Autowired protected OAuth2ConfigTemplateService oAuth2ConfigTemplateService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java index d969213c93..86e4e2beed 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/OAuth2ServiceTest.java @@ -45,7 +45,7 @@ import java.util.UUID; import java.util.stream.Collectors; @DaoSqlTest -public class BaseOAuth2ServiceTest extends AbstractServiceTest { +public class OAuth2ServiceTest extends AbstractServiceTest { private static final OAuth2Info EMPTY_PARAMS = new OAuth2Info(false, Collections.emptyList()); @Autowired diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java index d3f5d6de06..85dc7cd7f0 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; @DaoSqlTest -public class BaseOtaPackageServiceTest extends AbstractServiceTest { +public class OtaPackageServiceTest extends AbstractServiceTest { public static final String TITLE = "My firmware"; private static final String FILE_NAME = "filename.txt"; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/QueueServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/QueueServiceTest.java index c97d8d5e8e..82144addd8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseQueueServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/QueueServiceTest.java @@ -44,7 +44,7 @@ import java.util.Collections; import java.util.List; @DaoSqlTest -public class BaseQueueServiceTest extends AbstractServiceTest { +public class QueueServiceTest extends AbstractServiceTest { @Autowired TenantProfileService tenantProfileService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RelationCacheTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/RelationCacheTest.java index cc1aee8184..b8bbfb4513 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/RelationCacheTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; import static org.thingsboard.server.common.data.CacheConstants.RELATIONS_CACHE; @DaoSqlTest -public class BaseRelationCacheTest extends AbstractServiceTest { +public class RelationCacheTest extends AbstractServiceTest { private static final EntityId ENTITY_ID_FROM = new DeviceId(UUID.randomUUID()); private static final EntityId ENTITY_ID_TO = new DeviceId(UUID.randomUUID()); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java index e313c63632..3bbb71306b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; @DaoSqlTest -public class BaseRelationServiceTest extends AbstractServiceTest { +public class RelationServiceTest extends AbstractServiceTest { @Autowired RelationService relationService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java index a8372293c1..9fafa1a258 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRuleChainServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/RuleChainServiceTest.java @@ -45,7 +45,7 @@ import java.util.List; * Created by igor on 3/13/18. */ @DaoSqlTest -public class BaseRuleChainServiceTest extends AbstractServiceTest { +public class RuleChainServiceTest extends AbstractServiceTest { @Autowired EdgeService edgeService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java index 24a6372389..51f8aabb57 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantProfileServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantProfileServiceTest.java @@ -46,7 +46,7 @@ import java.util.List; import java.util.stream.Collectors; @DaoSqlTest -public class BaseTenantProfileServiceTest extends AbstractServiceTest { +public class TenantProfileServiceTest extends AbstractServiceTest { @Autowired TenantProfileService tenantProfileService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java index 00dc0df19f..2c7674c81b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java @@ -83,7 +83,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; @DaoSqlTest -public class BaseTenantServiceTest extends AbstractServiceTest { +public class TenantServiceTest extends AbstractServiceTest { @SpyBean TenantDao tenantDao; @@ -617,7 +617,7 @@ public class BaseTenantServiceTest extends AbstractServiceTest { private OtaPackage createAndSaveOtaPackageFor(Tenant tenant, DeviceProfile deviceProfile) { return otaPackageService.saveOtaPackage( - BaseOtaPackageServiceTest.createFirmware( + OtaPackageServiceTest.createFirmware( tenant.getId(), "2", deviceProfile.getId()) ); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/UserServiceTest.java index c5409fcd4d..fcd57e5b3a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceTest.java @@ -41,7 +41,7 @@ import java.util.Collections; import java.util.List; @DaoSqlTest -public class BaseUserServiceTest extends AbstractServiceTest { +public class UserServiceTest extends AbstractServiceTest { @Autowired CustomerService customerService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceTest.java index e19a06eb56..a536e7969e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceTest.java @@ -37,7 +37,7 @@ import java.util.Collections; import java.util.List; @DaoSqlTest -public class BaseWidgetTypeServiceTest extends AbstractServiceTest { +public class WidgetTypeServiceTest extends AbstractServiceTest { @Autowired WidgetsBundleService widgetsBundleService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceTest.java index d6492c66f8..0f5c90b4a8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceTest.java @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; @DaoSqlTest -public class BaseWidgetsBundleServiceTest extends AbstractServiceTest { +public class WidgetsBundleServiceTest extends AbstractServiceTest { @Autowired WidgetsBundleService widgetsBundleService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java index faceaa4130..bbea9cbc6a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.service.AbstractServiceTest; -import org.thingsboard.server.dao.service.BaseTenantProfileServiceTest; +import org.thingsboard.server.dao.service.TenantProfileServiceTest; import org.thingsboard.server.dao.tenant.TenantDao; import org.thingsboard.server.dao.tenant.TenantProfileDao; @@ -54,7 +54,7 @@ public class JpaTenantDaoTest extends AbstractJpaDaoTest { @Before public void setUp() throws Exception { - tenantProfile = tenantProfileDao.save(TenantId.SYS_TENANT_ID, BaseTenantProfileServiceTest.createTenantProfile("default tenant profile")); + tenantProfile = tenantProfileDao.save(TenantId.SYS_TENANT_ID, TenantProfileServiceTest.createTenantProfile("default tenant profile")); assertThat(tenantProfile).as("tenant profile").isNotNull(); }