From 98011203848e1b03af0e6e04c15a4ffb95a73c6d Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Wed, 22 Jun 2022 17:07:14 +0300
Subject: [PATCH] Fixed tests

---
 .../controller/BaseEntityRelationControllerTest.java       | 2 +-
 .../server/common/msg/tools/RateLimitsTest.java            | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java
index 1a032a392b..65558e1955 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityRelationControllerTest.java
@@ -45,7 +45,7 @@ import java.util.List;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @Slf4j
-public class BaseEntityRelationControllerTest extends AbstractControllerTest {
+public abstract class BaseEntityRelationControllerTest extends AbstractControllerTest {
 
     public static final String BASE_DEVICE_NAME = "Test dummy device";
 
diff --git a/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java b/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
index c8583527f1..cf81690826 100644
--- a/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
+++ b/common/message/src/test/java/org/thingsboard/server/common/msg/tools/RateLimitsTest.java
@@ -15,8 +15,11 @@
  */
 package org.thingsboard.server.common.msg.tools;
 
+import org.awaitility.pollinterval.FixedPollInterval;
+import org.awaitility.pollinterval.PollInterval;
 import org.junit.Test;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -39,10 +42,11 @@ public class RateLimitsTest {
         assertThat(rateLimits.tryConsume()).as("new token is available").isFalse();
 
         int expectedRefillTime = (int) (((double) period / capacity) * 1000);
-        int gap = 100;
+        int gap = 500;
 
         for (int i = 0; i < capacity; i++) {
             await("token refill for rate limit " + rateLimitConfig)
+                    .pollInterval(new FixedPollInterval(10, TimeUnit.MILLISECONDS))
                     .atLeast(expectedRefillTime - gap, TimeUnit.MILLISECONDS)
                     .atMost(expectedRefillTime + gap, TimeUnit.MILLISECONDS)
                     .untilAsserted(() -> {
@@ -70,6 +74,7 @@ public class RateLimitsTest {
         int gap = 500;
 
         await("tokens refill for rate limit " + rateLimitConfig)
+                .pollInterval(new FixedPollInterval(10, TimeUnit.MILLISECONDS))
                 .atLeast(expectedRefillTime - gap, TimeUnit.MILLISECONDS)
                 .atMost(expectedRefillTime + gap, TimeUnit.MILLISECONDS)
                 .untilAsserted(() -> {