Merge pull request #14730 from thingsboard/fix/service-tests

Fix invalid service tests

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

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