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

fixed bug with extra UserCredentialsUpdataMsg

Browse Source
This commit is contained in:
Bohdan Smetaniuk 2020-10-06 14:25:07 +03:00
parent 6081ed1ad0
commit a7a7cb2ad5
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java
View File

@ -40,6 +40,7 @@ import org.thingsboard.server.edge.imitator.EdgeImitator;
import org.thingsboard.server.gen.edge.AssetUpdateMsg; import org.thingsboard.server.gen.edge.AssetUpdateMsg;
import org.thingsboard.server.gen.edge.DeviceUpdateMsg; import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
import org.thingsboard.server.gen.edge.RuleChainUpdateMsg; import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
import org.thingsboard.server.gen.edge.UserUpdateMsg; import org.thingsboard.server.gen.edge.UserUpdateMsg;
import java.util.ArrayList; import java.util.ArrayList;
@ -667,11 +668,12 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
+ "/asset/" + savedAsset.getId().getId().toString(), Asset.class); + "/asset/" + savedAsset.getId().getId().toString(), Asset.class);
EdgeImitator edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret()); EdgeImitator edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret());
edgeImitator.expectMessageAmount(8); edgeImitator.ignoreType(UserCredentialsUpdateMsg.class);
edgeImitator.expectMessageAmount(7);
edgeImitator.connect(); edgeImitator.connect();
edgeImitator.waitForMessages(); edgeImitator.waitForMessages();
Assert.assertEquals(8, edgeImitator.getDownlinkMsgs().size()); Assert.assertEquals(7, edgeImitator.getDownlinkMsgs().size());
Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent()); Assert.assertTrue(edgeImitator.findMessageByType(RuleChainUpdateMsg.class).isPresent());
Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent()); Assert.assertTrue(edgeImitator.findMessageByType(DeviceUpdateMsg.class).isPresent());
Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent()); Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent());
@ -689,6 +691,7 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent()); Assert.assertTrue(edgeImitator.findMessageByType(AssetUpdateMsg.class).isPresent());
Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent()); Assert.assertTrue(edgeImitator.findMessageByType(UserUpdateMsg.class).isPresent());
edgeImitator.allowIgnoredTypes();
edgeImitator.disconnect(); edgeImitator.disconnect();
doDelete("/api/device/" + savedDevice.getId().getId().toString()) doDelete("/api/device/" + savedDevice.getId().getId().toString())

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

@ -128,7 +128,7 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret()); edgeImitator = new EdgeImitator("localhost", 7070, edge.getRoutingKey(), edge.getSecret());
// should be less, but events from SyncEdgeService stack with events from controller. will be fixed in next releases // should be less, but events from SyncEdgeService stack with events from controller. will be fixed in next releases
edgeImitator.expectMessageAmount(8); edgeImitator.expectMessageAmount(7);
edgeImitator.connect(); edgeImitator.connect();
} }

16
application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
View File

@ -65,6 +65,7 @@ public class EdgeImitator {
private CountDownLatch messagesLatch; private CountDownLatch messagesLatch;
private CountDownLatch responsesLatch; private CountDownLatch responsesLatch;
private List<Class<? extends AbstractMessage>> ignoredTypes;
@Getter @Getter
private EdgeConfiguration configuration; private EdgeConfiguration configuration;
@ -78,6 +79,7 @@ public class EdgeImitator {
messagesLatch = new CountDownLatch(0); messagesLatch = new CountDownLatch(0);
responsesLatch = new CountDownLatch(0); responsesLatch = new CountDownLatch(0);
downlinkMsgs = new ArrayList<>(); downlinkMsgs = new ArrayList<>();
ignoredTypes = new ArrayList<>();
this.routingKey = routingKey; this.routingKey = routingKey;
this.routingSecret = routingSecret; this.routingSecret = routingSecret;
setEdgeCredentials("rpcHost", host); setEdgeCredentials("rpcHost", host);
@ -226,8 +228,10 @@ public class EdgeImitator {
} }
private ListenableFuture<Void> saveDownlinkMsg(AbstractMessage message) { private ListenableFuture<Void> saveDownlinkMsg(AbstractMessage message) {
downlinkMsgs.add(message); if (!ignoredTypes.contains(message.getClass())) {
messagesLatch.countDown(); downlinkMsgs.add(message);
messagesLatch.countDown();
}
return Futures.immediateFuture(null); return Futures.immediateFuture(null);
} }
@ -253,4 +257,12 @@ public class EdgeImitator {
return downlinkMsgs.get(downlinkMsgs.size() - 1); return downlinkMsgs.get(downlinkMsgs.size() - 1);
} }
public void ignoreType(Class<? extends AbstractMessage> type) {
ignoredTypes.add(type);
}
public void allowIgnoredTypes() {
ignoredTypes.clear();
}
} }