Browse Source
Merge pull request #8281 from YevhenBondarenko/develop/3.5-fixes
[3.5]minor tests fixes
pull/8308/head
Yevhen Bondarenko
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
-
application/src/test/java/org/thingsboard/server/controller/BaseHomePageApiTest.java
-
application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
|
|
|
@ -95,6 +95,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc |
|
|
|
private final Map<String, Map<Integer, TbAbstractSubCtx>> subscriptionsBySessionId = new ConcurrentHashMap<>(); |
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Lazy |
|
|
|
private WebSocketService wsService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
@ -249,7 +249,7 @@ public abstract class BaseHomePageApiTest extends AbstractControllerTest { |
|
|
|
Assert.assertEquals(7, listData.get(0).getTimeseries().size()); |
|
|
|
|
|
|
|
for (TsValue[] tsv : listData.get(0).getTimeseries().values()) { |
|
|
|
Assert.assertTrue(tsv.length > 1); |
|
|
|
Assert.assertTrue(tsv.length > 0); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.assertj.core.data.Offset; |
|
|
|
import org.java_websocket.client.WebSocketClient; |
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.thingsboard.rule.engine.api.NotificationCenter; |
|
|
|
@ -476,6 +477,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest { |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
|
@Ignore |
|
|
|
public void testNotificationsForALotOfUsers() throws Exception { |
|
|
|
int usersCount = 5000; |
|
|
|
|
|
|
|
@ -521,6 +523,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest { |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
|
@Ignore |
|
|
|
public void testSlackNotifications() throws Exception { |
|
|
|
NotificationSettings settings = new NotificationSettings(); |
|
|
|
SlackNotificationDeliveryMethodConfig slackConfig = new SlackNotificationDeliveryMethodConfig(); |
|
|
|
|