From 44df43db1aad9c91137990fdd296d33c1fb8d0b1 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Mon, 5 Jan 2026 15:25:32 +0200 Subject: [PATCH] Fix invalid service tests --- .../thingsboard/server/dao/service/DeviceServiceTest.java | 5 +++++ .../server/dao/service/OtaPackageServiceTest.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java index 32767043d7..8b48e724f7 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java +++ b/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)); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java index 70f2ff119d..66fccf313c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/OtaPackageServiceTest.java +++ b/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));