Browse Source

Fix invalid service tests

pull/14730/head
Viacheslav Klimov 9 months ago
parent
commit
44df43db1a
  1. 5
      dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
  2. 4
      dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java

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

@ -67,6 +67,7 @@ import org.thingsboard.server.dao.exception.DataValidationException;
import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException; import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
import org.thingsboard.server.dao.ota.OtaPackageService; import org.thingsboard.server.dao.ota.OtaPackageService;
import org.thingsboard.server.dao.service.validator.DeviceCredentialsDataValidator; import org.thingsboard.server.dao.service.validator.DeviceCredentialsDataValidator;
import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
import org.thingsboard.server.dao.tenant.TenantProfileService; import org.thingsboard.server.dao.tenant.TenantProfileService;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -97,6 +98,8 @@ public class DeviceServiceTest extends AbstractServiceTest {
@Autowired @Autowired
TenantProfileService tenantProfileService; TenantProfileService tenantProfileService;
@Autowired @Autowired
TbTenantProfileCache tenantProfileCache;
@Autowired
private CalculatedFieldService calculatedFieldService; private CalculatedFieldService calculatedFieldService;
@Autowired @Autowired
private PlatformTransactionManager platformTransactionManager; private PlatformTransactionManager platformTransactionManager;
@ -131,6 +134,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId); TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId);
defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxDevices(Long.MAX_VALUE).build()); defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxDevices(Long.MAX_VALUE).build());
tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile); tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile);
tenantProfileCache.evict(defaultTenantProfile.getId());
Device device = this.saveDevice(tenantId, "My device"); Device device = this.saveDevice(tenantId, "My device");
deleteDevice(tenantId, device); deleteDevice(tenantId, device);
@ -141,6 +145,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId); TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId);
defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxDevices(1).build()); defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxDevices(1).build());
tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile); tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile);
tenantProfileCache.evict(defaultTenantProfile.getId());
Assert.assertEquals(0, deviceService.countByTenantId(tenantId)); Assert.assertEquals(0, deviceService.countByTenantId(tenantId));

4
dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java

@ -38,6 +38,7 @@ import org.thingsboard.server.dao.device.DeviceProfileService;
import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DataValidationException;
import org.thingsboard.server.dao.ota.OtaPackageService; import org.thingsboard.server.dao.ota.OtaPackageService;
import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
import org.thingsboard.server.dao.tenant.TenantProfileService; import org.thingsboard.server.dao.tenant.TenantProfileService;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -75,6 +76,8 @@ public class OtaPackageServiceTest extends AbstractServiceTest {
OtaPackageService otaPackageService; OtaPackageService otaPackageService;
@Autowired @Autowired
TenantProfileService tenantProfileService; TenantProfileService tenantProfileService;
@Autowired
TbTenantProfileCache tenantProfileCache;
@Before @Before
public void before() { public void before() {
@ -95,6 +98,7 @@ public class OtaPackageServiceTest extends AbstractServiceTest {
TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId); TenantProfile defaultTenantProfile = tenantProfileService.findDefaultTenantProfile(tenantId);
defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxOtaPackagesInBytes(DATA_SIZE).build()); defaultTenantProfile.getProfileData().setConfiguration(DefaultTenantProfileConfiguration.builder().maxOtaPackagesInBytes(DATA_SIZE).build());
tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile); tenantProfileService.saveTenantProfile(tenantId, defaultTenantProfile);
tenantProfileCache.evict(defaultTenantProfile.getId());
Assert.assertEquals(0, otaPackageService.sumDataSizeByTenantId(tenantId)); Assert.assertEquals(0, otaPackageService.sumDataSizeByTenantId(tenantId));

Loading…
Cancel
Save