Merge pull request #10644 from zzzeebra/Junit4to5-rule-engine-api

JUnit5 migration in rule-engine-api

rule-engine/rule-engine-api/pom.xml

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

rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java

@@ -16,10 +16,10 @@
 package org.thingsboard.rule.engine.api.util;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.Test;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
@@ -29,7 +29,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TbNodeUtilsTest {
 
     private static final String DATA_VARIABLE_TEMPLATE = "$[%s]";
@@ -46,7 +46,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value data_value", result);
+        Assertions.assertEquals("ABC metadata_value data_value", result);
     }
 
     @Test
@@ -60,7 +60,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals(pattern, result);
+        Assertions.assertEquals(pattern, result);
     }
 
     @Test
@@ -74,7 +74,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value data_value", result);
+        Assertions.assertEquals("ABC metadata_value data_value", result);
     }
 
     @Test
@@ -95,7 +95,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value value3", result);
+        Assertions.assertEquals("ABC metadata_value value3", result);
     }
 
     @Test
@@ -116,7 +116,7 @@ public class TbNodeUtilsTest {
 
         TbMsg msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, TenantId.SYS_TENANT_ID, md, JacksonUtil.toString(node));
         String result = TbNodeUtils.processPattern(pattern, msg);
-        Assert.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
+        Assertions.assertEquals("ABC metadata_value $[key1.key2[0].key3]", result);
     }
 
     @Test

rule-engine/rule-engine-api/src/test/resources/junit-platform.properties

@@ -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

rule-engine/rule-engine-api/src/test/resources/logback-test.xml

@@ -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>