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

JUnit5 migration in netty-mqtt. Junit-platform.properties and logback-test.xml where added to java resource directory.

Browse Source 
Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
This commit is contained in:
Oleksandra Matviienko 2024-04-30 18:01:04 +02:00
parent a696c5191c
commit 1e581ffea4
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netty-mqtt/pom.xml
View File

@ -82,11 +82,6 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.awaitility</groupId> <groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId> <artifactId>awaitility</artifactId>

5
netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/IntegrationTestSuite.java
View File

@ -16,9 +16,10 @@
package org.thingsboard.mqtt.integration; package org.thingsboard.mqtt.integration;
import org.junit.extensions.cpsuite.ClasspathSuite; import org.junit.extensions.cpsuite.ClasspathSuite;
import org.junit.runner.RunWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@RunWith(ClasspathSuite.class) @ExtendWith(MockitoExtension.class)
@ClasspathSuite.ClassnameFilters({ @ClasspathSuite.ClassnameFilters({
"org.thingsboard.mqtt.integration.*Test", "org.thingsboard.mqtt.integration.*Test",
}) })

16
netty-mqtt/src/test/java/org/thingsboard/mqtt/integration/MqttIntegrationTest.java
View File

@ -23,10 +23,10 @@ import io.netty.handler.codec.mqtt.MqttQoS;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Assert; import org.junit.jupiter.api.Assertions;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.thingsboard.common.util.AbstractListeningExecutor; import org.thingsboard.common.util.AbstractListeningExecutor;
import org.thingsboard.mqtt.MqttClient; import org.thingsboard.mqtt.MqttClient;
import org.thingsboard.mqtt.MqttClientConfig; import org.thingsboard.mqtt.MqttClientConfig;
@ -53,7 +53,7 @@ public class MqttIntegrationTest {
AbstractListeningExecutor handlerExecutor; AbstractListeningExecutor handlerExecutor;
@Before @BeforeEach
public void init() throws Exception { public void init() throws Exception {
this.handlerExecutor = new AbstractListeningExecutor() { this.handlerExecutor = new AbstractListeningExecutor() {
@Override @Override
@ -69,7 +69,7 @@ public class MqttIntegrationTest {
this.mqttServer.init(); this.mqttServer.init();
} }
@After @AfterEach
public void destroy() throws InterruptedException { public void destroy() throws InterruptedException {
if (this.mqttClient != null) { if (this.mqttClient != null) {
this.mqttClient.disconnect(); this.mqttClient.disconnect();
@ -100,7 +100,7 @@ public class MqttIntegrationTest {
log.warn("Waiting for messages acknowledgments..."); log.warn("Waiting for messages acknowledgments...");
boolean awaitResult = latch.await(10, TimeUnit.SECONDS); boolean awaitResult = latch.await(10, TimeUnit.SECONDS);
Assert.assertTrue(awaitResult); Assertions.assertTrue(awaitResult);
log.warn("Messages are delivered successfully..."); log.warn("Messages are delivered successfully...");
//when //when
@ -111,7 +111,7 @@ public class MqttIntegrationTest {
List<MqttMessageType> allReceivedEvents = this.mqttServer.getEventsFromClient(); List<MqttMessageType> allReceivedEvents = this.mqttServer.getEventsFromClient();
long disconnectCount = allReceivedEvents.stream().filter(type -> type == MqttMessageType.DISCONNECT).count(); long disconnectCount = allReceivedEvents.stream().filter(type -> type == MqttMessageType.DISCONNECT).count();
Assert.assertEquals(1, disconnectCount); Assertions.assertEquals(1, disconnectCount);
} }
private Future<Void> publishMsg() { private Future<Void> publishMsg() {

3
netty-mqtt/src/test/resources/junit-platform.properties Normal file
View File

@ -0,0 +1,3 @@
junit.jupiter.execution.parallel.enabled = true
junit.jupiter.execution.parallel.mode.default = concurrent
junit.jupiter.execution.parallel.mode.classes.default = concurrent

14
netty-mqtt/src/test/resources/logback-test.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="console"/>
</root>
</configuration>