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

Changes to be in sync with PE version

Browse Source
This commit is contained in:
Volodymyr Babak 2022-10-07 16:33:18 +03:00
parent f5a7a0dd3b
commit 1beb4fd136
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/test/java/org/thingsboard/server/edge/BaseAlarmEdgeTest.java
View File

@ -73,13 +73,13 @@ abstract public class BaseAlarmEdgeTest extends AbstractEdgeTest {
@Test @Test
public void testAlarms() throws Exception { public void testAlarms() throws Exception {
// create alarm // create alarm
edgeImitator.expectMessageAmount(1);
Device device = findDeviceByName("Edge Device 1"); Device device = findDeviceByName("Edge Device 1");
Alarm alarm = new Alarm(); Alarm alarm = new Alarm();
alarm.setOriginator(device.getId()); alarm.setOriginator(device.getId());
alarm.setStatus(AlarmStatus.ACTIVE_UNACK); alarm.setStatus(AlarmStatus.ACTIVE_UNACK);
alarm.setType("alarm"); alarm.setType("alarm");
alarm.setSeverity(AlarmSeverity.CRITICAL); alarm.setSeverity(AlarmSeverity.CRITICAL);
edgeImitator.expectMessageAmount(1);
Alarm savedAlarm = doPost("/api/alarm", alarm, Alarm.class); Alarm savedAlarm = doPost("/api/alarm", alarm, Alarm.class);
Assert.assertTrue(edgeImitator.waitForMessages()); Assert.assertTrue(edgeImitator.waitForMessages());
AbstractMessage latestMessage = edgeImitator.getLatestMessage(); AbstractMessage latestMessage = edgeImitator.getLatestMessage();

2
application/src/test/java/org/thingsboard/server/edge/BaseRelationEdgeTest.java
View File

@ -39,7 +39,6 @@ abstract public class BaseRelationEdgeTest extends AbstractEdgeTest {
@Test @Test
public void testRelations() throws Exception { public void testRelations() throws Exception {
// create relation // create relation
edgeImitator.expectMessageAmount(1);
Device device = findDeviceByName("Edge Device 1"); Device device = findDeviceByName("Edge Device 1");
Asset asset = findAssetByName("Edge Asset 1"); Asset asset = findAssetByName("Edge Asset 1");
EntityRelation relation = new EntityRelation(); EntityRelation relation = new EntityRelation();
@ -47,6 +46,7 @@ abstract public class BaseRelationEdgeTest extends AbstractEdgeTest {
relation.setFrom(device.getId()); relation.setFrom(device.getId());
relation.setTo(asset.getId()); relation.setTo(asset.getId());
relation.setTypeGroup(RelationTypeGroup.COMMON); relation.setTypeGroup(RelationTypeGroup.COMMON);
edgeImitator.expectMessageAmount(1);
doPost("/api/relation", relation); doPost("/api/relation", relation);
Assert.assertTrue(edgeImitator.waitForMessages()); Assert.assertTrue(edgeImitator.waitForMessages());
AbstractMessage latestMessage = edgeImitator.getLatestMessage(); AbstractMessage latestMessage = edgeImitator.getLatestMessage();