dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

findHighestAlarmStatus: test for no alarm created, code cleaning

Browse Source
This commit is contained in:
AndrewVolostnykhThingsboard 2021-01-27 12:22:36 +02:00
parent beeade8b07
commit f54dc932f7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
View File

@ -81,7 +81,7 @@ public interface AlarmRepository extends CrudRepository<AlarmEntity, UUID> {
" AND alarm.originatorId = :entityId" + " AND alarm.originatorId = :entityId" +
" AND ((:status) IS NULL OR alarm.status in (:status))") " AND ((:status) IS NULL OR alarm.status in (:status))")
Set<AlarmSeverity> findAlarmSeverities(@Param("tenantId") UUID tenantId, Set<AlarmSeverity> findAlarmSeverities(@Param("tenantId") UUID tenantId,
@Param("entityId") UUID entityId, @Param("entityId") UUID entityId,
@Param("status") Set<AlarmStatus> status); @Param("status") Set<AlarmStatus> status);
} }

3
dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
View File

@ -368,6 +368,9 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {
customerDevice.setCustomerId(customer.getId()); customerDevice.setCustomerId(customer.getId());
customerDevice = deviceService.saveDevice(customerDevice); customerDevice = deviceService.saveDevice(customerDevice);
// no one alarms was created
Assert.assertNull(alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null));
Alarm alarm1 = Alarm.builder() Alarm alarm1 = Alarm.builder()
.tenantId(tenantId) .tenantId(tenantId)
.originator(customerDevice.getId()) .originator(customerDevice.getId())