Replaced deprecated @MockBean/@SpyBean with @MockitoBean in dao tests

Spring Boot 3.4 deprecated @MockBean/@SpyBean in favor of
@MockitoBean/@MockitoSpyBean. The 'answer' attribute was renamed to
'answers'.

dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -40,7 +40,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractDaoServiceTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }

dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -42,7 +42,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractJpaDaoTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }

dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java

@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.cache;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.test.context.ContextConfiguration;
@@ -50,13 +50,13 @@ import static org.mockito.Mockito.when;
 @Slf4j
 public class RedisTbTransactionalCacheTest {
 
-    @MockBean
+    @MockitoBean
     private RelationRedisCache relationRedisCache;
-    @MockBean
+    @MockitoBean
     private RedisConnectionFactory connectionFactory;
-    @MockBean
+    @MockitoBean
     private RedisConnection redisConnection;
-    @MockBean
+    @MockitoBean
     private RedisSslCredentials redisSslCredentials;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java

@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -103,7 +103,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
     private CalculatedFieldService calculatedFieldService;
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
-    @SpyBean
+    @MockitoSpyBean
     private DeviceCredentialsDataValidator validator;
 
     private IdComparator<Device> idComparator = new IdComparator<>();

dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java

@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cache.TbTransactionalCache;
 import org.thingsboard.server.common.data.Customer;
@@ -87,7 +87,7 @@ import static org.mockito.Mockito.verify;
 @DaoSqlTest
 public class TenantServiceTest extends AbstractServiceTest {
 
-    @SpyBean
+    @MockitoSpyBean
     TenantDao tenantDao;
 
     @Autowired

dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,9 +31,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AdminSettingsDataValidator.class)
 class AdminSettingsDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AdminSettingsService adminSettingsService;
-    @SpyBean
+    @MockitoSpyBean
     AdminSettingsDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -33,9 +33,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AlarmDataValidator.class)
 class AlarmDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     AlarmDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java

@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class AssetDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetDao assetDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     AssetDataValidator validator;

dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetProfileDao;
@@ -37,19 +37,19 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AssetProfileDataValidator.class)
 class AssetProfileDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetProfileDao assetProfileDao;
-    @MockBean
+    @MockitoBean
     AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     AssetProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
@@ -38,11 +38,11 @@ public class CalculatedFieldDataValidatorTest {
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("7b5229e9-166e-41a9-a257-3b1dafad1b04"));
     private final CalculatedFieldId CALCULATED_FIELD_ID = new CalculatedFieldId(UUID.fromString("060fbe45-fbb2-4549-abf3-f72a6be3cb9f"));
 
-    @MockBean
+    @MockitoBean
     private CalculatedFieldDao calculatedFieldDao;
-    @MockBean
+    @MockitoBean
     private DefaultApiLimitService apiLimitService;
-    @SpyBean
+    @MockitoSpyBean
     private CalculatedFieldDataValidator validator;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
@@ -37,9 +37,9 @@ public class CalculatedFieldLinkDataValidatorTest {
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("2ba09d99-6143-43dc-b645-381fc0c43ebe"));
     private final CalculatedFieldLinkId CALCULATED_FIELD_LINK_ID = new CalculatedFieldLinkId(UUID.fromString("a5609ef4-cb42-43ce-9b23-e090a4878d1c"));
 
-    @MockBean
+    @MockitoBean
     private CalculatedFieldLinkDao calculatedFieldLinkDao;
-    @SpyBean
+    @MockitoSpyBean
     private CalculatedFieldLinkDataValidator validator;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
 import org.thingsboard.server.common.data.plugin.ComponentScope;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = ComponentDescriptorDataValidator.class)
 class ComponentDescriptorDataValidatorTest {
-    @SpyBean
+    @MockitoSpyBean
     ComponentDescriptorDataValidator validator;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = CustomerDataValidator.class)
 class CustomerDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     CustomerDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -32,9 +32,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = DashboardDataValidator.class)
 class DashboardDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     DashboardDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java

@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class DeviceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     DeviceDataValidator validator;

dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -83,21 +83,21 @@ class DeviceProfileDataValidatorTest {
     private static final int port = 5685;
     private static final int portBs = 5687;
 
-    @MockBean
+    @MockitoBean
     DeviceProfileDao deviceProfileDao;
-    @MockBean
+    @MockitoBean
     DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     DeviceProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EdgeDataValidator.class)
 class EdgeDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EdgeDao edgeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EdgeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EntityViewDataValidator.class)
 class EntityViewDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EntityViewDao entityViewDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EntityViewDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,15 +36,15 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = ResourceDataValidator.class)
 class ResourceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TbResourceDao resourceDao;
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     TbTenantProfileCache tenantProfileCache;
-    @SpyBean
+    @MockitoSpyBean
     ResourceDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
@@ -34,11 +34,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = RuleChainDataValidator.class)
 class RuleChainDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     RuleChainDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantDao;
@@ -30,9 +30,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = TenantDataValidator.class)
 class TenantDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantDao tenantDao;
-    @SpyBean
+    @MockitoSpyBean
     TenantDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantProfileDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = TenantProfileDataValidator.class)
 class TenantProfileDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantProfileDao tenantProfileDao;
-    @MockBean
+    @MockitoBean
     TenantProfileService tenantProfileService;
-    @SpyBean
+    @MockitoSpyBean
     TenantProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = WidgetTypeDataValidator.class)
 class WidgetTypeDataValidatorTest {
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetTypeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = WidgetsBundleDataValidator.class)
 class WidgetsBundleDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetsBundleDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 

dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java

@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -31,11 +31,11 @@ import static org.hamcrest.Matchers.equalTo;
 @SpringBootTest(classes = DefaultEntityQueryRepository.class)
 public class DefaultEntityQueryRepositoryTest {
 
-    @MockBean
+    @MockitoBean
     NamedParameterJdbcTemplate jdbcTemplate;
-    @MockBean
+    @MockitoBean
     TransactionTemplate transactionTemplate;
-    @MockBean
+    @MockitoBean
     DefaultQueryLogComponent queryLog;
 
     @Autowired

dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.BDDMockito;
 import org.mockito.Mockito;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -52,7 +52,7 @@ public class DefaultQueryLogComponentTest {
     private TenantId tenantId;
     private SqlQueryContext ctx;
 
-    @SpyBean
+    @MockitoSpyBean
     private DefaultQueryLogComponent queryLog;
 
     @Before

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -52,13 +52,13 @@ public class CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -63,13 +63,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest {
     @MockitoSpyBean
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java

@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test