[incubator-kie-drools-6136] Migrate drools tests to JUnit5 - apache#9 (…

…apache#6191) * Migrated last tests. A number of tests disabled * Opened issue for failing test
rgdoliveira · Dec 17, 2024 · e834124 · e834124
1 parent 0d0e64f
commit e834124
Show file tree

Hide file tree

Showing 35 changed files with 861 additions and 751 deletions.
diff --git a/drools-test-coverage/test-compiler-integration/pom.xml b/drools-test-coverage/test-compiler-integration/pom.xml
@@ -119,26 +119,11 @@
       <artifactId>xstream</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.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -190,17 +175,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/...a/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java b/...a/org/drools/compiler/integrationtests/concurrency/AccumulateFunctionConcurrencyTest.java
@@ -22,10 +22,9 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
-import org.kie.test.testcategory.TurtleTestCategory;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class AccumulateFunctionConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...est/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java b/...est/java/org/drools/compiler/integrationtests/concurrency/ConsequenceConcurrencyTest.java
@@ -24,11 +24,10 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class ConsequenceConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java b/...org/drools/compiler/integrationtests/concurrency/ConsequenceWithAndOrConcurrencyTest.java
@@ -24,12 +24,11 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class ConsequenceWithAndOrConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java b/...test/java/org/drools/compiler/integrationtests/concurrency/ConstraintConcurrencyTest.java
@@ -22,10 +22,9 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
-import org.kie.test.testcategory.TurtleTestCategory;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class ConstraintConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/.../org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java b/.../org/drools/compiler/integrationtests/concurrency/ConstraintWithAndOrConcurrencyTest.java
@@ -22,12 +22,11 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class ConstraintWithAndOrConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...ools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java b/...ools/compiler/integrationtests/concurrency/ConstraintWithAndOrJittingConcurrencyTest.java
@@ -22,12 +22,11 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class ConstraintWithAndOrJittingConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...n/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java b/...n/src/test/java/org/drools/compiler/integrationtests/concurrency/EvalConcurrencyTest.java
@@ -22,10 +22,9 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
-import org.kie.test.testcategory.TurtleTestCategory;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class EvalConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/.../java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java b/.../java/org/drools/compiler/integrationtests/concurrency/FromAccumulateConcurrencyTest.java
@@ -22,10 +22,9 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
-import org.kie.test.testcategory.TurtleTestCategory;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class FromAccumulateConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java b/...src/test/java/org/drools/compiler/integrationtests/concurrency/GlobalConcurrencyTest.java
@@ -30,18 +30,17 @@
 import org.drools.testcoverage.common.model.Result;
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.KieBaseUtil;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class GlobalConcurrencyTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GlobalConcurrencyTest.class);

diff --git a/...drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java b/...drools/compiler/integrationtests/concurrency/MVELDateClassFieldReaderConcurrencyTest.java
@@ -23,11 +23,10 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class MVELDateClassFieldReaderConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...ools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java b/...ools/compiler/integrationtests/concurrency/MVELNumberClassFieldReaderConcurrencyTest.java
@@ -22,11 +22,10 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class MVELNumberClassFieldReaderConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...ools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java b/...ools/compiler/integrationtests/concurrency/MVELObjectClassFieldReaderConcurrencyTest.java
@@ -22,11 +22,10 @@
 
 import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
 import org.drools.testcoverage.common.util.TestParametersUtil2;
-import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.kie.api.runtime.KieSession;
-import org.kie.test.testcategory.TurtleTestCategory;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public class MVELObjectClassFieldReaderConcurrencyTest extends BaseConcurrencyTest {
 
     public static Stream<KieBaseTestConfiguration> parameters() {

diff --git a/...ompiler/integrationtests/incrementalcompilation/AbstractAddRemoveGenerated2RulesTest.java b/...ompiler/integrationtests/incrementalcompilation/AbstractAddRemoveGenerated2RulesTest.java
@@ -26,17 +26,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.kie.test.testcategory.TurtleTestCategory;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@Category(TurtleTestCategory.class)
+@EnabledIfEnvironmentVariable(named = "runTurtleTests", matches = "*")
 public abstract class AbstractAddRemoveGenerated2RulesTest {
 
-    private final String rule1;
-    private final String rule2;
+    private String rule1;
+    private String rule2;
 
-    public AbstractAddRemoveGenerated2RulesTest(final ConstraintsPair constraintsPair) {
+    private void generateRules(final ConstraintsPair constraintsPair) {
         final String rule1 = "package " + TestUtil.RULES_PACKAGE_NAME + ";" +
                 "global java.util.List list\n" +
                 "rule " + TestUtil.RULE1_NAME + " \n" +
@@ -59,11 +60,11 @@ public AbstractAddRemoveGenerated2RulesTest(final ConstraintsPair constraintsPai
 
     // This takes only three different constraints - this is intentional, because it is needed to
     // keep the number of combinations at reasonable number.
-    public static Collection<ConstraintsPair[]> generateRulesConstraintsCombinations(final String constraint1,
+    public static Collection<ConstraintsPair> generateRulesConstraintsCombinations(final String constraint1,
                                                                                      final String constraint2,
                                                                                      final String constraint3) {
         final Set<ConstraintsPair> constraintsPairs = new HashSet<>();
-        final List<ConstraintsPair[]> result = new ArrayList<>();
+        final List<ConstraintsPair> result = new ArrayList<>();
 
         final List<String> constraintsList = new ArrayList<>();
         constraintsList.add(constraint1);
@@ -75,7 +76,7 @@ public static Collection<ConstraintsPair[]> generateRulesConstraintsCombinations
             for (final String constraintsRule2 : constraintsCombinations) {
                 final ConstraintsPair constraintsPair = new ConstraintsPair(constraintsRule1, constraintsRule2);
                 if (constraintsPairs.add(constraintsPair)) {
-                    result.add(new ConstraintsPair[]{constraintsPair});
+                    result.add(constraintsPair);
                 }
             }
         }
@@ -98,57 +99,81 @@ private static List<String> getConstraintsCombinations(final List<String> constr
 
     /////////////////////////// TESTS //////////////////////////////////
 
-    @Test(timeout = 40000)
-    public void testInsertFactsFireRulesRemoveRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsFireRulesRemoveRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsFireRulesRemoveRules1(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRules2(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRules3(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testInsertFactsFireRulesRemoveRulesRevertedRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsFireRulesRemoveRulesRevertedRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsFireRulesRemoveRules1(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRules2(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRules3(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testFireRulesInsertFactsFireRulesRemoveRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testFireRulesInsertFactsFireRulesRemoveRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules1(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules2(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules3(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testFireRulesInsertFactsFireRulesRemoveRulesRevertedRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testFireRulesInsertFactsFireRulesRemoveRulesRevertedRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules1(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules2(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.fireRulesInsertFactsFireRulesRemoveRules3(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testInsertFactsRemoveRulesFireRulesRemoveRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsRemoveRulesFireRulesRemoveRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules1(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules2(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules3(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testInsertFactsRemoveRulesFireRulesRemoveRulesRevertedRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsRemoveRulesFireRulesRemoveRulesRevertedRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules1(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules2(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsRemoveRulesFireRulesRemoveRules3(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testInsertFactsFireRulesRemoveRulesReinsertRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsFireRulesRemoveRulesReinsertRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules1(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules2(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules3(rule1, rule2, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, null, getFacts());
     }
 
-    @Test(timeout = 40000)
-    public void testInsertFactsFireRulesRemoveRulesReinsertRulesRevertedRules() {
+    @ParameterizedTest(name = "KieBase type={0}")
+	@MethodSource("parameters")
+    @Timeout(40000)
+    public void testInsertFactsFireRulesRemoveRulesReinsertRulesRevertedRules(ConstraintsPair constraintsPair) {
+    	generateRules(constraintsPair);
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules1(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules2(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());
         AddRemoveTestCases.insertFactsFireRulesRemoveRulesReinsertRules3(rule2, rule1, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME, null, getFacts());