From f54dc932f7cc674b2f5b536abd2df1ca70cb9bd9 Mon Sep 17 00:00:00 2001 From: AndrewVolostnykhThingsboard Date: Wed, 27 Jan 2021 12:22:36 +0200 Subject: [PATCH] findHighestAlarmStatus: test for no alarm created, code cleaning --- .../org/thingsboard/server/dao/sql/alarm/AlarmRepository.java | 4 ++-- .../thingsboard/server/dao/service/BaseAlarmServiceTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index 0a39802915..f34048c5ad 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -81,7 +81,7 @@ public interface AlarmRepository extends CrudRepository { " AND alarm.originatorId = :entityId" + " AND ((:status) IS NULL OR alarm.status in (:status))") Set findAlarmSeverities(@Param("tenantId") UUID tenantId, - @Param("entityId") UUID entityId, - @Param("status") Set status); + @Param("entityId") UUID entityId, + @Param("status") Set status); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java index 9d20aa5799..a885ac38de 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java @@ -368,6 +368,9 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest { customerDevice.setCustomerId(customer.getId()); customerDevice = deviceService.saveDevice(customerDevice); + // no one alarms was created + Assert.assertNull(alarmService.findHighestAlarmSeverity(tenantId, customerDevice.getId(), null, null)); + Alarm alarm1 = Alarm.builder() .tenantId(tenantId) .originator(customerDevice.getId())