[NO ISSUE] Migrate to JUnit5 drools model (#6128)

* Migrated first parameter tests * More tests migrated to JUnit5 * More tests migrated to JUnit5 * Infrastructure to migrate parameterized tests * Migrated more tests * More tests migrated * Keep migrating * Migrated more tests * Migrated more tests * Migrated more tests * Migrated more tests * Migrated even more tests * Migrated more tests to JUnit5 * Migrated more tests. removed unused imports * More tests migrated. * More tests migrated to JUnit5 * Migrated more tests * Migrated all the tests in model codegen * All tests migrated to JUnit5 * Missed fix
apache · Oct 17, 2024 · 8b78f8a · 8b78f8a
1 parent 99c9527
commit 8b78f8a
Show file tree

Hide file tree

Showing 120 changed files with 4,864 additions and 4,081 deletions.
diff --git a/drools-model/drools-canonical-model/pom.xml b/drools-model/drools-canonical-model/pom.xml
@@ -43,11 +43,10 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>

diff --git a/.../drools-canonical-model/src/test/java/org/drools/model/operators/MatchesOperatorTest.java b/.../drools-canonical-model/src/test/java/org/drools/model/operators/MatchesOperatorTest.java
@@ -18,11 +18,11 @@
  */
 package org.drools.model.operators;
 
-import org.junit.After;
-import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class MatchesOperatorTest {
 
@@ -60,7 +60,7 @@ public void testMatchesOperatorNoCache() {
         assertThat(instance.mapSize()).isEqualTo(0);
     }
 
-    @After
+    @AfterEach
     public void resetCache() {
         MatchesOperator instance = MatchesOperator.INSTANCE;
         instance.reInitialize();

diff --git a/...s-model/drools-canonical-model/src/test/java/org/drools/model/util/OperatorUtilsTest.java b/...s-model/drools-canonical-model/src/test/java/org/drools/model/util/OperatorUtilsTest.java
@@ -20,7 +20,7 @@
 
 import java.math.BigDecimal;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/drools-model/drools-model-codegen/pom.xml b/drools-model/drools-model-codegen/pom.xml
@@ -127,36 +127,16 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
+	    <dependency>
+	        <groupId>org.junit.jupiter</groupId>
+	        <artifactId>junit-jupiter</artifactId>
+	        <scope>test</scope>
+	    </dependency>
+            <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-decisiontables</artifactId>