简柏林 / thingskit · Commits

Commit dbbb8e3aad419f2670cf47d95714628b03026716

Authored by Volodymyr Babak
1 parent c7882333

Added support for device profile update msg

Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
@@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.security.Authority; @@ -38,6 +38,7 @@ import org.thingsboard.server.common.data.security.Authority;
38 import org.thingsboard.server.dao.model.ModelConstants; 38 import org.thingsboard.server.dao.model.ModelConstants;
39 import org.thingsboard.server.edge.imitator.EdgeImitator; 39 import org.thingsboard.server.edge.imitator.EdgeImitator;
40 import org.thingsboard.server.gen.edge.AssetUpdateMsg; 40 import org.thingsboard.server.gen.edge.AssetUpdateMsg;
  41 +import org.thingsboard.server.gen.edge.DeviceProfileUpdateMsg;
41 import org.thingsboard.server.gen.edge.DeviceUpdateMsg; 42 import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
42 import org.thingsboard.server.gen.edge.RuleChainUpdateMsg; 43 import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
43 import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg; 44 import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
@@ -672,22 +673,24 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest { @@ -672,22 +673,24 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
672 edgeImitator.ignoreType(UserCredentialsUpdateMsg.class); 673 edgeImitator.ignoreType(UserCredentialsUpdateMsg.class);
673 edgeImitator.expectMessageAmount(7); 674 edgeImitator.expectMessageAmount(7);
674 edgeImitator.connect(); 675 edgeImitator.connect();
675 - edgeImitator.waitForMessages(); 676 + Assert.assertTrue(edgeImitator.waitForMessages());
676 677
677 Assert.assertEquals(7, edgeImitator.getDownlinkMsgs().size()); 678 Assert.assertEquals(7, edgeImitator.getDownlinkMsgs().size());
678 Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent()); 679 Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent());
  680 + Assert.assertTrue(edgeImitator.findMessageByType(DeviceProfileUpdateMsg.class).isPresent());
679 Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent()); 681 Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent());
680 Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent()); 682 Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent());
681 Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent()); 683 Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());
682 684
683 edgeImitator.getDownlinkMsgs().clear(); 685 edgeImitator.getDownlinkMsgs().clear();
684 686
685 - edgeImitator.expectMessageAmount(4); 687 + edgeImitator.expectMessageAmount(7);
686 doPost("/api/edge/sync/" + edge.getId()); 688 doPost("/api/edge/sync/" + edge.getId());
687 - edgeImitator.waitForMessages(); 689 + Assert.assertTrue(edgeImitator.waitForMessages());
688 690
689 - Assert.assertEquals(4, edgeImitator.getDownlinkMsgs().size()); 691 + Assert.assertEquals(7, edgeImitator.getDownlinkMsgs().size());
690 Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent()); 692 Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent());
  693 + Assert.assertTrue(edgeImitator.findMessageByType(DeviceProfileUpdateMsg.class).isPresent());
691 Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent()); 694 Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent());
692 Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent()); 695 Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent());
693 Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent()); 696 Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());