Browse Source
Merge pull request #14727 from MazurenkoNick/fix-edge-stats-test
Fix edge stats integration test
pull/14731/head
Viacheslav Klimov
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
4 deletions
-
application/src/test/java/org/thingsboard/server/edge/EdgeStatsIntegrationTest.java
-
application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
|
|
@ -78,8 +78,6 @@ public class EdgeStatsIntegrationTest extends AbstractEdgeTest { |
|
|
assertEquals(EXPECTED_MSGS_TMP_FAILED, counters.getMsgsTmpFailed().get()); |
|
|
assertEquals(EXPECTED_MSGS_TMP_FAILED, counters.getMsgsTmpFailed().get()); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
Thread.sleep(1000); |
|
|
|
|
|
|
|
|
|
|
|
// WHEN
|
|
|
// WHEN
|
|
|
edgeStatsService.reportStats(); |
|
|
edgeStatsService.reportStats(); |
|
|
|
|
|
|
|
|
|
|
|
@ -438,7 +438,7 @@ public class EdgeImitator { |
|
|
Optional<T> result; |
|
|
Optional<T> result; |
|
|
lock.lock(); |
|
|
lock.lock(); |
|
|
try { |
|
|
try { |
|
|
result = (Optional<T>) downlinkMsgs.stream().filter(downlinkMsg -> downlinkMsg.getClass().isAssignableFrom(tClass)).findAny(); |
|
|
result = (Optional<T>) downlinkMsgs.stream().filter(downlinkMsg -> tClass.isAssignableFrom(downlinkMsg.getClass())).findAny(); |
|
|
} finally { |
|
|
} finally { |
|
|
lock.unlock(); |
|
|
lock.unlock(); |
|
|
} |
|
|
} |
|
|
@ -450,7 +450,7 @@ public class EdgeImitator { |
|
|
List<T> result; |
|
|
List<T> result; |
|
|
lock.lock(); |
|
|
lock.lock(); |
|
|
try { |
|
|
try { |
|
|
result = (List<T>) downlinkMsgs.stream().filter(downlinkMsg -> downlinkMsg.getClass().isAssignableFrom(tClass)).collect(Collectors.toList()); |
|
|
result = (List<T>) downlinkMsgs.stream().filter(downlinkMsg -> tClass.isAssignableFrom(downlinkMsg.getClass())).collect(Collectors.toList()); |
|
|
} finally { |
|
|
} finally { |
|
|
lock.unlock(); |
|
|
lock.unlock(); |
|
|
} |
|
|
} |
|
|
|