More tests migrated to Junit5

apache · Nov 4, 2024 · 563ce66 · 563ce66
1 parent c7a57ce
commit 563ce66
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 104 deletions.
diff --git a/...-compiler-integration/src/test/java/org/drools/mvel/integrationtests/DynamicEvalTest.java b/...-compiler-integration/src/test/java/org/drools/mvel/integrationtests/DynamicEvalTest.java
@@ -23,9 +23,9 @@
 import org.drools.core.impl.InternalRuleBase;
 import org.drools.core.impl.RuleBaseFactory;
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.conf.EventProcessingOption;
@@ -57,7 +57,7 @@ public class DynamicEvalTest {
     KieBaseConfiguration baseConfig;
     KieSessionConfiguration sessionConfig;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
 
         baseConfig = RuleBaseFactory.newKnowledgeBaseConfiguration();
@@ -91,7 +91,7 @@ public void loadPackages( Resource res, ResourceType type ) {
 
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (session != null) {
             session.dispose();

diff --git a/...-integration/src/test/java/org/drools/mvel/integrationtests/session/AgendaFilterTest.java b/...-integration/src/test/java/org/drools/mvel/integrationtests/session/AgendaFilterTest.java
@@ -45,30 +45,30 @@
 
 public class AgendaFilterTest {
 
-	public static Stream<KieBaseTestConfiguration> parameters() {
+    public static Stream<KieBaseTestConfiguration> parameters() {
         return TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAgendaFilterRuleNameStartsWith(KieBaseTestConfiguration kieBaseTestConfiguration) {
         testAgendaFilter(kieBaseTestConfiguration, new RuleNameStartsWithAgendaFilter("B"), "Bbb");
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAgendaFilterRuleNameEndsWith(KieBaseTestConfiguration kieBaseTestConfiguration) {
         testAgendaFilter(kieBaseTestConfiguration, new RuleNameEndsWithAgendaFilter("a"), "Aaa");
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAgendaFilterRuleNameMatches(KieBaseTestConfiguration kieBaseTestConfiguration) {
         testAgendaFilter(kieBaseTestConfiguration, new RuleNameMatchesAgendaFilter(".*b."), "Bbb");
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAgendaFilterRuleNameEquals(KieBaseTestConfiguration kieBaseTestConfiguration) {
         testAgendaFilter(kieBaseTestConfiguration, new RuleNameEqualsAgendaFilter("Aaa"), "Aaa");
     }
@@ -93,7 +93,7 @@ private void testAgendaFilter(KieBaseTestConfiguration kieBaseTestConfiguration,
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testDirectFiringIgnoresAgendaFilter(KieBaseTestConfiguration kieBaseTestConfiguration) {
         // DROOLS-6510
         String str =

diff --git a/...r-integration/src/test/java/org/drools/mvel/integrationtests/session/BasicUpdateTest.java b/...r-integration/src/test/java/org/drools/mvel/integrationtests/session/BasicUpdateTest.java
@@ -61,9 +61,9 @@ public void tearDown() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateTheOnlyFactTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Person person = new Person("George", 18);
         final FactHandle factPerson = ksession.insert(person);
         assertThat(ksession.getObjects()).hasSize(1);
@@ -80,9 +80,9 @@ public void updateTheOnlyFactTest(KieBaseTestConfiguration kieBaseTestConfigurat
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateWithNullTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Person person = new Person("George", 18);
         final FactHandle factPerson = ksession.insert(person);
         verifyFactsPresentInSession(1, Person.class);
@@ -91,9 +91,9 @@ public void updateWithNullTest(KieBaseTestConfiguration kieBaseTestConfiguration
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateWithDifferentClassGetQueryResultsTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Person person = new Person("George", 18);
         final FactHandle fact = ksession.insert(person);
 
@@ -114,9 +114,9 @@ public void updateWithDifferentClassGetQueryResultsTest(KieBaseTestConfiguration
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateWithDifferentClassGetObjectsTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Person person = new Person("George", 18);
         final FactHandle factPerson = ksession.insert(person);
         final Person personToBeVerified = verifyFactsPresentInSession(1, Person.class).get(0);
@@ -131,9 +131,9 @@ public void updateWithDifferentClassGetObjectsTest(KieBaseTestConfiguration kieB
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateFireRulesTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Person george = new Person("George", 17);
         final Person henry = new Person("Henry", 25);
         final FactHandle georgeFact = ksession.insert(george);
@@ -158,9 +158,9 @@ public void updateFireRulesTest(KieBaseTestConfiguration kieBaseTestConfiguratio
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void updateFactOnRuleFireTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         final Cheese camembert = new Cheese("Camembert", 19);
         final Cheese cheddar = new Cheese("Cheddar", 45);
 

diff --git a/...-integration/src/test/java/org/drools/mvel/integrationtests/session/CrossProductTest.java b/...-integration/src/test/java/org/drools/mvel/integrationtests/session/CrossProductTest.java
@@ -42,7 +42,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testCrossProductRemovingIdentityEquals(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_CrossProductRemovingIdentityEquals.drl");
         KieSession session = kbase.newKieSession();

diff --git a/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java b/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java
@@ -68,15 +68,15 @@ public void setUp(KieBaseTestConfiguration kieBaseTestConfiguration) {
 
     @AfterEach
     public void tearDown() {
-    	if (ksession != null) {
-    		ksession.dispose();
-    	}
+        if (ksession != null) {
+            ksession.dispose();
+        }
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void deleteFactTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         ksession.insert(new Person("Petr", 25));
 
         FactHandle george = ksession.insert(new Person("George", 19));
@@ -91,9 +91,9 @@ public void deleteFactTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void deleteFactTwiceTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         FactHandle george = ksession.insert(new Person("George", 19));
         QueryResults results = ksession.getQueryResults("countPerson");
         assertThat(results).isNotEmpty();
@@ -110,16 +110,16 @@ public void deleteFactTwiceTest(KieBaseTestConfiguration kieBaseTestConfiguratio
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void deleteNullFactTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->ksession.delete(null));
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void deleteUpdatedFactTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         FactHandle person = ksession.insert(new Person("George", 18));
 
         ksession.update(person, new Person("John", 21));
@@ -135,9 +135,9 @@ public void deleteUpdatedFactTest(KieBaseTestConfiguration kieBaseTestConfigurat
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void deleteUpdatedFactDifferentClassTest(KieBaseTestConfiguration kieBaseTestConfiguration) {
-    	setUp(kieBaseTestConfiguration);
+        setUp(kieBaseTestConfiguration);
         FactHandle fact = ksession.insert(new Person("George", 18));
 
         assertThat(ksession.getObjects()).hasSize(1);
@@ -154,7 +154,7 @@ public void deleteUpdatedFactDifferentClassTest(KieBaseTestConfiguration kieBase
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testRetractLeftTuple(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         // JBRULES-3420
         final String str =
@@ -194,7 +194,7 @@ public void testRetractLeftTuple(KieBaseTestConfiguration kieBaseTestConfigurati
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAssertRetract(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         // postponed while I sort out KnowledgeHelperFixer
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "assert_retract.drl");
@@ -222,7 +222,7 @@ public void testAssertRetract(KieBaseTestConfiguration kieBaseTestConfiguration)
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testEmptyAfterRetractInIndexedMemory(KieBaseTestConfiguration kieBaseTestConfiguration) {
         String str = "";
         str += "package org.simple \n";
@@ -252,7 +252,7 @@ public void testEmptyAfterRetractInIndexedMemory(KieBaseTestConfiguration kieBas
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testModifyRetractAndModifyInsert(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_ModifyRetractInsert.drl");
         KieSession ksession = kbase.newKieSession();
@@ -272,7 +272,7 @@ public void testModifyRetractAndModifyInsert(KieBaseTestConfiguration kieBaseTes
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testModifyRetractWithFunction(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_RetractModifyWithFunction.drl");
         KieSession ksession = kbase.newKieSession();

diff --git a/...er-integration/src/test/java/org/drools/mvel/integrationtests/session/EntryPointTest.java b/...er-integration/src/test/java/org/drools/mvel/integrationtests/session/EntryPointTest.java
@@ -39,7 +39,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testEntryPointWithVarIN(KieBaseTestConfiguration kieBaseTestConfiguration) {
         final String str = "package org.drools.mvel.compiler.test;\n" +
                 "\n" +

diff --git a/...r-integration/src/test/java/org/drools/mvel/integrationtests/session/FieldAccessTest.java b/...r-integration/src/test/java/org/drools/mvel/integrationtests/session/FieldAccessTest.java
@@ -43,7 +43,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     // this isn't possible, we can only narrow with type safety, not widen.
     // unless typesafe=false is used
     public void testAccessFieldsFromSubClass(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
@@ -72,7 +72,7 @@ public void testAccessFieldsFromSubClass(KieBaseTestConfiguration kieBaseTestCon
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testAccessClassTypeField(KieBaseTestConfiguration kieBaseTestConfiguration) {
         final String str = "package org.drools.mvel.compiler\n" +
                 "rule r1\n" +
@@ -90,7 +90,7 @@ public void testAccessClassTypeField(KieBaseTestConfiguration kieBaseTestConfigu
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testGenericsOption(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         // JBRULES-3579
         final String str = "import org.drools.mvel.compiler.*;\n" +

diff --git a/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/InsertTest.java b/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/InsertTest.java
@@ -44,7 +44,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testInsert(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         String drl = "";
         drl += "package test\n";
@@ -81,7 +81,7 @@ public void testInsert(KieBaseTestConfiguration kieBaseTestConfiguration) throws
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testInsertionOrder(KieBaseTestConfiguration kieBaseTestConfiguration) {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_InsertionOrder.drl");
         KieSession ksession = kbase.newKieSession();
@@ -113,7 +113,7 @@ public void testInsertionOrder(KieBaseTestConfiguration kieBaseTestConfiguration
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testInsertFinalClassInstance(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_FinalClass.drl");
         KieSession ksession = kbase.newKieSession();

diff --git a/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/LocaleTest.java b/...mpiler-integration/src/test/java/org/drools/mvel/integrationtests/session/LocaleTest.java
@@ -42,7 +42,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testLatinLocale(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         final Locale defaultLoc = Locale.getDefault();
 

diff --git a/...egration/src/test/java/org/drools/mvel/integrationtests/session/RuleRuntimeEventTest.java b/...egration/src/test/java/org/drools/mvel/integrationtests/session/RuleRuntimeEventTest.java
@@ -45,7 +45,7 @@ public static Stream<KieBaseTestConfiguration> parameters() {
     }
 
     @ParameterizedTest(name = "KieBase type={0}")
-	@MethodSource("parameters")
+    @MethodSource("parameters")
     public void testEventModel(KieBaseTestConfiguration kieBaseTestConfiguration) throws Exception {
         KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "test_EventModel.drl");
         KieSession wm = kbase.newKieSession();