Browse Source
Merge pull request #11846 from thingsboard/fix_bug_coap_tests_rc
Fix bug coap tests
pull/11888/head
Andrew Shvayka
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
8 additions and
1 deletions
-
application/src/test/java/org/thingsboard/server/transport/coap/rpc/AbstractCoapServerSideRpcIntegrationTest.java
|
|
|
@ -114,6 +114,13 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC |
|
|
|
CoapTestCallback callbackCoap = new TestCoapCallbackForRPC(client, false, protobuf); |
|
|
|
|
|
|
|
CoapObserveRelation observeRelation = client.getObserveRelation(callbackCoap); |
|
|
|
String awaitAlias = "await Two Way Rpc (client.getObserveRelation)"; |
|
|
|
await(awaitAlias) |
|
|
|
.atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS) |
|
|
|
.until(() -> processTwoWayRpcTestWithAwait(callbackCoap, observeRelation, expectedResponseResult)); |
|
|
|
} |
|
|
|
|
|
|
|
private boolean processTwoWayRpcTestWithAwait(CoapTestCallback callbackCoap, CoapObserveRelation observeRelation, String expectedResponseResult) throws Exception { |
|
|
|
String awaitAlias = "await Two Way Rpc (client.getObserveRelation)"; |
|
|
|
await(awaitAlias) |
|
|
|
.atMost(DEFAULT_WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS) |
|
|
|
@ -146,7 +153,7 @@ public abstract class AbstractCoapServerSideRpcIntegrationTest extends AbstractC |
|
|
|
validateTwoWayStateChangedNotification(callbackCoap, expectedResponseResult, actualResult); |
|
|
|
|
|
|
|
observeRelation.proactiveCancel(); |
|
|
|
assertTrue(observeRelation.isCanceled()); |
|
|
|
return observeRelation.isCanceled(); |
|
|
|
} |
|
|
|
|
|
|
|
protected void processOnLoadResponse(CoapResponse response, CoapTestClient client) { |
|
|
|
|