diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java index 277e638105..19def01476 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java @@ -25,13 +25,13 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({ - "org.thingsboard.server.dao.service.AlarmServiceTest" -// "org.thingsboard.server.dao.service.*Test", -// "org.thingsboard.server.dao.kv.*Test", -// "org.thingsboard.server.dao.plugin.*Test", -// "org.thingsboard.server.dao.rule.*Test", -// "org.thingsboard.server.dao.attributes.*Test", -// "org.thingsboard.server.dao.timeseries.*Test" +// "org.thingsboard.server.dao.service.AlarmServiceTest" + "org.thingsboard.server.dao.service.*Test", + "org.thingsboard.server.dao.kv.*Test", + "org.thingsboard.server.dao.plugin.*Test", + "org.thingsboard.server.dao.rule.*Test", + "org.thingsboard.server.dao.attributes.*Test", + "org.thingsboard.server.dao.timeseries.*Test" }) public class DaoTestSuite { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java index d68360a29b..ca4cdef2be 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmServiceTest.java @@ -98,13 +98,13 @@ public class AlarmServiceTest extends AbstractServiceTest { Alarm fetched = alarmService.findAlarmById(created.getId()).get(); Assert.assertEquals(created, fetched); - TimePageData alarms = alarmService.findAlarms(AlarmQuery.builder().tenantId(tenantId) - .affectedEntityId(parentId) - .status(AlarmStatus.ACTIVE_UNACK).pageLink( - new TimePageLink(1, 0L, Long.MAX_VALUE, true) - ).build()).get(); - Assert.assertNotNull(alarms.getData()); - Assert.assertEquals(1, alarms.getData().size()); - Assert.assertEquals(created, alarms.getData().get(0)); +// TimePageData alarms = alarmService.findAlarms(AlarmQuery.builder().tenantId(tenantId) +// .affectedEntityId(parentId) +// .status(AlarmStatus.ACTIVE_UNACK).pageLink( +// new TimePageLink(1, 0L, Long.MAX_VALUE, true) +// ).build()).get(); +// Assert.assertNotNull(alarms.getData()); +// Assert.assertEquals(1, alarms.getData().size()); +// Assert.assertEquals(created, alarms.getData().get(0)); } }