From 0e84fc1c6a9a8c5857183140d3584d1e884173fa Mon Sep 17 00:00:00 2001 From: AndriiD Date: Thu, 4 May 2023 12:35:53 +0300 Subject: [PATCH 1/2] removed redundant tests --- .../controller/BaseAdminControllerTest.java | 4 ++- .../BaseAlarmCommentControllerTest.java | 4 ++- .../controller/BaseAlarmControllerTest.java | 4 ++- .../controller/BaseAssetControllerTest.java | 4 ++- .../BaseAssetProfileControllerTest.java | 4 ++- .../BaseAuditLogControllerTest.java | 4 ++- .../controller/BaseAuthControllerTest.java | 4 ++- ...BaseComponentDescriptorControllerTest.java | 4 ++- .../BaseCustomerControllerTest.java | 4 ++- .../BaseDashboardControllerTest.java | 4 ++- .../controller/BaseDeviceControllerTest.java | 4 ++- .../BaseDeviceProfileControllerTest.java | 4 ++- .../controller/BaseEdgeControllerTest.java | 4 ++- .../BaseEdgeEventControllerTest.java | 4 ++- .../BaseEntityQueryControllerTest.java | 4 ++- .../BaseEntityRelationControllerTest.java | 4 ++- .../BaseEntityViewControllerTest.java | 4 ++- .../controller/BaseHomePageApiTest.java | 4 ++- .../BaseOtaPackageControllerTest.java | 4 ++- .../controller/BaseRpcControllerTest.java | 4 ++- .../BaseRuleChainControllerTest.java | 4 ++- .../BaseTbResourceControllerTest.java | 4 ++- .../BaseTelemetryControllerTest.java | 4 ++- .../controller/BaseTenantControllerTest.java | 4 ++- .../BaseTenantProfileControllerTest.java | 4 ++- .../controller/BaseUserControllerTest.java | 4 ++- .../controller/BaseWebsocketApiTest.java | 4 ++- .../BaseWidgetTypeControllerTest.java | 4 ++- .../BaseWidgetsBundleControllerTest.java | 4 ++- .../controller/TwoFactorAuthConfigTest.java | 4 ++- .../server/controller/TwoFactorAuthTest.java | 4 ++- .../sql/AdminControllerSqlTest.java | 26 ------------------- .../sql/AlarmCommentControllerSqlTest.java | 23 ---------------- .../sql/AlarmControllerSqlTest.java | 23 ---------------- .../sql/AssetControllerSqlTest.java | 26 ------------------- .../sql/AssetProfileControllerSqlTest.java | 23 ---------------- .../sql/AuditLogControllerSqlTest.java | 23 ---------------- .../controller/sql/AuthControllerSqlTest.java | 26 ------------------- .../ComponentDescriptorControllerSqlTest.java | 23 ---------------- .../sql/CustomerControllerSqlTest.java | 26 ------------------- .../sql/DashboardControllerSqlTest.java | 26 ------------------- .../sql/DeviceControllerSqlTest.java | 26 ------------------- .../sql/DeviceProfileControllerSqlTest.java | 23 ---------------- .../controller/sql/EdgeControllerSqlTest.java | 23 ---------------- .../sql/EdgeEventControllerSqlTest.java | 23 ---------------- .../sql/EntityQueryControllerSqlTest.java | 23 ---------------- .../sql/EntityRelationControllerSqlTest.java | 23 ---------------- .../sql/EntityViewControllerSqlTest.java | 26 ------------------- .../controller/sql/HomePageApiSqlTest.java | 23 ---------------- .../sql/OtaPackageControllerSqlTest.java | 23 ---------------- .../controller/sql/RpcControllerTest.java | 23 ---------------- .../sql/RuleChainControllerSqlTest.java | 23 ---------------- .../sql/TbResourceControllerSqlTest.java | 23 ---------------- .../sql/TelemetryControllerSqlTest.java | 23 ---------------- .../sql/TenantControllerSqlTest.java | 26 ------------------- .../sql/TenantProfileControllerSqlTest.java | 23 ---------------- .../sql/TwoFactorAuthConfigSqlTest.java | 23 ---------------- .../controller/sql/TwoFactorAuthSqlTest.java | 23 ---------------- .../controller/sql/UserControllerSqlTest.java | 26 ------------------- .../controller/sql/WebsocketApiSqlTest.java | 23 ---------------- .../sql/WidgetTypeControllerSqlTest.java | 26 ------------------- .../sql/WidgetsBundleControllerSqlTest.java | 26 ------------------- .../server/edge/BaseAlarmEdgeTest.java | 4 ++- .../server/edge/BaseAssetEdgeTest.java | 4 ++- .../server/edge/BaseAssetProfileEdgeTest.java | 4 ++- .../server/edge/BaseCustomerEdgeTest.java | 4 ++- .../server/edge/BaseDashboardEdgeTest.java | 4 ++- .../server/edge/BaseDeviceEdgeTest.java | 4 ++- .../edge/BaseDeviceProfileEdgeTest.java | 4 ++- .../thingsboard/server/edge/BaseEdgeTest.java | 4 ++- .../server/edge/BaseEntityViewEdgeTest.java | 4 ++- .../server/edge/BaseOtaPackageEdgeTest.java | 4 ++- .../server/edge/BaseQueueEdgeTest.java | 4 ++- .../server/edge/BaseRelationEdgeTest.java | 4 ++- .../server/edge/BaseRuleChainEdgeTest.java | 4 ++- .../server/edge/BaseTelemetryEdgeTest.java | 4 ++- .../server/edge/BaseUserEdgeTest.java | 4 ++- .../server/edge/BaseWidgetEdgeTest.java | 4 ++- .../server/edge/sql/AlarmEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/AssetEdgeSqlTest.java | 24 ----------------- .../edge/sql/AssetProfileEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/CustomerEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/DashboardEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/DeviceEdgeSqlTest.java | 24 ----------------- .../edge/sql/DeviceProfileEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/EdgeSqlTest.java | 24 ----------------- .../edge/sql/EntityViewEdgeSqlTest.java | 24 ----------------- .../edge/sql/OtaPackageEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/QueueEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/RelationEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/RuleChainEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/TelemetryEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/UserEdgeSqlTest.java | 24 ----------------- .../server/edge/sql/WidgetEdgeSqlTest.java | 24 ----------------- .../service/BaseAdminSettingsServiceTest.java | 3 ++- .../service/BaseAlarmCommentServiceTest.java | 3 ++- .../dao/service/BaseAlarmServiceTest.java | 3 ++- .../service/BaseApiUsageStateServiceTest.java | 3 ++- .../service/BaseAssetProfileServiceTest.java | 3 ++- .../dao/service/BaseAssetServiceTest.java | 3 ++- .../dao/service/BaseCustomerServiceTest.java | 3 ++- .../dao/service/BaseDashboardServiceTest.java | 3 ++- .../BaseDeviceCredentialsCacheTest.java | 3 ++- .../BaseDeviceCredentialsServiceTest.java | 3 ++- .../service/BaseDeviceProfileServiceTest.java | 3 ++- .../dao/service/BaseDeviceServiceTest.java | 3 ++- .../dao/service/BaseEdgeEventServiceTest.java | 3 ++- .../dao/service/BaseEdgeServiceTest.java | 3 ++- .../BaseEntityServiceRegistryTest.java | 3 ++- .../dao/service/BaseEntityServiceTest.java | 3 ++- .../BaseOAuth2ConfigTemplateServiceTest.java | 3 ++- .../dao/service/BaseOAuth2ServiceTest.java | 3 ++- .../service/BaseOtaPackageServiceTest.java | 3 ++- .../dao/service/BaseQueueServiceTest.java | 3 ++- .../dao/service/BaseRelationCacheTest.java | 3 ++- .../dao/service/BaseRelationServiceTest.java | 3 ++- .../dao/service/BaseRuleChainServiceTest.java | 3 ++- .../service/BaseTenantProfileServiceTest.java | 3 ++- .../dao/service/BaseTenantServiceTest.java | 3 ++- .../dao/service/BaseUserServiceTest.java | 3 ++- .../service/BaseWidgetTypeServiceTest.java | 3 ++- .../service/BaseWidgetsBundleServiceTest.java | 3 ++- .../sql/AdminSettingsServiceSqlTest.java | 23 ---------------- .../sql/AlarmCommentServiceSqlTest.java | 23 ---------------- .../dao/service/sql/AlarmServiceSqlTest.java | 23 ---------------- .../sql/ApiUsageStateServiceSqlTest.java | 23 ---------------- .../sql/AssetProfileServiceSqlTest.java | 23 ---------------- .../dao/service/sql/AssetServiceSqlTest.java | 23 ---------------- .../service/sql/CustomerServiceSqlTest.java | 23 ---------------- .../service/sql/DashboardServiceSqlTest.java | 23 ---------------- .../DeviceCredentialsCacheServiceSqlTest.java | 23 ---------------- .../sql/DeviceCredentialsServiceSqlTest.java | 23 ---------------- .../sql/DeviceProfileServiceSqlTest.java | 23 ---------------- .../dao/service/sql/DeviceServiceSqlTest.java | 23 ---------------- .../service/sql/EdgeEventServiceSqlTest.java | 23 ---------------- .../dao/service/sql/EdgeServiceSqlTest.java | 23 ---------------- .../sql/EntityServiceRegistrySqlTest.java | 24 ----------------- .../dao/service/sql/EntityServiceSqlTest.java | 23 ---------------- .../OAuth2ConfigTemplateServiceSqlTest.java | 23 ---------------- .../dao/service/sql/OAuth2ServiceSqlTest.java | 23 ---------------- .../service/sql/OtaPackageServiceSqlTest.java | 23 ---------------- .../dao/service/sql/QueueServiceSqlTest.java | 23 ---------------- .../dao/service/sql/RelationCacheSqlTest.java | 23 ---------------- .../service/sql/RelationServiceSqlTest.java | 23 ---------------- .../service/sql/RuleChainServiceSqlTest.java | 23 ---------------- .../sql/TenantProfileServiceSqlTest.java | 23 ---------------- .../dao/service/sql/TenantServiceSqlTest.java | 23 ---------------- .../dao/service/sql/UserServiceSqlTest.java | 23 ---------------- .../service/sql/WidgetTypeServiceSqlTest.java | 23 ---------------- .../sql/WidgetsBundleServiceSqlTest.java | 23 ---------------- 150 files changed, 197 insertions(+), 1850 deletions(-) delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AdminControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AlarmCommentControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AlarmControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AssetControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AssetProfileControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AuditLogControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/AuthControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/ComponentDescriptorControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/CustomerControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/DashboardControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/DeviceControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/DeviceProfileControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/EdgeControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/EdgeEventControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/EntityQueryControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/EntityRelationControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/EntityViewControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/HomePageApiSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/OtaPackageControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/RpcControllerTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/RuleChainControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TbResourceControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TelemetryControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TenantControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TenantProfileControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthConfigSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/UserControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/WebsocketApiSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/WidgetTypeControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/sql/WidgetsBundleControllerSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/AlarmEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/AssetEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/AssetProfileEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/CustomerEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/DashboardEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/DeviceEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/DeviceProfileEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/EdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/EntityViewEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/OtaPackageEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/QueueEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/RelationEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/RuleChainEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/TelemetryEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/UserEdgeSqlTest.java delete mode 100644 application/src/test/java/org/thingsboard/server/edge/sql/WidgetEdgeSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmCommentServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/ApiUsageStateServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetProfileServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceProfileServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeEventServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceRegistrySqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ConfigTemplateServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/OtaPackageServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/QueueServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationCacheSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/RuleChainServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantProfileServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java index e6c27aa4a8..19ccf16779 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAdminControllerTest.java @@ -24,6 +24,7 @@ import org.mockito.Mockito; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.common.data.security.model.JwtSettings; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -39,7 +40,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -public abstract class BaseAdminControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAdminControllerTest 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/BaseAlarmCommentControllerTest.java index 98446b025d..190621f19a 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmCommentControllerTest.java @@ -40,6 +40,7 @@ import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.id.AlarmId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.dao.alarm.AlarmDao; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.LinkedList; import java.util.List; @@ -49,7 +50,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @ContextConfiguration(classes = {BaseAlarmCommentControllerTest.Config.class}) -public abstract class BaseAlarmCommentControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAlarmCommentControllerTest 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/BaseAlarmControllerTest.java index 930c4881f9..184dd3345f 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAlarmControllerTest.java @@ -40,6 +40,7 @@ import org.thingsboard.server.common.data.audit.ActionType; import org.thingsboard.server.common.data.id.AlarmId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.dao.alarm.AlarmDao; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.LinkedList; import java.util.List; @@ -49,7 +50,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @Slf4j @ContextConfiguration(classes = {BaseAlarmControllerTest.Config.class}) -public abstract class BaseAlarmControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAlarmControllerTest 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/BaseAssetControllerTest.java index 545cc0522d..4fd9624eaa 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java @@ -46,6 +46,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.asset.AssetDao; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.service.stats.DefaultRuleEngineStatisticsService; import java.util.ArrayList; @@ -57,7 +58,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @ContextConfiguration(classes = {BaseAssetControllerTest.Config.class}) -public abstract class BaseAssetControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAssetControllerTest 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/BaseAssetProfileControllerTest.java index 2f7c51c3a2..7cd9f18e18 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAssetProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAssetProfileControllerTest.java @@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.asset.AssetProfileDao; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -52,7 +53,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ContextConfiguration(classes = {BaseAssetProfileControllerTest.Config.class}) -public abstract class BaseAssetProfileControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAssetProfileControllerTest 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/BaseAuditLogControllerTest.java index 95fcd08e12..6de6a2fd34 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAuditLogControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAuditLogControllerTest.java @@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.audit.AuditLogDao; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository; import org.thingsboard.server.service.ttl.AuditLogsCleanUpService; @@ -50,7 +51,8 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseAuditLogControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAuditLogControllerTest 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/BaseAuthControllerTest.java index 0ffda76a14..1fe4defaf0 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseAuthControllerTest.java @@ -17,6 +17,7 @@ package org.thingsboard.server.controller; import org.junit.Test; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.concurrent.TimeUnit; @@ -24,7 +25,8 @@ import static org.hamcrest.Matchers.is; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseAuthControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseAuthControllerTest 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/BaseComponentDescriptorControllerTest.java index cb35fd5a55..e742306811 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseComponentDescriptorControllerTest.java @@ -28,12 +28,14 @@ import org.thingsboard.server.common.data.plugin.ComponentScope; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.data.rule.RuleChainType; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.List; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseComponentDescriptorControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseComponentDescriptorControllerTest 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/BaseCustomerControllerTest.java index 53e18c6673..ec99b57e62 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java @@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.List; @@ -54,7 +55,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ContextConfiguration(classes = {BaseCustomerControllerTest.Config.class}) -public abstract class BaseCustomerControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseCustomerControllerTest 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/BaseDashboardControllerTest.java index ea9ad45ed3..f40fac0f65 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java @@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.dashboard.DashboardDao; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -52,7 +53,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ContextConfiguration(classes = {BaseDashboardControllerTest.Config.class}) -public abstract class BaseDashboardControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseDashboardControllerTest 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/BaseDeviceControllerTest.java index 42bfb236df..5fa3e2cefe 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java @@ -68,6 +68,7 @@ import org.thingsboard.server.dao.device.DeviceDao; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.service.gateway_device.GatewayNotificationsService; import java.util.ArrayList; @@ -85,7 +86,8 @@ 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}) -public abstract class BaseDeviceControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseDeviceControllerTest 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/BaseDeviceProfileControllerTest.java index fb4f9bd322..b50da8ce3e 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java @@ -51,6 +51,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.device.DeviceProfileDao; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -63,7 +64,8 @@ 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}) -public abstract class BaseDeviceProfileControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseDeviceProfileControllerTest 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/BaseEdgeControllerTest.java index 731b5570cc..d689be1996 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java @@ -52,6 +52,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.edge.EdgeDao; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.edge.imitator.EdgeImitator; import org.thingsboard.server.gen.edge.v1.AdminSettingsUpdateMsg; import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg; @@ -78,7 +79,8 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; "edges.enabled=true", }) @ContextConfiguration(classes = {BaseEdgeControllerTest.Config.class}) -public abstract class BaseEdgeControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseEdgeControllerTest 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/BaseEdgeEventControllerTest.java index c591bb6a16..4c1551d8c0 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEdgeEventControllerTest.java @@ -40,6 +40,7 @@ import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.edge.EdgeEventDao; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.sqlts.insert.sql.SqlPartitioningRepository; import org.thingsboard.server.service.ttl.EdgeEventsCleanUpService; @@ -59,7 +60,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. "edges.enabled=true", }) @Slf4j -public abstract class BaseEdgeEventControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseEdgeEventControllerTest 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/BaseEntityQueryControllerTest.java index ed25395b3b..3107b085c7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityQueryControllerTest.java @@ -52,6 +52,7 @@ import org.thingsboard.server.common.data.query.KeyFilter; import org.thingsboard.server.common.data.query.NumericFilterPredicate; import org.thingsboard.server.common.data.query.TsValue; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -62,7 +63,8 @@ import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseEntityQueryControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseEntityQueryControllerTest 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/BaseEntityRelationControllerTest.java index 1c76fb254f..0a8ef4d063 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java @@ -41,6 +41,7 @@ import org.thingsboard.server.common.data.relation.RelationTypeGroup; import org.thingsboard.server.common.data.relation.RelationsSearchParameters; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.relation.RelationService; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.Collections; import java.util.List; @@ -50,7 +51,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -public abstract class BaseEntityRelationControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseEntityRelationControllerTest 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/BaseEntityViewControllerTest.java index 75283b63f1..78bc69e851 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java @@ -64,6 +64,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.entityview.EntityViewDao; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.HashSet; @@ -90,7 +91,8 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; }) @Slf4j @ContextConfiguration(classes = {BaseEntityViewControllerTest.Config.class}) -public abstract class BaseEntityViewControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseEntityViewControllerTest 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/BaseHomePageApiTest.java index b71be1c3b6..560e927e8c 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java @@ -57,6 +57,7 @@ import org.thingsboard.server.common.data.query.TsValue; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.stats.TbApiUsageStateClient; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.settings.AdminSettingsService; import org.thingsboard.server.dao.tenant.TbTenantProfileCache; import org.thingsboard.server.service.ws.telemetry.cmd.v2.EntityCountCmd; @@ -73,7 +74,8 @@ import java.util.concurrent.TimeUnit; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -public abstract class BaseHomePageApiTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseHomePageApiTest 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/BaseOtaPackageControllerTest.java index 1aed95ff0c..0250f1f122 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java @@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -48,7 +49,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; -public abstract class BaseOtaPackageControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseOtaPackageControllerTest 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/BaseRpcControllerTest.java index 486ba32c4e..cea5aa6bfc 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseRpcControllerTest.java @@ -31,12 +31,14 @@ import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.rpc.Rpc; import org.thingsboard.server.common.data.rpc.RpcStatus; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.List; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseRpcControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseRpcControllerTest 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/BaseRuleChainControllerTest.java index ba52cea1ec..0cfae553de 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java @@ -44,6 +44,7 @@ import org.thingsboard.server.common.data.rule.RuleNode; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.rule.RuleChainDao; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -54,7 +55,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @ContextConfiguration(classes = {BaseRuleChainControllerTest.Config.class}) -public abstract class BaseRuleChainControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseRuleChainControllerTest 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/BaseTbResourceControllerTest.java index d82daf9eea..168f05dd7c 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java @@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +41,8 @@ import java.util.List; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseTbResourceControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseTbResourceControllerTest 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/BaseTelemetryControllerTest.java index 0676ccf83c..34fcce83fc 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTelemetryControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseTelemetryControllerTest.java @@ -20,10 +20,12 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.SaveDeviceWithCredentialsRequest; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; +import org.thingsboard.server.dao.service.DaoSqlTest; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseTelemetryControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseTelemetryControllerTest 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/BaseTenantControllerTest.java index 2e42009e5b..c8d762bdc3 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java @@ -49,6 +49,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.data.tenant.profile.TenantProfileData; import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfiguration; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Comparator; @@ -69,7 +70,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. "js.evaluator=mock", }) @Slf4j -public abstract class BaseTenantControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseTenantControllerTest 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/BaseTenantProfileControllerTest.java index d4116a873d..db8fa296e7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java @@ -36,6 +36,7 @@ import org.thingsboard.server.common.data.queue.SubmitStrategyType; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.data.tenant.profile.TenantProfileData; import org.thingsboard.server.common.data.tenant.profile.TenantProfileQueueConfiguration; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -47,7 +48,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseTenantProfileControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseTenantProfileControllerTest 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/BaseUserControllerTest.java index 5340101e6f..ca25df59ff 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java @@ -50,6 +50,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.settings.StarredDashboardInfo; import org.thingsboard.server.common.data.settings.UserDashboardsInfo; import org.thingsboard.server.dao.exception.DataValidationException; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.user.UserDao; import java.util.ArrayList; @@ -67,7 +68,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.thingsboard.server.dao.model.ModelConstants.SYSTEM_TENANT; @ContextConfiguration(classes = {BaseUserControllerTest.Config.class}) -public abstract class BaseUserControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseUserControllerTest 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/BaseWebsocketApiTest.java index 6de1bc5b35..55b56036b7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java @@ -53,6 +53,7 @@ import org.thingsboard.server.common.data.query.KeyFilter; import org.thingsboard.server.common.data.query.NumericFilterPredicate; import org.thingsboard.server.common.data.query.SingleEntityFilter; import org.thingsboard.server.common.data.query.TsValue; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.service.subscription.SubscriptionErrorCode; import org.thingsboard.server.service.subscription.TbAttributeSubscriptionScope; import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService; @@ -73,7 +74,8 @@ import static org.assertj.core.api.Assertions.assertThatNoException; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @Slf4j -public abstract class BaseWebsocketApiTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseWebsocketApiTest 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/BaseWidgetTypeControllerTest.java index c4312794b7..141e227eec 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetTypeControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseWidgetTypeControllerTest.java @@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -36,7 +37,8 @@ import java.util.List; import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class BaseWidgetTypeControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseWidgetTypeControllerTest 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/BaseWidgetsBundleControllerTest.java index 828d279e93..0fc325f12f 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java @@ -31,6 +31,7 @@ import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.service.DaoSqlTest; import java.util.ArrayList; import java.util.Collections; @@ -40,7 +41,8 @@ import static org.hamcrest.Matchers.containsString; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.thingsboard.server.dao.model.ModelConstants.SYSTEM_TENANT; -public abstract class BaseWidgetsBundleControllerTest extends AbstractControllerTest { +@DaoSqlTest +public class BaseWidgetsBundleControllerTest extends AbstractControllerTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java index 0f77eb0fd2..ad898e0215 100644 --- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java @@ -39,6 +39,7 @@ import org.thingsboard.server.common.data.security.model.mfa.provider.SmsTwoFaPr import org.thingsboard.server.common.data.security.model.mfa.provider.TotpTwoFaProviderConfig; import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderConfig; import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.service.security.auth.mfa.TwoFactorAuthService; import org.thingsboard.server.service.security.auth.mfa.config.TwoFaConfigManager; import org.thingsboard.server.service.security.auth.mfa.provider.impl.OtpBasedTwoFaProvider; @@ -58,7 +59,8 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class TwoFactorAuthConfigTest extends AbstractControllerTest { +@DaoSqlTest +public class TwoFactorAuthConfigTest extends AbstractControllerTest { @SpyBean private TotpTwoFaProvider totpTwoFactorAuthProvider; diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java index 8c8074c35d..1c97ae48d7 100644 --- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java @@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.security.model.mfa.provider.TotpTwoFaP import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderConfig; import org.thingsboard.server.common.data.security.model.mfa.provider.TwoFaProviderType; import org.thingsboard.server.dao.audit.AuditLogService; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.service.security.auth.mfa.TwoFactorAuthService; import org.thingsboard.server.service.security.auth.mfa.config.TwoFaConfigManager; @@ -72,7 +73,8 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verify; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -public abstract class TwoFactorAuthTest extends AbstractControllerTest { +@DaoSqlTest +public class TwoFactorAuthTest extends AbstractControllerTest { @Autowired private TwoFaConfigManager twoFaConfigManager; diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AdminControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AdminControllerSqlTest.java deleted file mode 100644 index a0a483f0f1..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AdminControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAdminControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class AdminControllerSqlTest extends BaseAdminControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AlarmCommentControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AlarmCommentControllerSqlTest.java deleted file mode 100644 index 7cf09ab329..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AlarmCommentControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAlarmCommentControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AlarmCommentControllerSqlTest extends BaseAlarmCommentControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AlarmControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AlarmControllerSqlTest.java deleted file mode 100644 index 8b9c70c47d..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AlarmControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAlarmControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AlarmControllerSqlTest extends BaseAlarmControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AssetControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AssetControllerSqlTest.java deleted file mode 100644 index 7a033c15b0..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AssetControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAssetControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class AssetControllerSqlTest extends BaseAssetControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AssetProfileControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AssetProfileControllerSqlTest.java deleted file mode 100644 index e8b41f5093..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AssetProfileControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAssetProfileControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AssetProfileControllerSqlTest extends BaseAssetProfileControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AuditLogControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AuditLogControllerSqlTest.java deleted file mode 100644 index d13a4fc47e..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AuditLogControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAuditLogControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AuditLogControllerSqlTest extends BaseAuditLogControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/AuthControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/AuthControllerSqlTest.java deleted file mode 100644 index 84bc50c293..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/AuthControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseAuthControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class AuthControllerSqlTest extends BaseAuthControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/ComponentDescriptorControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/ComponentDescriptorControllerSqlTest.java deleted file mode 100644 index 22772f48dc..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/ComponentDescriptorControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseComponentDescriptorControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class ComponentDescriptorControllerSqlTest extends BaseComponentDescriptorControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/CustomerControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/CustomerControllerSqlTest.java deleted file mode 100644 index b4ceb0d1d2..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/CustomerControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseCustomerControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class CustomerControllerSqlTest extends BaseCustomerControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/DashboardControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/DashboardControllerSqlTest.java deleted file mode 100644 index 214001ea4a..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/DashboardControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseDashboardControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class DashboardControllerSqlTest extends BaseDashboardControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/DeviceControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/DeviceControllerSqlTest.java deleted file mode 100644 index 4e96975afa..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/DeviceControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseDeviceControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class DeviceControllerSqlTest extends BaseDeviceControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/DeviceProfileControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/DeviceProfileControllerSqlTest.java deleted file mode 100644 index 0aa5185c46..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/DeviceProfileControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseDeviceProfileControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DeviceProfileControllerSqlTest extends BaseDeviceProfileControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EdgeControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EdgeControllerSqlTest.java deleted file mode 100644 index 958b06398c..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/EdgeControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseEdgeControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EdgeControllerSqlTest extends BaseEdgeControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EdgeEventControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EdgeEventControllerSqlTest.java deleted file mode 100644 index 5191347dc3..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/EdgeEventControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseEdgeEventControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EdgeEventControllerSqlTest extends BaseEdgeEventControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EntityQueryControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EntityQueryControllerSqlTest.java deleted file mode 100644 index df2ab289c6..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/EntityQueryControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseEntityQueryControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EntityQueryControllerSqlTest extends BaseEntityQueryControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EntityRelationControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EntityRelationControllerSqlTest.java deleted file mode 100644 index 1584a72eed..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/EntityRelationControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseEntityRelationControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EntityRelationControllerSqlTest extends BaseEntityRelationControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EntityViewControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EntityViewControllerSqlTest.java deleted file mode 100644 index 6e13b83334..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/EntityViewControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseEntityViewControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Victor Basanets on 8/27/2017. - */ -@DaoSqlTest -public class EntityViewControllerSqlTest extends BaseEntityViewControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/HomePageApiSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/HomePageApiSqlTest.java deleted file mode 100644 index 5aa50c9336..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/HomePageApiSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseHomePageApiTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class HomePageApiSqlTest extends BaseHomePageApiTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/OtaPackageControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/OtaPackageControllerSqlTest.java deleted file mode 100644 index f5e2071209..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/OtaPackageControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseOtaPackageControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class OtaPackageControllerSqlTest extends BaseOtaPackageControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/RpcControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/RpcControllerTest.java deleted file mode 100644 index 71ab8a5562..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/RpcControllerTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseRpcControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class RpcControllerTest extends BaseRpcControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/RuleChainControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/RuleChainControllerSqlTest.java deleted file mode 100644 index 14f40b4e55..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/RuleChainControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseRuleChainControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class RuleChainControllerSqlTest extends BaseRuleChainControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TbResourceControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TbResourceControllerSqlTest.java deleted file mode 100644 index f7b6f83c14..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TbResourceControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseTbResourceControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TbResourceControllerSqlTest extends BaseTbResourceControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TelemetryControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TelemetryControllerSqlTest.java deleted file mode 100644 index b256f4fe1e..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TelemetryControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseTelemetryControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TelemetryControllerSqlTest extends BaseTelemetryControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TenantControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TenantControllerSqlTest.java deleted file mode 100644 index 5e1f474f1b..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TenantControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseTenantControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class TenantControllerSqlTest extends BaseTenantControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TenantProfileControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TenantProfileControllerSqlTest.java deleted file mode 100644 index bde2975ad5..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TenantProfileControllerSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseTenantProfileControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TenantProfileControllerSqlTest extends BaseTenantProfileControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthConfigSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthConfigSqlTest.java deleted file mode 100644 index 7082268b69..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthConfigSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.TwoFactorAuthConfigTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TwoFactorAuthConfigSqlTest extends TwoFactorAuthConfigTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthSqlTest.java deleted file mode 100644 index e6e2ba5e97..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/TwoFactorAuthSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.TwoFactorAuthTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TwoFactorAuthSqlTest extends TwoFactorAuthTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/UserControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/UserControllerSqlTest.java deleted file mode 100644 index c3c87b10da..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/UserControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseUserControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class UserControllerSqlTest extends BaseUserControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/WebsocketApiSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/WebsocketApiSqlTest.java deleted file mode 100644 index f3dc99e72d..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/WebsocketApiSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseWebsocketApiTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class WebsocketApiSqlTest extends BaseWebsocketApiTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/WidgetTypeControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/WidgetTypeControllerSqlTest.java deleted file mode 100644 index a629cfea93..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/WidgetTypeControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseWidgetTypeControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class WidgetTypeControllerSqlTest extends BaseWidgetTypeControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/WidgetsBundleControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/WidgetsBundleControllerSqlTest.java deleted file mode 100644 index c4416cbf6c..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/sql/WidgetsBundleControllerSqlTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.controller.sql; - -import org.thingsboard.server.controller.BaseWidgetsBundleControllerTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -/** - * Created by Valerii Sosliuk on 6/28/2017. - */ -@DaoSqlTest -public class WidgetsBundleControllerSqlTest extends BaseWidgetsBundleControllerTest { -} diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java index c06093535a..ae01ef1783 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java @@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.id.AlarmId; import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageLink; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.AlarmUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.gen.edge.v1.UplinkMsg; @@ -39,7 +40,8 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseAlarmEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseAlarmEdgeTest 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/BaseAssetEdgeTest.java index 996334627f..36cd482980 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseAssetEdgeTest.java @@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg; import org.thingsboard.server.gen.edge.v1.AssetUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -32,7 +33,8 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseAssetEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseAssetEdgeTest 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/BaseAssetProfileEdgeTest.java index df3f9a8e6e..b5c22ade5d 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseAssetProfileEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseAssetProfileEdgeTest.java @@ -21,6 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.asset.AssetProfile; import org.thingsboard.server.common.data.id.RuleChainId; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -28,7 +29,8 @@ import java.nio.charset.StandardCharsets; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseAssetProfileEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseAssetProfileEdgeTest 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/BaseCustomerEdgeTest.java index 93adc722c8..32363b6b96 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseCustomerEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseCustomerEdgeTest.java @@ -20,6 +20,7 @@ import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.edge.Edge; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg; import org.thingsboard.server.gen.edge.v1.EdgeConfiguration; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -28,7 +29,8 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseCustomerEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseCustomerEdgeTest 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/BaseDashboardEdgeTest.java index b6e8c21615..464dab1b77 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDashboardEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseDashboardEdgeTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.ShortCustomerInfo; import org.thingsboard.server.common.data.edge.Edge; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.DashboardUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -31,7 +32,8 @@ import java.util.Set; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseDashboardEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseDashboardEdgeTest 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/BaseDeviceEdgeTest.java index 1fbd483aa4..095df1d843 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceEdgeTest.java @@ -52,6 +52,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.msg.session.FeatureType; import org.thingsboard.server.common.transport.adaptor.JsonConverter; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.AttributesRequestMsg; import org.thingsboard.server.gen.edge.v1.DeviceCredentialsRequestMsg; import org.thingsboard.server.gen.edge.v1.DeviceCredentialsUpdateMsg; @@ -79,7 +80,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @TestPropertySource(properties = { "transport.mqtt.enabled=true" }) -abstract public class BaseDeviceEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseDeviceEdgeTest 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/BaseDeviceProfileEdgeTest.java index 0a52853bf8..b6bc94b43e 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseDeviceProfileEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseDeviceProfileEdgeTest.java @@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.ota.OtaPackageType; import org.thingsboard.server.common.data.transport.snmp.SnmpMapping; import org.thingsboard.server.common.data.transport.snmp.config.SnmpCommunicationConfig; import org.thingsboard.server.common.data.transport.snmp.config.impl.TelemetryQueryingSnmpCommunicationConfig; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.transport.AbstractTransportIntegrationTest; @@ -54,7 +55,8 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseDeviceProfileEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseDeviceProfileEdgeTest 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/BaseEdgeTest.java index 59ad249b34..866b66d905 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java @@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.CustomerUpdateMsg; import org.thingsboard.server.gen.edge.v1.EdgeConfiguration; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -28,7 +29,8 @@ import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import java.util.Optional; import java.util.UUID; -abstract public class BaseEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseEdgeTest 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/BaseEntityViewEdgeTest.java index a2ab82786b..faf24df9ae 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseEntityViewEdgeTest.java @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.EntityView; import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.EntityViewUpdateMsg; import org.thingsboard.server.gen.edge.v1.EntityViewsRequestMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -34,7 +35,8 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseEntityViewEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseEntityViewEdgeTest 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/BaseOtaPackageEdgeTest.java index a8b4d7df7b..7c9db884eb 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseOtaPackageEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseOtaPackageEdgeTest.java @@ -27,6 +27,7 @@ import org.thingsboard.server.common.data.OtaPackageInfo; import org.thingsboard.server.common.data.SaveOtaPackageInfoRequest; import org.thingsboard.server.common.data.ota.ChecksumAlgorithm; import org.thingsboard.server.common.data.ota.OtaPackageType; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.OtaPackageUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -35,7 +36,8 @@ import java.nio.ByteBuffer; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; -abstract public class BaseOtaPackageEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseOtaPackageEdgeTest 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/BaseQueueEdgeTest.java index 60dfb5baed..a870323b85 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseQueueEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseQueueEdgeTest.java @@ -24,12 +24,14 @@ import org.thingsboard.server.common.data.queue.Queue; import org.thingsboard.server.common.data.queue.SubmitStrategy; import org.thingsboard.server.common.data.queue.SubmitStrategyType; import org.thingsboard.server.common.msg.queue.ServiceType; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.QueueUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseQueueEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseQueueEdgeTest 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/BaseRelationEdgeTest.java index 78e0d450ee..8fa3bbf870 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.RelationTypeGroup; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.RelationRequestMsg; import org.thingsboard.server.gen.edge.v1.RelationUpdateMsg; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; @@ -33,7 +34,8 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseRelationEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseRelationEdgeTest 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/BaseRuleChainEdgeTest.java index b376755f1a..6b70adf504 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseRuleChainEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseRuleChainEdgeTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; import org.thingsboard.server.common.data.rule.RuleChainMetaData; import org.thingsboard.server.common.data.rule.RuleChainType; import org.thingsboard.server.common.data.rule.RuleNode; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.RuleChainMetadataRequestMsg; import org.thingsboard.server.gen.edge.v1.RuleChainMetadataUpdateMsg; import org.thingsboard.server.gen.edge.v1.RuleChainUpdateMsg; @@ -37,7 +38,8 @@ import java.util.UUID; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseRuleChainEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseRuleChainEdgeTest 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/BaseTelemetryEdgeTest.java index 9a5fe26782..7af6fea023 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseTelemetryEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseTelemetryEdgeTest.java @@ -30,6 +30,7 @@ import org.thingsboard.server.common.data.edge.EdgeEvent; import org.thingsboard.server.common.data.edge.EdgeEventActionType; import org.thingsboard.server.common.data.edge.EdgeEventType; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.AttributeDeleteMsg; import org.thingsboard.server.gen.edge.v1.DeviceUpdateMsg; import org.thingsboard.server.gen.edge.v1.EntityDataProto; @@ -39,7 +40,8 @@ import org.thingsboard.server.gen.transport.TransportProtos; import java.util.List; import java.util.concurrent.TimeUnit; -abstract public class BaseTelemetryEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseTelemetryEdgeTest 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/BaseUserEdgeTest.java index f1d4427582..c85d35e5a7 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseUserEdgeTest.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.edge.Edge; import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.gen.edge.v1.UplinkMsg; import org.thingsboard.server.gen.edge.v1.UserCredentialsRequestMsg; @@ -35,7 +36,8 @@ import java.util.Optional; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseUserEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseUserEdgeTest 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/BaseWidgetEdgeTest.java index f5c5bc50e7..fdc201907f 100644 --- a/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java +++ b/application/src/test/java/org/thingsboard/server/edge/BaseWidgetEdgeTest.java @@ -22,13 +22,15 @@ import org.junit.Test; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.gen.edge.v1.WidgetTypeUpdateMsg; import org.thingsboard.server.gen.edge.v1.WidgetsBundleUpdateMsg; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -abstract public class BaseWidgetEdgeTest extends AbstractEdgeTest { +@DaoSqlTest +public class BaseWidgetEdgeTest extends AbstractEdgeTest { @Test public void testWidgetsBundleAndWidgetType() throws Exception { diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/AlarmEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/AlarmEdgeSqlTest.java deleted file mode 100644 index 3e7a8a5338..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/AlarmEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseAlarmEdgeTest; - -@DaoSqlTest -public class AlarmEdgeSqlTest extends BaseAlarmEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/AssetEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/AssetEdgeSqlTest.java deleted file mode 100644 index 633b2755eb..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/AssetEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseAssetEdgeTest; - -@DaoSqlTest -public class AssetEdgeSqlTest extends BaseAssetEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/AssetProfileEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/AssetProfileEdgeSqlTest.java deleted file mode 100644 index fb534d538a..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/AssetProfileEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseAssetProfileEdgeTest; - -@DaoSqlTest -public class AssetProfileEdgeSqlTest extends BaseAssetProfileEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/CustomerEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/CustomerEdgeSqlTest.java deleted file mode 100644 index 8814cd6f6c..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/CustomerEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseCustomerEdgeTest; - -@DaoSqlTest -public class CustomerEdgeSqlTest extends BaseCustomerEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/DashboardEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/DashboardEdgeSqlTest.java deleted file mode 100644 index af5fdbd993..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/DashboardEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseDashboardEdgeTest; - -@DaoSqlTest -public class DashboardEdgeSqlTest extends BaseDashboardEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/DeviceEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/DeviceEdgeSqlTest.java deleted file mode 100644 index e7440c9f19..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/DeviceEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseDeviceEdgeTest; - -@DaoSqlTest -public class DeviceEdgeSqlTest extends BaseDeviceEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/DeviceProfileEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/DeviceProfileEdgeSqlTest.java deleted file mode 100644 index 6ccb459ba3..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/DeviceProfileEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseDeviceProfileEdgeTest; - -@DaoSqlTest -public class DeviceProfileEdgeSqlTest extends BaseDeviceProfileEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/EdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/EdgeSqlTest.java deleted file mode 100644 index bf8dd83cf1..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/EdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseEdgeTest; - -@DaoSqlTest -public class EdgeSqlTest extends BaseEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/EntityViewEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/EntityViewEdgeSqlTest.java deleted file mode 100644 index 2f9673098b..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/EntityViewEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseEntityViewEdgeTest; - -@DaoSqlTest -public class EntityViewEdgeSqlTest extends BaseEntityViewEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/OtaPackageEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/OtaPackageEdgeSqlTest.java deleted file mode 100644 index 8968f0715a..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/OtaPackageEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseOtaPackageEdgeTest; - -@DaoSqlTest -public class OtaPackageEdgeSqlTest extends BaseOtaPackageEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/QueueEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/QueueEdgeSqlTest.java deleted file mode 100644 index 74bc1e76a7..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/QueueEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseQueueEdgeTest; - -@DaoSqlTest -public class QueueEdgeSqlTest extends BaseQueueEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/RelationEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/RelationEdgeSqlTest.java deleted file mode 100644 index 029d7fde48..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/RelationEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseRelationEdgeTest; - -@DaoSqlTest -public class RelationEdgeSqlTest extends BaseRelationEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/RuleChainEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/RuleChainEdgeSqlTest.java deleted file mode 100644 index fc43df3267..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/RuleChainEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseRuleChainEdgeTest; - -@DaoSqlTest -public class RuleChainEdgeSqlTest extends BaseRuleChainEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/TelemetryEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/TelemetryEdgeSqlTest.java deleted file mode 100644 index f9c4360f46..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/TelemetryEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseTelemetryEdgeTest; - -@DaoSqlTest -public class TelemetryEdgeSqlTest extends BaseTelemetryEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/UserEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/UserEdgeSqlTest.java deleted file mode 100644 index 913e8c549f..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/UserEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseUserEdgeTest; - -@DaoSqlTest -public class UserEdgeSqlTest extends BaseUserEdgeTest { - -} diff --git a/application/src/test/java/org/thingsboard/server/edge/sql/WidgetEdgeSqlTest.java b/application/src/test/java/org/thingsboard/server/edge/sql/WidgetEdgeSqlTest.java deleted file mode 100644 index f47f8e1aa9..0000000000 --- a/application/src/test/java/org/thingsboard/server/edge/sql/WidgetEdgeSqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.edge.sql; - -import org.thingsboard.server.dao.service.DaoSqlTest; -import org.thingsboard.server.edge.BaseWidgetEdgeTest; - -@DaoSqlTest -public class WidgetEdgeSqlTest extends BaseWidgetEdgeTest { - -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java index 772644bab8..263dc2aa44 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java @@ -31,7 +31,8 @@ import org.thingsboard.server.dao.settings.AdminSettingsService; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -public abstract class BaseAdminSettingsServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseAdminSettingsServiceTest 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/BaseAlarmCommentServiceTest.java index e79e00515b..26b4e3ac43 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 @@ -43,7 +43,8 @@ import java.util.concurrent.ExecutionException; import static org.thingsboard.server.common.data.alarm.AlarmCommentType.OTHER; -public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseAlarmCommentServiceTest 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/BaseAlarmServiceTest.java index e5b245d7b6..c4e3a45e27 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 @@ -62,7 +62,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; -public abstract class BaseAlarmServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseAlarmServiceTest 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/BaseApiUsageStateServiceTest.java index 7d6ce291aa..b36cd027cb 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 @@ -23,7 +23,8 @@ import org.thingsboard.server.common.data.ApiUsageStateValue; import org.thingsboard.server.dao.usagerecord.ApiUsageStateService; -public abstract class BaseApiUsageStateServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseApiUsageStateServiceTest 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/BaseAssetProfileServiceTest.java index 02bf4b1b1a..9a625f2bcb 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 @@ -40,7 +40,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.stream.Collectors; -public abstract class BaseAssetProfileServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseAssetProfileServiceTest 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/BaseAssetServiceTest.java index 3f9c94ca14..676ee41a4b 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 @@ -40,7 +40,8 @@ import java.util.List; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -public abstract class BaseAssetServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseAssetServiceTest 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/BaseCustomerServiceTest.java index 51953e89ff..15fc560224 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 @@ -41,7 +41,8 @@ import java.util.concurrent.TimeUnit; import static org.assertj.core.api.Assertions.assertThat; -public abstract class BaseCustomerServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseCustomerServiceTest 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/BaseDashboardServiceTest.java index 7ccd5e6211..8377bcb883 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 @@ -43,7 +43,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; -public abstract class BaseDashboardServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseDashboardServiceTest 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/BaseDeviceCredentialsCacheTest.java index 7fc9f7b218..d61a09e106 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java @@ -41,7 +41,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public abstract class BaseDeviceCredentialsCacheTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseDeviceCredentialsCacheTest 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/BaseDeviceCredentialsServiceTest.java index 4512a5fa4f..993123782b 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 @@ -29,7 +29,8 @@ import org.thingsboard.server.dao.device.DeviceCredentialsService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.exception.DataValidationException; -public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseDeviceCredentialsServiceTest 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/BaseDeviceProfileServiceTest.java index fa43d98374..b78d57caed 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 @@ -49,7 +49,8 @@ import java.util.stream.Collectors; import static org.assertj.core.api.Assertions.assertThat; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; -public abstract class BaseDeviceProfileServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseDeviceProfileServiceTest 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/BaseDeviceServiceTest.java index cb46e27c81..4fc69527c2 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 @@ -57,7 +57,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -public abstract class BaseDeviceServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseDeviceServiceTest 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/BaseEdgeEventServiceTest.java index 3b942dab5f..a47715895c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEdgeEventServiceTest.java @@ -42,7 +42,8 @@ import java.util.List; import static org.apache.commons.lang3.time.DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT; -public abstract class BaseEdgeEventServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseEdgeEventServiceTest 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/BaseEdgeServiceTest.java index 9b307b2f8c..d2c6ee137b 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 @@ -47,7 +47,8 @@ import java.util.List; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -public abstract class BaseEdgeServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseEdgeServiceTest 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/BaseEntityServiceRegistryTest.java index 87b6bbdd80..ef64b37c8a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceRegistryTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseEntityServiceRegistryTest.java @@ -25,7 +25,8 @@ import org.thingsboard.server.dao.entity.EntityServiceRegistry; import org.thingsboard.server.dao.rule.RuleChainService; @Slf4j -public abstract class BaseEntityServiceRegistryTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseEntityServiceRegistryTest 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/BaseEntityServiceTest.java index 5ec546cd4e..04de6f129d 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 @@ -97,7 +97,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; @Slf4j -public abstract class BaseEntityServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseEntityServiceTest 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/BaseOAuth2ConfigTemplateServiceTest.java index df903f4137..81bc6d4ce5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java @@ -31,7 +31,8 @@ import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService; import java.util.Arrays; import java.util.UUID; -public abstract class BaseOAuth2ConfigTemplateServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseOAuth2ConfigTemplateServiceTest 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/BaseOAuth2ServiceTest.java index 73dd08d53c..d969213c93 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ServiceTest.java @@ -44,7 +44,8 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -public abstract class BaseOAuth2ServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseOAuth2ServiceTest 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/BaseOtaPackageServiceTest.java index d430e1945a..d3f5d6de06 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 @@ -49,7 +49,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; -public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseOtaPackageServiceTest 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/BaseQueueServiceTest.java index 9d2c2bac5a..c97d8d5e8e 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 @@ -43,7 +43,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class BaseQueueServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseQueueServiceTest 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/BaseRelationCacheTest.java index 8c3e7bd1fc..cc1aee8184 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationCacheTest.java @@ -39,7 +39,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.thingsboard.server.common.data.CacheConstants.RELATIONS_CACHE; -public abstract class BaseRelationCacheTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseRelationCacheTest 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/BaseRelationServiceTest.java index d60a896aec..e313c63632 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java @@ -42,7 +42,8 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutionException; -public abstract class BaseRelationServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseRelationServiceTest 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/BaseRuleChainServiceTest.java index 419cdef570..a8372293c1 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 @@ -44,7 +44,8 @@ import java.util.List; /** * Created by igor on 3/13/18. */ -public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseRuleChainServiceTest 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/BaseTenantProfileServiceTest.java index 6d41da2965..24a6372389 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 @@ -45,7 +45,8 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -public abstract class BaseTenantProfileServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseTenantProfileServiceTest 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/BaseTenantServiceTest.java index 2a680d971f..00dc0df19f 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 @@ -82,7 +82,8 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; -public abstract class BaseTenantServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseTenantServiceTest extends AbstractServiceTest { @SpyBean TenantDao tenantDao; 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 c7ff515fb5..c5409fcd4d 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 @@ -40,7 +40,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class BaseUserServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseUserServiceTest 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/BaseWidgetTypeServiceTest.java index b04053f6d9..e19a06eb56 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 @@ -36,7 +36,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseWidgetTypeServiceTest 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/BaseWidgetsBundleServiceTest.java index 8f04eaec62..d6492c66f8 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 @@ -33,7 +33,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { +@DaoSqlTest +public class BaseWidgetsBundleServiceTest extends AbstractServiceTest { @Autowired WidgetsBundleService widgetsBundleService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java deleted file mode 100644 index 680cdaa02f..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmCommentServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmCommentServiceSqlTest.java deleted file mode 100644 index c4c57059b1..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmCommentServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseAlarmCommentServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AlarmCommentServiceSqlTest extends BaseAlarmCommentServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java deleted file mode 100644 index c3d2307867..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseAlarmServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AlarmServiceSqlTest extends BaseAlarmServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/ApiUsageStateServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/ApiUsageStateServiceSqlTest.java deleted file mode 100644 index f3d0fed5c4..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/ApiUsageStateServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseApiUsageStateServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class ApiUsageStateServiceSqlTest extends BaseApiUsageStateServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetProfileServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetProfileServiceSqlTest.java deleted file mode 100644 index e31c425140..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetProfileServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseAssetProfileServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AssetProfileServiceSqlTest extends BaseAssetProfileServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java deleted file mode 100644 index 6a5aa4c167..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseAssetServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class AssetServiceSqlTest extends BaseAssetServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java deleted file mode 100644 index b3f36dacf3..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseCustomerServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class CustomerServiceSqlTest extends BaseCustomerServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java deleted file mode 100644 index d6ad4aab90..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseDashboardServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DashboardServiceSqlTest extends BaseDashboardServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java deleted file mode 100644 index f225d84802..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DeviceCredentialsCacheServiceSqlTest extends BaseDeviceCredentialsCacheTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java deleted file mode 100644 index 6f1748fc45..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceProfileServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceProfileServiceSqlTest.java deleted file mode 100644 index 34219223e5..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceProfileServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseDeviceProfileServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DeviceProfileServiceSqlTest extends BaseDeviceProfileServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java deleted file mode 100644 index 2b20cf1bee..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseDeviceServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class DeviceServiceSqlTest extends BaseDeviceServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeEventServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeEventServiceSqlTest.java deleted file mode 100644 index b3eec44418..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeEventServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseEdgeEventServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EdgeEventServiceSqlTest extends BaseEdgeEventServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeServiceSqlTest.java deleted file mode 100644 index 9c98d57dc9..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EdgeServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseEdgeServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EdgeServiceSqlTest extends BaseEdgeServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceRegistrySqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceRegistrySqlTest.java deleted file mode 100644 index d5b5df984a..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceRegistrySqlTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseEntityServiceRegistryTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EntityServiceRegistrySqlTest extends BaseEntityServiceRegistryTest { - -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceSqlTest.java deleted file mode 100644 index 0d07cf78c8..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/EntityServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseEntityServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class EntityServiceSqlTest extends BaseEntityServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ConfigTemplateServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ConfigTemplateServiceSqlTest.java deleted file mode 100644 index 2b404c272b..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ConfigTemplateServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseOAuth2ConfigTemplateServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class OAuth2ConfigTemplateServiceSqlTest extends BaseOAuth2ConfigTemplateServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ServiceSqlTest.java deleted file mode 100644 index 3b99709e7f..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OAuth2ServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseOAuth2ServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class OAuth2ServiceSqlTest extends BaseOAuth2ServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OtaPackageServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/OtaPackageServiceSqlTest.java deleted file mode 100644 index 16de23f087..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/OtaPackageServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseOtaPackageServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class OtaPackageServiceSqlTest extends BaseOtaPackageServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/QueueServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/QueueServiceSqlTest.java deleted file mode 100644 index 2a9badf6b3..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/QueueServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseQueueServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class QueueServiceSqlTest extends BaseQueueServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationCacheSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationCacheSqlTest.java deleted file mode 100644 index d53b65da0d..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationCacheSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseRelationCacheTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class RelationCacheSqlTest extends BaseRelationCacheTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java deleted file mode 100644 index 352e457b2e..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseRelationServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class RelationServiceSqlTest extends BaseRelationServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RuleChainServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RuleChainServiceSqlTest.java deleted file mode 100644 index cc07093763..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RuleChainServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseRuleChainServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class RuleChainServiceSqlTest extends BaseRuleChainServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantProfileServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantProfileServiceSqlTest.java deleted file mode 100644 index 3ef2c25bae..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantProfileServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseTenantProfileServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TenantProfileServiceSqlTest extends BaseTenantProfileServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java deleted file mode 100644 index 635eea80ca..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseTenantServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class TenantServiceSqlTest extends BaseTenantServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java deleted file mode 100644 index bc2e6dc81a..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseUserServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class UserServiceSqlTest extends BaseUserServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java deleted file mode 100644 index b721adb7d1..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest { -} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java deleted file mode 100644 index c2ac07882f..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.service.sql; - -import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest; -import org.thingsboard.server.dao.service.DaoSqlTest; - -@DaoSqlTest -public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest { -} From 93c219c83e0aa09e31af643669b611af3d544c19 Mon Sep 17 00:00:00 2001 From: AndriiD Date: Thu, 4 May 2023 16:08:55 +0300 Subject: [PATCH 2/2] 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(); }