tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Technical cleanup of annotations in test code

pull/15663/head
Oleksandra Matviienko 2 weeks ago
parent
4bb3b1aa52
commit
fb10d40716
57 changed files with 332 additions and 278 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
  2. 6
      application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
  3. 4
      application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
  4. 4
      application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
  5. 6
      application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
  6. 4
      application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
  7. 6
      application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
  8. 4
      application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
  9. 4
      application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
  10. 10
      application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
  11. 8
      application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
  12. 4
      application/src/test/java/org/thingsboard/server/controller/WebSocketApiTest.java
  13. 41
      application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
  14. 32
      application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
  15. 34
      application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
  16. 28
      application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
  17. 6
      application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
  18. 43
      application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
  19. 4
      application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
  20. 6
      application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
  21. 58
      application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
  22. 6
      application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
  23. 6
      application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
  24. 4
      application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
  25. 4
      application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
  26. 4
      application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
  27. 4
      application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
  28. 4
      dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
  29. 4
      dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
  30. 10
      dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
  31. 4
      dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
  32. 4
      dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
  33. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
  34. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
  35. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
  36. 18
      dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
  37. 4
      dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
  38. 10
      dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
  39. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
  40. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
  41. 20
      dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
  42. 12
      dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
  43. 12
      dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
  44. 14
      dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
  45. 10
      dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
  46. 8
      dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
  47. 12
      dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
  48. 10
      dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
  49. 8
      dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
  50. 4
      dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
  51. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
  52. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
  53. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
  54. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
  55. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
  56. 8
      dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
  57. 4
      edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java

10
application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
View File

@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
import org.springframework.boot.info.BuildProperties;
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.cluster.TbClusterService;
import org.thingsboard.server.common.data.EdgeUtils;
import org.thingsboard.server.common.data.EntityType;
@ -55,13 +55,13 @@ import static org.mockito.Mockito.times;
@Slf4j
public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
@SpyBean
@MockitoSpyBean
protected TbClusterService tbClusterService;
@SpyBean
@MockitoSpyBean
protected AuditLogService auditLogService;
@MockBean
@MockitoBean
BuildProperties buildProperties;
protected final String msgErrorPermission = "You don't have permission to perform this operation!";

6
application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
View File

@ -26,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.TenantProfile;
@ -71,9 +71,9 @@ public class AuditLogControllerTest extends AbstractControllerTest {
@Autowired
private AuditLogDao auditLogDao;
@Getter
@SpyBean
@MockitoSpyBean
private SqlPartitioningRepository partitioningRepository;
@SpyBean
@MockitoSpyBean
private AuditLogsCleanUpService auditLogsCleanUpService;
@Value("#{${sql.audit_logs.partition_size} * 60 * 60 * 1000}")

4
application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
View File

@ -16,7 +16,7 @@
package org.thingsboard.server.controller;
import lombok.Getter;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.context.TestPropertySource;
import org.thingsboard.server.dao.service.DaoSqlTest;
import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitioningRepository;
@ -30,7 +30,7 @@ import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitionin
public class AuditLogControllerTest_DedicatedEventsDataSource extends AuditLogControllerTest {
@Getter
@SpyBean
@MockitoSpyBean
private DedicatedEventsSqlPartitioningRepository partitioningRepository;
}

4
application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
View File

@ -20,7 +20,7 @@ import org.assertj.core.data.Offset;
import org.junit.After;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.http.HttpHeaders;
import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
import org.thingsboard.common.util.JacksonUtil;
@ -50,7 +50,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@DaoSqlTest
public class AuthControllerTest extends AbstractControllerTest {
@SpyBean
@MockitoSpyBean
private UserCredentialsDao userCredentialsDao;
@After

6
application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
View File

@ -31,7 +31,7 @@ import org.mockito.AdditionalAnswers;
import org.mockito.ArgumentCaptor;
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.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import org.springframework.test.context.ContextConfiguration;
@ -115,10 +115,10 @@ public class DeviceControllerTest extends AbstractControllerTest {
private Tenant savedTenant;
private User tenantAdmin;
@SpyBean
@MockitoSpyBean
private GatewayNotificationsService gatewayNotificationsService;
@SpyBean
@MockitoSpyBean
private DeviceStateService deviceStateService;
@Autowired

4
application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
View File

@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.context.TestPropertySource;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.AttributeScope;
@ -66,7 +66,7 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
@Autowired
private EdgeEventDao edgeEventDao;
@SpyBean
@MockitoSpyBean
private SqlPartitioningRepository partitioningRepository;
@Autowired
private EdgeEventsCleanUpService edgeEventsCleanUpService;

6
application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
View File

@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.rule.engine.api.MailService;
import org.thingsboard.rule.engine.api.SmsService;
@ -85,10 +85,10 @@ public class HomePageApiTest extends AbstractControllerTest {
@Autowired
private OAuth2ClientService oAuth2ClientService;
@MockBean
@MockitoBean
private MailService mailService;
@MockBean
@MockitoBean
private SmsService smsService;
private static final int DEFAULT_DASHBOARDS_COUNT = 0;

4
application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
View File

@ -18,7 +18,7 @@ package org.thingsboard.server.controller;
import com.google.common.util.concurrent.SettableFuture;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.thingsboard.server.common.data.sync.vc.RepositoryAuthMethod;
import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
import org.thingsboard.server.dao.service.DaoSqlTest;
@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@DaoSqlTest
public class RepositorySettingsTest extends AbstractControllerTest {
@MockBean
@MockitoBean
private GitVersionControlQueueService gitVersionControlQueueService;
@Test

4
application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
View File

@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
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.common.data.DataConstants;
import org.thingsboard.server.common.data.Device;
@ -56,7 +56,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
private final String REQUEST_BODY = "{\"request\":\"download\"}";
private final String RESPONSE_BODY = "{\"response\":\"downloadOk\"}";
@SpyBean
@MockitoSpyBean
private RuleEngineCallService ruleEngineCallService;
@Test

10
application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
View File

@ -22,8 +22,8 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.beans.factory.annotation.Autowired;
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.springframework.cache.CacheManager;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;
@ -65,15 +65,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@DaoSqlTest
public class TwoFactorAuthConfigTest extends AbstractControllerTest {
@SpyBean
@MockitoSpyBean
private TotpTwoFaProvider totpTwoFactorAuthProvider;
@MockBean
@MockitoBean
private SmsService smsService;
@Autowired
private CacheManager cacheManager;
@Autowired
private TwoFaConfigManager twoFaConfigManager;
@SpyBean
@MockitoSpyBean
private TwoFactorAuthService twoFactorAuthService;
@Before

8
application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
View File

@ -23,8 +23,8 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.beans.factory.annotation.Autowired;
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.springframework.web.util.UriComponentsBuilder;
import org.thingsboard.rule.engine.api.SmsService;
import org.thingsboard.server.common.data.StringUtils;
@ -82,9 +82,9 @@ public class TwoFactorAuthTest extends AbstractControllerTest {
@Autowired
private TwoFaConfigManager twoFaConfigManager;
@SpyBean
@MockitoSpyBean
private TwoFactorAuthService twoFactorAuthService;
@MockBean
@MockitoBean
private SmsService smsService;
@Autowired
private AuditLogService auditLogService;

4
application/src/test/java/org/thingsboard/server/controller/WebSocketApiTest.java
View File

@ -28,7 +28,7 @@ import org.junit.Before;
import org.junit.Test;
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.test.context.TestPropertySource;
import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
import org.thingsboard.common.util.JacksonUtil;
@ -99,7 +99,7 @@ public class WebSocketApiTest extends AbstractControllerTest {
@Autowired
private TelemetrySubscriptionService tsService;
@SpyBean
@MockitoSpyBean
private TimeseriesService timeseriesService;
Device device;

41
application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
View File

@ -21,8 +21,8 @@ import org.assertj.core.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.thingsboard.server.cluster.TbClusterService;
@ -73,28 +73,43 @@ import static org.mockito.Mockito.when;
@Slf4j
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = DeviceProvisionServiceImpl.class)
@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class)
public class DeviceProvisionServiceTest {
@MockBean
@org.springframework.context.annotation.Configuration
static class ContextConfiguration {
@org.springframework.context.annotation.Bean
public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider,
DeviceProfileService deviceProfileService,
DeviceService deviceService,
DeviceCredentialsService deviceCredentialsService,
AttributesService attributesService,
AuditLogService auditLogService,
PartitionService partitionService) {
return new DeviceProvisionServiceImpl(producerProvider, deviceProfileService, deviceService,
deviceCredentialsService, attributesService, auditLogService, partitionService);
}
}
@MockitoBean
protected TbQueueProducerProvider producerProvider;
@MockBean
@MockitoBean
protected TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToRuleEngineMsg>> ruleEngineMsgProducer;
@MockBean
@MockitoBean
protected TbClusterService clusterService;
@MockBean
@MockitoBean
protected DeviceProfileService deviceProfileService;
@MockBean
@MockitoBean
protected DeviceService deviceService;
@MockBean
@MockitoBean
protected DeviceCredentialsService deviceCredentialsService;
@MockBean
@MockitoBean
protected AttributesService attributesService;
@MockBean
@MockitoBean
protected AuditLogService auditLogService;
@MockBean
@MockitoBean
protected PartitionService partitionService;
@SpyBean
@MockitoSpyBean
DeviceProvisionServiceImpl service;
private String[] chain;

32
application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
View File

@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.cluster.TbClusterService;
@ -69,35 +69,35 @@ import static org.thingsboard.server.common.data.alarm.AlarmCommentSubType.UNASS
@SpringJUnitConfig(DefaultTbAlarmService.class)
class DefaultTbAlarmServiceTest {
@MockBean
@MockitoBean
TbLogEntityActionService logEntityActionService;
@MockBean
@MockitoBean
EdgeService edgeService;
@MockBean
@MockitoBean
AlarmService alarmService;
@MockBean
@MockitoBean
TbAlarmCommentService alarmCommentService;
@MockBean
@MockitoBean
AlarmSubscriptionService alarmSubscriptionService;
@MockBean
@MockitoBean
CustomerService customerService;
@MockBean
@MockitoBean
TbClusterService tbClusterService;
@MockBean
@MockitoBean
EntitiesVersionControlService vcService;
@MockBean
@MockitoBean
AccessControlService accessControlService;
@MockBean
@MockitoBean
TenantService tenantService;
@MockBean
@MockitoBean
AssetService assetService;
@MockBean
@MockitoBean
DeviceService deviceService;
@MockBean
@MockitoBean
AssetProfileService assetProfileService;
@MockBean
@MockitoBean
DeviceProfileService deviceProfileService;
@MockBean
@MockitoBean
EntityService entityService;
@Autowired

34
application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
View File

@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
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.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@ -65,35 +65,35 @@ import static org.mockito.Mockito.when;
})
public class DefaultTbAlarmCommentServiceTest {
@MockBean
@MockitoBean
protected DbCallbackExecutorService dbExecutor;
@MockBean
@MockitoBean
protected TbLogEntityActionService logEntityActionService;
@MockBean
@MockitoBean
protected AlarmService alarmService;
@MockBean
@MockitoBean
protected AlarmCommentService alarmCommentService;
@MockBean
@MockitoBean
protected AlarmSubscriptionService alarmSubscriptionService;
@MockBean
@MockitoBean
protected CustomerService customerService;
@MockBean
@MockitoBean
protected TbClusterService tbClusterService;
@MockBean
@MockitoBean
private AccessControlService accessControlService;
@MockBean
@MockitoBean
private TenantService tenantService;
@MockBean
@MockitoBean
private AssetService assetService;
@MockBean
@MockitoBean
private DeviceService deviceService;
@MockBean
@MockitoBean
private AssetProfileService assetProfileService;
@MockBean
@MockitoBean
private DeviceProfileService deviceProfileService;
@MockBean
@MockitoBean
private EntityService entityService;
@SpyBean
@MockitoSpyBean
DefaultTbAlarmCommentService service;
@Test

28
application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
View File

@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
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.RuleChainId;
import org.thingsboard.server.common.data.id.TenantId;
@ -52,30 +52,30 @@ import static org.mockito.BDDMockito.willReturn;
@SpringBootTest(classes = {InstallScripts.class, RuleChainDataValidator.class})
class InstallScriptsTest {
@MockBean
@MockitoBean
RuleChainService ruleChainService;
@MockBean
@MockitoBean
DashboardService dashboardService;
@MockBean
@MockitoBean
WidgetTypeService widgetTypeService;
@MockBean
@MockitoBean
WidgetsBundleService widgetsBundleService;
@MockBean
@MockitoBean
OAuth2ConfigTemplateService oAuth2TemplateService;
@MockBean
@MockitoBean
ResourceService resourceService;
@MockBean
@MockitoBean
ImageService imageService;
@MockBean
@MockitoBean
ResourcesUpdater resourcesUpdater;
@SpyBean
@MockitoSpyBean
InstallScripts installScripts;
@MockBean
@MockitoBean
TenantService tenantService;
@MockBean
@MockitoBean
ApiLimitService apiLimitService;
@SpyBean
@MockitoSpyBean
RuleChainDataValidator ruleChainValidator;
TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));

6
application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
View File

@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
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.test.context.TestPropertySource;
import org.thingsboard.rule.engine.api.JobManager;
import org.thingsboard.server.common.data.Device;
@ -68,10 +68,10 @@ public class JobManagerTest extends AbstractControllerTest {
@Autowired
private JobManager jobManager;
@SpyBean
@MockitoSpyBean
private TestTaskProcessor taskProcessor;
@SpyBean
@MockitoSpyBean
private JobStatsService jobStatsService;
@Autowired

43
application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
View File

@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
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.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.thingsboard.common.util.JacksonUtil;
@ -56,6 +56,7 @@ import org.thingsboard.server.queue.discovery.PartitionService;
import org.thingsboard.server.queue.discovery.TopicService;
import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
import org.thingsboard.server.service.ota.OtaPackageStateService;
import org.thingsboard.server.service.profile.TbAssetProfileCache;
import org.thingsboard.server.service.profile.TbDeviceProfileCache;
@ -67,6 +68,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@ -87,30 +89,45 @@ public class DefaultTbClusterServiceTest {
public static final String TRANSPORT = "transport";
@MockBean
@MockitoBean
protected TbDeviceProfileCache deviceProfileCache;
@MockBean
@MockitoBean
protected TbAssetProfileCache assetProfileCache;
@MockBean
@MockitoBean
protected GatewayNotificationsService gatewayNotificationsService;
@MockBean
@MockitoBean
protected EdgeService edgeService;
@MockBean
@MockitoBean
protected PartitionService partitionService;
@MockBean
@MockitoBean
protected TbQueueProducerProvider producerProvider;
@MockBean
@MockitoBean
protected TbRuleEngineProducerService ruleEngineProducerService;
@MockBean
@MockitoBean
protected TbTransactionalCache<EdgeId, String> edgeCache;
@MockBean
@MockitoBean
protected CalculatedFieldService calculatedFieldService;
@SpyBean
@MockitoBean
protected TopicService topicService;
@SpyBean
@MockitoBean
protected OtaPackageStateService otaPackageStateService;
@MockitoSpyBean
protected TbClusterService clusterService;
@org.junit.Before
public void setUp() {
lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
ServiceType serviceType = invocation.getArgument(0);
String serviceId = invocation.getArgument(1);
return new TopicPartitionInfo(serviceType.name().toLowerCase() + ".notifications." + serviceId, null, null, false);
});
lenient().when(topicService.getCalculatedFieldNotificationsTopic(any())).thenAnswer(invocation -> {
String serviceId = invocation.getArgument(0);
return new TopicPartitionInfo("calculated_field.notifications." + serviceId, null, null, false);
});
}
@Test
public void testOnQueueChangeSingleMonolith() {
when(partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE)).thenReturn(Sets.newHashSet(MONOLITH));

4
application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
View File

@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
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.test.context.TestPropertySource;
import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
import org.thingsboard.common.util.JacksonUtil;
@ -55,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
"usage.stats.report.urgent_interval=1"
})
public class DefaultSmsServiceTest extends AbstractControllerTest {
@SpyBean
@MockitoSpyBean
private DefaultSmsService defaultSmsService;
@Autowired
private AdminSettingsService adminSettingsService;

6
application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
View File

@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
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.rule.engine.debug.TbMsgGeneratorNode;
import org.thingsboard.rule.engine.debug.TbMsgGeneratorNodeConfiguration;
@ -127,9 +127,9 @@ import static org.mockito.Mockito.verify;
@DaoSqlTest
public class ExportImportServiceSqlTest extends AbstractControllerTest {
@SpyBean
@MockitoSpyBean
private EntityActionService entityActionService;
@SpyBean
@MockitoSpyBean
private OtaPackageStateService otaPackageStateService;
@Autowired

58
application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
View File

@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.thingsboard.server.cache.ota.OtaPackageDataCache;
@ -69,38 +69,60 @@ import static org.mockito.Mockito.when;
@Slf4j
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = DefaultTransportApiService.class)
@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class)
public class DefaultTransportApiServiceTest {
@MockBean
@org.springframework.context.annotation.Configuration
static class ContextConfiguration {
@org.springframework.context.annotation.Bean
public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache,
TbTenantProfileCache tenantProfileCache,
TbApiUsageStateService apiUsageStateService,
DeviceService deviceService,
DeviceProfileService deviceProfileService,
RelationService relationService,
DeviceCredentialsService deviceCredentialsService,
TbClusterService tbClusterService,
DeviceProvisionService deviceProvisionService,
ResourceService resourceService,
OtaPackageService otaPackageService,
OtaPackageDataCache otaPackageDataCache,
QueueService queueService) {
return new DefaultTransportApiService(deviceProfileCache, tenantProfileCache, apiUsageStateService,
deviceService, deviceProfileService, relationService, deviceCredentialsService, tbClusterService,
deviceProvisionService, resourceService, otaPackageService, otaPackageDataCache, queueService);
}
}
@MockitoBean
protected TbDeviceProfileCache deviceProfileCache;
@MockBean
@MockitoBean
protected TbTenantProfileCache tenantProfileCache;
@MockBean
@MockitoBean
protected TbApiUsageStateService apiUsageStateService;
@MockBean
@MockitoBean
protected DeviceService deviceService;
@MockBean
@MockitoBean
protected DeviceProfileService deviceProfileService;
@MockBean
@MockitoBean
protected RelationService relationService;
@MockBean
@MockitoBean
protected DeviceCredentialsService deviceCredentialsService;
@MockBean
@MockitoBean
protected DbCallbackExecutorService dbCallbackExecutorService;
@MockBean
@MockitoBean
protected TbClusterService tbClusterService;
@MockBean
@MockitoBean
protected DeviceProvisionService deviceProvisionService;
@MockBean
@MockitoBean
protected ResourceService resourceService;
@MockBean
@MockitoBean
protected OtaPackageService otaPackageService;
@MockBean
@MockitoBean
protected OtaPackageDataCache otaPackageDataCache;
@MockBean
@MockitoBean
protected QueueService queueService;
@SpyBean
@MockitoSpyBean
DefaultTransportApiService service;
private String certificateChain;

6
application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
View File

@ -21,7 +21,7 @@ import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.test.context.TestPropertySource;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.alarm.Alarm;
@ -50,9 +50,9 @@ import static org.mockito.Mockito.verify;
})
public class AlarmsCleanUpServiceTest extends AbstractControllerTest {
@SpyBean
@MockitoSpyBean
private AlarmsCleanUpService alarmsCleanUpService;
@SpyBean
@MockitoSpyBean
private AlarmService alarmService;
@Autowired
private AlarmDao alarmDao;

6
application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
View File

@ -37,7 +37,7 @@ import org.junit.Assert;
import org.junit.Before;
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.http.HttpStatus;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
@ -133,10 +133,10 @@ import static org.thingsboard.server.transport.lwm2m.ota.AbstractOtaLwM2MIntegra
})
public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportIntegrationTest {
@SpyBean
@MockitoSpyBean
protected LwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
@SpyBean
@MockitoSpyBean
protected DefaultLwM2mUplinkMsgHandler defaultUplinkMsgHandlerTest;
@Autowired

4
application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
View File

@ -22,7 +22,7 @@ import org.eclipse.leshan.core.link.LinkParser;
import org.eclipse.leshan.core.link.lwm2m.DefaultLwM2mLinkParser;
import org.junit.Before;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile;
import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
@ -103,7 +103,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
protected String idVer_19_0_0;
@SpyBean
@MockitoSpyBean
protected LwM2mTransportServerHelper lwM2mTransportServerHelperTest;
@Before

4
application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
View File

@ -24,7 +24,7 @@ import org.eclipse.leshan.server.registration.RegistrationStore;
import org.eclipse.leshan.server.registration.RegistrationUpdate;
import org.junit.Assert;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile;
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
@ -49,7 +49,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClient
@Slf4j
public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecurityLwM2MIntegrationTest {
@SpyBean
@MockitoSpyBean
private RegistrationStore registrationStoreTest;
protected void basicTestConnectionDifferentPort(Lwm2mDeviceProfileTransportConfiguration transportConfiguration,

4
application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
View File

@ -22,7 +22,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.TestPropertySource;
@ -71,7 +71,7 @@ public class MqttGatewayRateLimitsTest extends AbstractControllerTest {
private Device gateway;
private String gatewayAccessToken;
@SpyBean
@MockitoSpyBean
private NotificationRuleProcessor notificationRuleProcessor;
@Before

4
application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
View File

@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
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.common.data.Device;
import org.thingsboard.server.common.data.id.DeviceId;
@ -67,7 +67,7 @@ public abstract class AbstractMqttTimeseriesIntegrationTest extends AbstractMqtt
protected static final String MALFORMED_JSON_PAYLOAD = "{\"key1\":, \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
" \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
@SpyBean
@MockitoSpyBean
GatewayMetricsService gatewayMetricsService;
@Before

4
dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
View File

@ -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;
}

4
dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
View File

@ -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;
}

10
dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
View File

@ -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

4
dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
View File

@ -27,7 +27,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;
@ -111,7 +111,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
private CalculatedFieldService calculatedFieldService;
@Autowired
private PlatformTransactionManager platformTransactionManager;
@SpyBean
@MockitoSpyBean
private DeviceCredentialsDataValidator validator;
private IdComparator<Device> idComparator = new IdComparator<>();

4
dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
View File

@ -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

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

@ -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"));

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

@ -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"));

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

@ -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;

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

@ -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"));

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

@ -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

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

@ -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"));

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

@ -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"));

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

@ -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;

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

@ -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;
@ -86,21 +86,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"));

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

@ -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"));

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

@ -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"));

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

@ -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"));

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

@ -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"));

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

@ -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"));

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

@ -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"));

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

@ -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"));

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

@ -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

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

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
View File

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
View File

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
View File

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
View File

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
View File

@ -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

8
dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
View File

@ -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

4
edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
View File

@ -20,7 +20,7 @@ import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestExecutionListeners;
@ -81,7 +81,7 @@ public abstract class AbstractEDQTest {
protected DefaultEdqsRepository repository;
@Autowired
protected EdqsMapper edqsMapper;
@MockBean
@MockitoBean
private DummyEdqsStatsService edqsStatsService;
protected final TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());

Write Preview
Loading…
Cancel
Save