This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new f8c9fbf8f0 [incubator-kie-drools #6136] Migrate tests to Junit5
(#6138)
f8c9fbf8f0 is described below
commit f8c9fbf8f09c6e4d9e560c1435afe0d6d72c31e2
Author: Paolo Bizzarri <[email protected]>
AuthorDate: Mon Oct 28 18:53:24 2024 +0100
[incubator-kie-drools #6136] Migrate tests to Junit5 (#6138)
* Migrated drools-examples-api
* Migrated drools-fastutil
* Migrated drools-kiesession
* Migrated drools-compiler
* Migrated drools-legacy-test-util
* Migrated drools-metric
* Migrated drools-mvel
* Migrated drools-templates
* Migrated drools-tms
* Migrated drools-wiring
* Fixed issue with tests
* Better solution to migrate test
---
drools-compiler/pom.xml | 5 +
.../java/org/drools/compiler/CompilerTest.java | 2 +-
.../lang/descr/CompositePackageDescrTest.java | 13 +-
.../compiler/lang/descr/PackageDescrTest.java | 2 +-
.../default-kiesession-from-file/pom.xml | 11 +-
.../DefaultKieSessionFromByteArrayExampleTest.java | 4 +-
.../DefaultKieSessionFromFileExampleTest.java | 6 +-
drools-examples-api/default-kiesession/pom.xml | 11 +-
.../DefaultKieSessionExampleTest.java | 6 +-
.../DefaultKieSessionFromFSExampleTest.java | 6 +-
.../kie-module-from-multiple-files/pom.xml | 11 +-
.../KieModuleFromMultipleFilesExampleTest.java | 6 +-
drools-examples-api/kiebase-inclusion/pom.xml | 10 +-
.../KieBaseInclusionExampleTest.java | 6 +-
.../kiecontainer-from-kierepo/pom.xml | 11 +-
.../KieContainerFromKieRepoExampleTest.java | 6 +-
drools-examples-api/kiefilesystem-example/pom.xml | 10 +-
.../kiefilesystem/KieFileSystemExampleTest.java | 6 +-
drools-examples-api/kiemodulemodel-example/pom.xml | 11 +-
.../kiemodulemodel/KieModuleModelExampleTest.java | 6 +-
drools-examples-api/multiple-kbases/pom.xml | 10 +-
.../multiplekbases/MultipleKbasesExampleTest.java | 22 +--
.../named-kiesession-from-file/pom.xml | 11 +-
.../NamedKieSessionFromFileExampleTest.java | 6 +-
drools-examples-api/named-kiesession/pom.xml | 10 +-
.../NamedKieSessionExampleTest.java | 6 +-
drools-examples-api/pom.xml | 2 -
drools-examples-api/reactive-kiesession/pom.xml | 10 +-
.../ReactiveKieSessionExampleTest.java | 6 +-
drools-fastutil/pom.xml | 11 +-
.../drools/fastutil/FastUtilTreeMemoryTest.java | 2 +-
drools-kiesession/pom.xml | 12 +-
.../BetaConstraintsPositionalIndexingTest.java | 14 +-
.../java/org/drools/kiesession/AddRemoveTest.java | 2 +-
.../org/drools/kiesession/CrossProductTest.java | 6 +-
.../InternalRuleBaseConfigurationTest.java | 2 +-
.../kiesession/NodeSegmentUnlinkingTest.java | 2 +-
.../kiesession/PropertyChangeListenerTest.java | 6 +-
.../drools/kiesession/QueryElementNodeTest.java | 6 +-
.../test/java/org/drools/kiesession/ReteTest.java | 12 +-
.../ReteooRuleBaseMultiThreadedTest.java | 10 +-
.../drools/kiesession/ReteooWorkingMemoryTest.java | 8 +-
.../kiesession/RuleRuntimeEventSupportTest.java | 2 +-
.../org/drools/kiesession/RuleUnlinkingTest.java | 2 +-
.../RuleUnlinkingWithSegmentMemoryTest.java | 2 +-
drools-legacy-test-util/pom.xml | 11 +-
.../compiler/command/MoreBatchExecutionTest.java | 6 +-
.../compiler/command/SimpleBatchExecutionTest.java | 10 +-
drools-metric/pom.xml | 12 +-
.../java/org/drools/metric/AbstractMetricTest.java | 8 +-
.../src/test/java/org/drools/metric/CloneTest.java | 2 +-
.../java/org/drools/metric/ConstraintsTest.java | 2 +-
.../java/org/drools/metric/MetricLogUtilsTest.java | 2 +-
drools-mvel/pom.xml | 10 +-
.../test/java/org/drools/mvel/BuildUtilsTest.java | 6 +-
.../org/drools/mvel/MVELCalendarCoercionTest.java | 2 +-
.../java/org/drools/mvel/MVELDateCoercionTest.java | 2 +-
.../drools/mvel/asm/ClassFieldInspectorTest.java | 2 +-
.../drools/mvel/asm/KnowledgeHelperFixerTest.java | 2 +-
.../drools/mvel/asm/LambdaIntrospectorTest.java | 2 +-
.../org/drools/mvel/asm/MethodComparerTest.java | 2 +-
.../builder/dialect/asm/ClassGeneratorTest.java | 2 +-
.../builder/dialect/asm/InvokerGeneratorTest.java | 2 +-
.../dialect/java/JavaAccumulateBuilderTest.java | 6 +-
.../java/JavaConsequenceBuilderPRAlwaysTest.java | 2 +-
.../dialect/java/JavaConsequenceBuilderTest.java | 2 +-
.../builder/dialect/java/JavaExprAnalyzerTest.java | 2 +-
.../java/JavaForMvelDialectConfigurationTest.java | 2 +-
.../dialect/mvel/MVELAccumulateBuilderTest.java | 2 +-
.../dialect/mvel/MVELConsequenceBuilderTest.java | 2 +-
.../rule/builder/dialect/mvel/MVELDebugTest.java | 2 +-
.../builder/dialect/mvel/MVELEvalBuilderTest.java | 6 +-
.../builder/dialect/mvel/MVELExprAnalyzerTest.java | 6 +-
.../dialect/mvel/MVELSalienceBuilderTest.java | 6 +-
.../evaluators/TemporalEvaluatorFactoryTest.java | 2 +-
.../org/drools/mvel/field/FieldFactoryTest.java | 2 +-
.../java/org/drools/mvel/field/FieldValueTest.java | 6 +-
.../integrationtests/LogicTransformerTest.java | 2 +-
.../command/MoreBatchExecutionPersistenceTest.java | 99 +++++++++-
.../SimpleBatchExecutionPersistenceTest.java | 213 ++++++++++++++++++++-
drools-templates/pom.xml | 8 +-
.../drools/template/DataProviderCompilerTest.java | 6 +-
.../template/jdbc/ResultSetGeneratorTest.java | 2 +-
.../drools/template/model/FunctionsRenderTest.java | 2 +-
.../drools/template/model/PackageRenderTest.java | 2 +-
.../drools/template/model/QueriesRenderTest.java | 2 +-
.../org/drools/template/model/RuleRenderTest.java | 2 +-
.../drools/template/model/SnippetBuilderTest.java | 2 +-
.../drools/template/parser/ColumnFactoryTest.java | 2 +-
.../template/parser/DefaultGeneratorTest.java | 6 +-
.../parser/DefaultTemplateContainerTest.java | 2 +-
.../template/parser/ExternalSheetListenerTest.java | 6 +-
.../drools/template/parser/RuleTemplateTest.java | 2 +-
drools-tms/pom.xml | 12 +-
.../test/java/org/drools/tms/EqualityKeyTest.java | 2 +-
.../java/org/drools/tms/LazyTMSEnablingTest.java | 6 +-
drools-wiring/drools-wiring-api/pom.xml | 10 +-
.../api/classloader/ProjectClassLoaderTest.java | 2 +-
drools-wiring/drools-wiring-dynamic/pom.xml | 10 +-
.../java/org/drools/dynamic/ClassLoaderTest.java | 7 +-
drools-wiring/drools-wiring-static/pom.xml | 10 +-
.../statics/DummyByteArrayClassLoaderTest.java | 2 +-
102 files changed, 589 insertions(+), 294 deletions(-)
diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
index 557640fdfb..cfa70e99f1 100644
--- a/drools-compiler/pom.xml
+++ b/drools-compiler/pom.xml
@@ -144,6 +144,11 @@
<artifactId>drools-wiring-dynamic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/drools-compiler/src/test/java/org/drools/compiler/CompilerTest.java
b/drools-compiler/src/test/java/org/drools/compiler/CompilerTest.java
index f637cbe3b5..1650e04e3a 100644
--- a/drools-compiler/src/test/java/org/drools/compiler/CompilerTest.java
+++ b/drools-compiler/src/test/java/org/drools/compiler/CompilerTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.compiler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.internal.utils.KieHelper;
diff --git
a/drools-compiler/src/test/java/org/drools/compiler/lang/descr/CompositePackageDescrTest.java
b/drools-compiler/src/test/java/org/drools/compiler/lang/descr/CompositePackageDescrTest.java
index c39dc3789a..8db4b817ac 100644
---
a/drools-compiler/src/test/java/org/drools/compiler/lang/descr/CompositePackageDescrTest.java
+++
b/drools-compiler/src/test/java/org/drools/compiler/lang/descr/CompositePackageDescrTest.java
@@ -20,10 +20,11 @@ package org.drools.compiler.lang.descr;
import org.drools.drl.ast.descr.PackageDescr;
import org.drools.io.ByteArrayResource;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.drools.util.StringUtils.generateUUID;
public class CompositePackageDescrTest {
@@ -31,7 +32,7 @@ public class CompositePackageDescrTest {
private static final String NAMESPACE = "namespace";
private CompositePackageDescr compositePackageDescr;
- @Before
+ @BeforeEach
public void setup() {
compositePackageDescr = new CompositePackageDescr(new
ByteArrayResource(), new PackageDescr(NAMESPACE));
}
@@ -50,7 +51,7 @@ public class CompositePackageDescrTest {
assertThat(compositePackageDescr.getPreferredPkgUUID().get()).isEqualTo(pkgUUID);
}
- @Test(expected = RuntimeException.class)
+ @Test
public void addPackageDescrDifferentPkgUUID() {
String pkgUUID = generateUUID();
PackageDescr first = new PackageDescr(NAMESPACE);
@@ -64,6 +65,8 @@ public class CompositePackageDescrTest {
second.setPreferredPkgUUID(pkgUUID);
assertThat(second.getPreferredPkgUUID().isPresent()).isTrue();
assertThat(second.getPreferredPkgUUID().get()).isNotEqualTo(first.getPreferredPkgUUID().get());
- compositePackageDescr.addPackageDescr(new ByteArrayResource(), second);
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> {
+ compositePackageDescr.addPackageDescr(new ByteArrayResource(),
second);
+ });
}
}
\ No newline at end of file
diff --git
a/drools-compiler/src/test/java/org/drools/compiler/lang/descr/PackageDescrTest.java
b/drools-compiler/src/test/java/org/drools/compiler/lang/descr/PackageDescrTest.java
index b5e7cee120..c79c2c556c 100644
---
a/drools-compiler/src/test/java/org/drools/compiler/lang/descr/PackageDescrTest.java
+++
b/drools-compiler/src/test/java/org/drools/compiler/lang/descr/PackageDescrTest.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
import org.drools.drl.ast.descr.PackageDescr;
import org.drools.drl.ast.dsl.PackageDescrBuilder;
import org.drools.drl.ast.dsl.impl.PackageDescrBuilderImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-examples-api/default-kiesession-from-file/pom.xml
b/drools-examples-api/default-kiesession-from-file/pom.xml
index c9155eafa1..1d2625481b 100644
--- a/drools-examples-api/default-kiesession-from-file/pom.xml
+++ b/drools-examples-api/default-kiesession-from-file/pom.xml
@@ -41,12 +41,11 @@
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java
b/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java
index 76093b9989..5735e26adb 100644
---
a/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java
+++
b/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java
@@ -26,14 +26,14 @@ import java.io.InputStream;
import java.io.PrintStream;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieModule;
import org.kie.api.builder.KieRepository;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DefaultKieSessionFromByteArrayExampleTest {
diff --git
a/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExampleTest.java
b/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExampleTest.java
index 4c5256c239..b3ab286bad 100644
---
a/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExampleTest.java
+++
b/drools-examples-api/default-kiesession-from-file/src/test/java/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.defaultkiesessionfromfile;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class DefaultKieSessionFromFileExampleTest {
diff --git a/drools-examples-api/default-kiesession/pom.xml
b/drools-examples-api/default-kiesession/pom.xml
index ba5b8452f3..9b40e31228 100644
--- a/drools-examples-api/default-kiesession/pom.xml
+++ b/drools-examples-api/default-kiesession/pom.xml
@@ -41,12 +41,11 @@
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionExampleTest.java
b/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionExampleTest.java
index c319068dab..1767b87961 100644
---
a/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionExampleTest.java
+++
b/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.defaultkiesession;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class DefaultKieSessionExampleTest {
diff --git
a/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionFromFSExampleTest.java
b/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionFromFSExampleTest.java
index 985c3eaaa8..edaf89ea33 100644
---
a/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionFromFSExampleTest.java
+++
b/drools-examples-api/default-kiesession/src/test/java/org/drools/example/api/defaultkiesession/DefaultKieSessionFromFSExampleTest.java
@@ -18,18 +18,18 @@
*/
package org.drools.example.api.defaultkiesession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.runtime.KieSession;
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
-
public class DefaultKieSessionFromFSExampleTest {
private static final String NL = System.getProperty("line.separator");
diff --git a/drools-examples-api/kie-module-from-multiple-files/pom.xml
b/drools-examples-api/kie-module-from-multiple-files/pom.xml
index 7cc5e54f7c..ea3cf74a87 100644
--- a/drools-examples-api/kie-module-from-multiple-files/pom.xml
+++ b/drools-examples-api/kie-module-from-multiple-files/pom.xml
@@ -42,18 +42,17 @@
<artifactId>drools-engine-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Needed by the example as it uses this kjar -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>kiebase-inclusion</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/kie-module-from-multiple-files/src/test/java/org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExampleTest.java
b/drools-examples-api/kie-module-from-multiple-files/src/test/java/org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExampleTest.java
index 403cd9392f..8245690dd2 100644
---
a/drools-examples-api/kie-module-from-multiple-files/src/test/java/org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExampleTest.java
+++
b/drools-examples-api/kie-module-from-multiple-files/src/test/java/org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.kiemodulefrommultiplefiles;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class KieModuleFromMultipleFilesExampleTest {
diff --git a/drools-examples-api/kiebase-inclusion/pom.xml
b/drools-examples-api/kiebase-inclusion/pom.xml
index 05ae135c26..25a20d14ea 100644
--- a/drools-examples-api/kiebase-inclusion/pom.xml
+++ b/drools-examples-api/kiebase-inclusion/pom.xml
@@ -45,11 +45,11 @@
<groupId>org.drools</groupId>
<artifactId>named-kiesession</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/kiebase-inclusion/src/test/java/org/drools/example/api/kiebaseinclusion/KieBaseInclusionExampleTest.java
b/drools-examples-api/kiebase-inclusion/src/test/java/org/drools/example/api/kiebaseinclusion/KieBaseInclusionExampleTest.java
index 77804c46fb..9c779cedc0 100644
---
a/drools-examples-api/kiebase-inclusion/src/test/java/org/drools/example/api/kiebaseinclusion/KieBaseInclusionExampleTest.java
+++
b/drools-examples-api/kiebase-inclusion/src/test/java/org/drools/example/api/kiebaseinclusion/KieBaseInclusionExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.kiebaseinclusion;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class KieBaseInclusionExampleTest {
diff --git a/drools-examples-api/kiecontainer-from-kierepo/pom.xml
b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
index d55279a5cc..b0156e4958 100644
--- a/drools-examples-api/kiecontainer-from-kierepo/pom.xml
+++ b/drools-examples-api/kiecontainer-from-kierepo/pom.xml
@@ -41,6 +41,11 @@
<groupId>org.kie</groupId>
<artifactId>kie-ci</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
@@ -49,12 +54,6 @@
<groupId>org.drools</groupId>
<artifactId>named-kiesession</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/kiecontainer-from-kierepo/src/test/java/org/drools/example/api/kiecontainerfromkierepo/KieContainerFromKieRepoExampleTest.java
b/drools-examples-api/kiecontainer-from-kierepo/src/test/java/org/drools/example/api/kiecontainerfromkierepo/KieContainerFromKieRepoExampleTest.java
index 70da1110b7..3e24f8b084 100644
---
a/drools-examples-api/kiecontainer-from-kierepo/src/test/java/org/drools/example/api/kiecontainerfromkierepo/KieContainerFromKieRepoExampleTest.java
+++
b/drools-examples-api/kiecontainer-from-kierepo/src/test/java/org/drools/example/api/kiecontainerfromkierepo/KieContainerFromKieRepoExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.kiecontainerfromkierepo;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class KieContainerFromKieRepoExampleTest {
diff --git a/drools-examples-api/kiefilesystem-example/pom.xml
b/drools-examples-api/kiefilesystem-example/pom.xml
index d3537b5183..382e65cb7f 100644
--- a/drools-examples-api/kiefilesystem-example/pom.xml
+++ b/drools-examples-api/kiefilesystem-example/pom.xml
@@ -49,11 +49,11 @@
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/kiefilesystem-example/src/test/java/org/drools/example/api/kiefilesystem/KieFileSystemExampleTest.java
b/drools-examples-api/kiefilesystem-example/src/test/java/org/drools/example/api/kiefilesystem/KieFileSystemExampleTest.java
index bc55c5dc4b..ca973ed355 100644
---
a/drools-examples-api/kiefilesystem-example/src/test/java/org/drools/example/api/kiefilesystem/KieFileSystemExampleTest.java
+++
b/drools-examples-api/kiefilesystem-example/src/test/java/org/drools/example/api/kiefilesystem/KieFileSystemExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.kiefilesystem;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class KieFileSystemExampleTest {
diff --git a/drools-examples-api/kiemodulemodel-example/pom.xml
b/drools-examples-api/kiemodulemodel-example/pom.xml
index fc6b6c3eb4..6fb2269d92 100644
--- a/drools-examples-api/kiemodulemodel-example/pom.xml
+++ b/drools-examples-api/kiemodulemodel-example/pom.xml
@@ -54,18 +54,17 @@
<artifactId>kie-api</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Needed by the example as it uses these kjars -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>named-kiesession</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>kiebase-inclusion</artifactId>
diff --git
a/drools-examples-api/kiemodulemodel-example/src/test/java/org/drools/example/api/kiemodulemodel/KieModuleModelExampleTest.java
b/drools-examples-api/kiemodulemodel-example/src/test/java/org/drools/example/api/kiemodulemodel/KieModuleModelExampleTest.java
index 979a2baa9b..7974d2f6ee 100644
---
a/drools-examples-api/kiemodulemodel-example/src/test/java/org/drools/example/api/kiemodulemodel/KieModuleModelExampleTest.java
+++
b/drools-examples-api/kiemodulemodel-example/src/test/java/org/drools/example/api/kiemodulemodel/KieModuleModelExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.kiemodulemodel;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class KieModuleModelExampleTest {
diff --git a/drools-examples-api/multiple-kbases/pom.xml
b/drools-examples-api/multiple-kbases/pom.xml
index ad3aa3926c..f5a8217c42 100644
--- a/drools-examples-api/multiple-kbases/pom.xml
+++ b/drools-examples-api/multiple-kbases/pom.xml
@@ -41,11 +41,11 @@
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/multiple-kbases/src/test/java/org/drools/example/api/multiplekbases/MultipleKbasesExampleTest.java
b/drools-examples-api/multiple-kbases/src/test/java/org/drools/example/api/multiplekbases/MultipleKbasesExampleTest.java
index a7faa33f89..8eb9b80874 100644
---
a/drools-examples-api/multiple-kbases/src/test/java/org/drools/example/api/multiplekbases/MultipleKbasesExampleTest.java
+++
b/drools-examples-api/multiple-kbases/src/test/java/org/drools/example/api/multiplekbases/MultipleKbasesExampleTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.drools.core.time.impl.JDKTimerService;
import org.drools.core.time.impl.PseudoClockScheduler;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.model.KieSessionModel;
import org.kie.api.runtime.KieContainer;
@@ -33,8 +33,8 @@ import org.kie.api.runtime.conf.ClockTypeOption;
import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MultipleKbasesExampleTest {
@@ -110,15 +110,15 @@ public class MultipleKbasesExampleTest {
ClockTypeOption clockType = kieSessionModel.getClockType();
// clockType realtime
- Assert.assertNotEquals(clockType, pseudoClock);
+ Assertions.assertNotEquals(clockType, pseudoClock);
// change model to pseudo
kieSessionModel.setClockType(pseudoClock);
- Assert.assertEquals(kieSessionModel.getClockType(), pseudoClock);
+ Assertions.assertEquals(kieSessionModel.getClockType(), pseudoClock);
// new pseudo session
KieSession kSession = kContainer.newKieSession(name);
- Assert.assertEquals(kSession.getSessionClock().getClass(),
PseudoClockScheduler.class);
+ Assertions.assertEquals(kSession.getSessionClock().getClass(),
PseudoClockScheduler.class);
}
@Test
@@ -132,18 +132,18 @@ public class MultipleKbasesExampleTest {
ClockTypeOption clockType = kieSessionModel.getClockType();
// clockType realtime
- Assert.assertEquals(clockType, ClockTypeOption.REALTIME);
- Assert.assertNotEquals(clockType, pseudoClock);
+ Assertions.assertEquals(clockType, ClockTypeOption.REALTIME);
+ Assertions.assertNotEquals(clockType, pseudoClock);
// session is realtime
KieSession kSession = kContainer.newKieSession(name);
- Assert.assertEquals(kSession.getSessionClock().getClass(),
JDKTimerService.class);
+ Assertions.assertEquals(kSession.getSessionClock().getClass(),
JDKTimerService.class);
// change model to pseudo
kieSessionModel.setClockType(pseudoClock);
// new session still realtime
KieSession kSessionPseudo = kContainer.newKieSession(name);
- Assert.assertEquals(kSessionPseudo.getSessionClock().getClass(),
PseudoClockScheduler.class);
+ Assertions.assertEquals(kSessionPseudo.getSessionClock().getClass(),
PseudoClockScheduler.class);
}
}
\ No newline at end of file
diff --git a/drools-examples-api/named-kiesession-from-file/pom.xml
b/drools-examples-api/named-kiesession-from-file/pom.xml
index ab0c04a8e7..68f963fa15 100644
--- a/drools-examples-api/named-kiesession-from-file/pom.xml
+++ b/drools-examples-api/named-kiesession-from-file/pom.xml
@@ -42,18 +42,17 @@
<artifactId>drools-engine-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Needed by the example as it uses this kjar -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>named-kiesession</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/named-kiesession-from-file/src/test/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExampleTest.java
b/drools-examples-api/named-kiesession-from-file/src/test/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExampleTest.java
index e2cd2afe1d..db5dec8457 100644
---
a/drools-examples-api/named-kiesession-from-file/src/test/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExampleTest.java
+++
b/drools-examples-api/named-kiesession-from-file/src/test/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.namedkiesessionfromfile;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class NamedKieSessionFromFileExampleTest {
private static final String NL = System.getProperty("line.separator");
diff --git a/drools-examples-api/named-kiesession/pom.xml
b/drools-examples-api/named-kiesession/pom.xml
index ff558c4a6e..84860d54ad 100644
--- a/drools-examples-api/named-kiesession/pom.xml
+++ b/drools-examples-api/named-kiesession/pom.xml
@@ -41,11 +41,11 @@
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/named-kiesession/src/test/java/org/drools/example/api/namedkiesession/NamedKieSessionExampleTest.java
b/drools-examples-api/named-kiesession/src/test/java/org/drools/example/api/namedkiesession/NamedKieSessionExampleTest.java
index 4c22b89335..b5ec7fdda2 100644
---
a/drools-examples-api/named-kiesession/src/test/java/org/drools/example/api/namedkiesession/NamedKieSessionExampleTest.java
+++
b/drools-examples-api/named-kiesession/src/test/java/org/drools/example/api/namedkiesession/NamedKieSessionExampleTest.java
@@ -18,12 +18,12 @@
*/
package org.drools.example.api.namedkiesession;
-import org.junit.Test;
-
import java.io.ByteArrayOutputStream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.PrintStream;
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
public class NamedKieSessionExampleTest {
private static final String NL = System.getProperty("line.separator");
diff --git a/drools-examples-api/pom.xml b/drools-examples-api/pom.xml
index 6874207631..c7b3cef379 100644
--- a/drools-examples-api/pom.xml
+++ b/drools-examples-api/pom.xml
@@ -59,6 +59,4 @@
<module>multiple-kbases</module>
<module>reactive-kiesession</module>
</modules>
-
-
</project>
diff --git a/drools-examples-api/reactive-kiesession/pom.xml
b/drools-examples-api/reactive-kiesession/pom.xml
index b532d6ae6d..eaa8cae221 100644
--- a/drools-examples-api/reactive-kiesession/pom.xml
+++ b/drools-examples-api/reactive-kiesession/pom.xml
@@ -41,11 +41,11 @@
<groupId>org.drools</groupId>
<artifactId>drools-engine-classic</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-examples-api/reactive-kiesession/src/test/java/org/drools/example/api/reactivekiesession/ReactiveKieSessionExampleTest.java
b/drools-examples-api/reactive-kiesession/src/test/java/org/drools/example/api/reactivekiesession/ReactiveKieSessionExampleTest.java
index 75044ac5f2..0b36277728 100644
---
a/drools-examples-api/reactive-kiesession/src/test/java/org/drools/example/api/reactivekiesession/ReactiveKieSessionExampleTest.java
+++
b/drools-examples-api/reactive-kiesession/src/test/java/org/drools/example/api/reactivekiesession/ReactiveKieSessionExampleTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.example.api.reactivekiesession;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
@@ -26,8 +26,8 @@ import org.kie.api.runtime.KieSession;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ReactiveKieSessionExampleTest {
diff --git a/drools-fastutil/pom.xml b/drools-fastutil/pom.xml
index 5e453e09b5..eab48e87ee 100644
--- a/drools-fastutil/pom.xml
+++ b/drools-fastutil/pom.xml
@@ -49,16 +49,15 @@
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
index bd42b7a9e6..000131b9da 100644
---
a/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
+++
b/drools-fastutil/src/test/java/org/drools/fastutil/FastUtilTreeMemoryTest.java
@@ -33,8 +33,8 @@ import org.drools.base.rule.accessor.TupleValueExtractor;
import org.drools.core.util.FastIterator;
import org.drools.base.util.IndexedValueReader;
import org.drools.fastutil.FastUtilTreeMemory.TreeFastIterator;
+import org.junit.jupiter.api.Test;
import org.drools.base.util.index.ConstraintTypeOperator;
-import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-kiesession/pom.xml b/drools-kiesession/pom.xml
index 31c361a150..e9c29a0961 100644
--- a/drools-kiesession/pom.xml
+++ b/drools-kiesession/pom.xml
@@ -87,12 +87,11 @@
<artifactId>drools-wiring-dynamic</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</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>
@@ -104,5 +103,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git
a/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
b/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
index 3ae6dd13cf..71116f22db 100644
---
a/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
+++
b/drools-kiesession/src/test/java/org/drools/core/positional/BetaConstraintsPositionalIndexingTest.java
@@ -43,7 +43,7 @@ import org.drools.core.positional.VoidFunctions.VoidFunction3;
import org.drools.core.test.model.Person;
import org.drools.core.util.index.IndexSpec;
import org.drools.kiesession.rulebase.SessionsAwareKnowledgeBase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.KieSession;
import org.kie.internal.conf.CompositeBaseConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
@@ -105,9 +105,8 @@ public class BetaConstraintsPositionalIndexingTest {
};
List<Object[]> results = new ArrayList<>();
- VoidFunction1<PositionalConsequence<?>> f2 = (c) -> {
+ VoidFunction1<PositionalConsequence<?>> f2 = (c) ->
c.setFunction((VoidFunction2<String, Person>) (s, p) ->
{results.add(new Object[] {s, p}); System.out.println(p.getName() + " lives in
" + s);});
- };
testBody(null, f1, f2, false);
@@ -129,9 +128,8 @@ public class BetaConstraintsPositionalIndexingTest {
};
List<Object[]> results = new ArrayList<>();
- VoidFunction1<PositionalConsequence<?>> f2 = (c) -> {
+ VoidFunction1<PositionalConsequence<?>> f2 = (c) ->
c.setFunction((VoidFunction3<String, Integer, Person>) (s, i, p)
-> {results.add(new Object[] {s, i, p}); System.out.println(p.getName() + "
lives in " + s);});
- };
Person p1 = new Person("yoda", 300);
p1.setCity("London");
@@ -173,9 +171,8 @@ public class BetaConstraintsPositionalIndexingTest {
};
List<Object[]> results = new ArrayList<>();
- VoidFunction1<PositionalConsequence<?>> f2 = (c) -> {
+ VoidFunction1<PositionalConsequence<?>> f2 = (c) ->
c.setFunction((VoidFunction2<String, Person>) (s, p) ->
{results.add(new Object[] {s, p}); System.out.println(p.getName() + " is
younger than " + s);});
- };
testBody(f0, f1, f2, false);
@@ -210,9 +207,8 @@ public class BetaConstraintsPositionalIndexingTest {
};
List<Object[]> results = new ArrayList<>();
- VoidFunction1<PositionalConsequence<?>> f2 = (c) -> {
+ VoidFunction1<PositionalConsequence<?>> f2 = (c) ->
c.setFunction((VoidFunction3<String, Integer, Person>) (s, i, p)
-> {results.add(new Object[] {s, i, p}); System.out.println(p.getName() + " is
younger than " + s);});
- };
testBody(f0, f1, f2, true);
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/AddRemoveTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/AddRemoveTest.java
index c07a6b9a9a..0a131a2ab8 100644
--- a/drools-kiesession/src/test/java/org/drools/kiesession/AddRemoveTest.java
+++ b/drools-kiesession/src/test/java/org/drools/kiesession/AddRemoveTest.java
@@ -29,7 +29,7 @@ import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.reteoo.builder.NodeFactory;
import org.drools.core.reteoo.builder.PhreakNodeFactory;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class AddRemoveTest {
@Test
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/CrossProductTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/CrossProductTest.java
index e36af3b188..042a4c9d20 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/CrossProductTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/CrossProductTest.java
@@ -36,8 +36,8 @@ import org.drools.core.rule.consequence.KnowledgeHelper;
import org.drools.base.base.ObjectType;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.KieSession;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +47,7 @@ public class CrossProductTest {
private KieSession ksession;
private List values;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
final ObjectType list1ObjectType = new ClassObjectType( String.class );
final ObjectType list2ObjectType = new ClassObjectType( String.class );
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/InternalRuleBaseConfigurationTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/InternalRuleBaseConfigurationTest.java
index b984e51f80..2d111a9458 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/InternalRuleBaseConfigurationTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/InternalRuleBaseConfigurationTest.java
@@ -25,7 +25,7 @@ import org.drools.core.RuleBaseConfiguration.AssertBehaviour;
import org.drools.core.RuleBaseConfiguration.SequentialAgenda;
import org.drools.core.common.PriorityQueueAgendaGroupFactory;
import org.drools.core.reteoo.RuntimeComponentFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.conf.CompositeConfiguration;
import org.kie.internal.utils.ChainedProperties;
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/NodeSegmentUnlinkingTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/NodeSegmentUnlinkingTest.java
index 9693d65b11..b7bfef3404 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/NodeSegmentUnlinkingTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/NodeSegmentUnlinkingTest.java
@@ -52,7 +52,7 @@ import org.drools.core.reteoo.builder.BuildContext;
import org.drools.core.common.PropagationContext;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/PropertyChangeListenerTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/PropertyChangeListenerTest.java
index 8038fb61f0..9d62fd52b8 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/PropertyChangeListenerTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/PropertyChangeListenerTest.java
@@ -29,8 +29,8 @@ import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.builder.BuildContext;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,7 +39,7 @@ public class PropertyChangeListenerTest {
private BuildContext buildContext;
private EntryPointNode entryPoint;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.kBase = KnowledgeBaseFactory.newKnowledgeBase();
this.buildContext = new BuildContext( kBase, Collections.emptyList() );
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/QueryElementNodeTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/QueryElementNodeTest.java
index 52cff7781e..a75b98ee05 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/QueryElementNodeTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/QueryElementNodeTest.java
@@ -32,8 +32,8 @@ import org.drools.base.rule.QueryElement;
import org.drools.core.common.PropagationContext;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -43,7 +43,7 @@ public class QueryElementNodeTest {
private InternalKnowledgeBase kBase;
private BuildContext buildContext;
- @Before
+ @BeforeEach
public void setUp() {
this.kBase = KnowledgeBaseFactory.newKnowledgeBase();
this.buildContext = new BuildContext( kBase, Collections.emptyList() );
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/ReteTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/ReteTest.java
index f9e927484d..30a4c2abe0 100644
--- a/drools-kiesession/src/test/java/org/drools/kiesession/ReteTest.java
+++ b/drools-kiesession/src/test/java/org/drools/kiesession/ReteTest.java
@@ -44,9 +44,9 @@ import org.drools.core.common.PropagationContext;
import org.drools.core.test.model.Cheese;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.rule.FactHandle;
import org.kie.internal.conf.CompositeConfiguration;
import org.kie.internal.utils.ChainedProperties;
@@ -59,7 +59,7 @@ public class ReteTest {
private BuildContext buildContext;
private EntryPointNode entryPoint;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.kBase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -234,7 +234,7 @@ public class ReteTest {
}
@Test
- @Ignore
+ @Disabled
public void testHierarchy() {
StatefulKnowledgeSessionImpl ksession =
(StatefulKnowledgeSessionImpl)kBase.newKieSession();
@@ -400,7 +400,7 @@ public class ReteTest {
final Object[] results = (Object[]) sink1.getAsserted().get(0);
}
- @Test @Ignore
+ @Test @Disabled
public void testNotShadowed() {
Properties properties = new Properties();
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/ReteooRuleBaseMultiThreadedTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/ReteooRuleBaseMultiThreadedTest.java
index 68509629fb..440e16c73b 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/ReteooRuleBaseMultiThreadedTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/ReteooRuleBaseMultiThreadedTest.java
@@ -27,9 +27,9 @@ import org.drools.base.rule.consequence.Consequence;
import org.drools.core.rule.consequence.KnowledgeHelper;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.KieSession;
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +44,7 @@ public class ReteooRuleBaseMultiThreadedTest {
RuleImpl rule;
InternalKnowledgePackage pkg;
- @Before
+ @BeforeEach
public void setUp() {
this.kBase = KnowledgeBaseFactory.newKnowledgeBase();
@@ -72,7 +72,7 @@ public class ReteooRuleBaseMultiThreadedTest {
kBase.addPackage(pkg);
}
- @Test @Ignore
+ @Test @Disabled
public void testNewSessionWhileModifyingRuleBase() throws
InterruptedException {
PackageModifier modifier = new PackageModifier();
SessionCreator creator = new SessionCreator();
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/ReteooWorkingMemoryTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/ReteooWorkingMemoryTest.java
index c59f1f773a..0d5b5d7820 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/ReteooWorkingMemoryTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/ReteooWorkingMemoryTest.java
@@ -42,8 +42,8 @@ import org.drools.core.test.model.Person;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.rule.EntryPoint;
import org.kie.api.runtime.rule.FactHandle;
@@ -56,7 +56,7 @@ public class ReteooWorkingMemoryTest {
* @see JBRULES-356
*/
@Test
- @Ignore
+ @Disabled
public void testBasicWorkingMemoryActions() {
InternalKnowledgeBase kBase = KnowledgeBaseFactory.newKnowledgeBase();
StatefulKnowledgeSessionImpl ksession =
(StatefulKnowledgeSessionImpl)kBase.newKieSession();
@@ -149,7 +149,7 @@ public class ReteooWorkingMemoryTest {
}
}
- @Test @Ignore
+ @Test @Disabled
public void testExecuteQueueActions() {
InternalKnowledgeBase kBase = KnowledgeBaseFactory.newKnowledgeBase();
StatefulKnowledgeSessionImpl ksession =
(StatefulKnowledgeSessionImpl)kBase.newKieSession();
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleRuntimeEventSupportTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleRuntimeEventSupportTest.java
index d3395665cc..67cdfe0e77 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleRuntimeEventSupportTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleRuntimeEventSupportTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.drools.core.event.RuleRuntimeEventSupport;
import org.drools.core.test.model.Cheese;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.event.rule.ObjectDeletedEvent;
import org.kie.api.event.rule.ObjectInsertedEvent;
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingTest.java
index 9fbafbdcdf..29a6189249 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingTest.java
@@ -53,7 +53,7 @@ import org.drools.base.rule.GroupElement.Type;
import org.drools.core.common.PropagationContext;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingWithSegmentMemoryTest.java
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingWithSegmentMemoryTest.java
index fcd51e7d00..88e9a965f0 100644
---
a/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingWithSegmentMemoryTest.java
+++
b/drools-kiesession/src/test/java/org/drools/kiesession/RuleUnlinkingWithSegmentMemoryTest.java
@@ -53,7 +53,7 @@ import org.drools.core.common.PropagationContext;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBaseConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-legacy-test-util/pom.xml b/drools-legacy-test-util/pom.xml
index e8d1fef3e1..e90a66d21e 100644
--- a/drools-legacy-test-util/pom.xml
+++ b/drools-legacy-test-util/pom.xml
@@ -78,11 +78,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Logging -->
<dependency>
@@ -95,5 +95,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
diff --git
a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/MoreBatchExecutionTest.java
b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/MoreBatchExecutionTest.java
index 82805ece03..46aa81be59 100644
---
a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/MoreBatchExecutionTest.java
+++
b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/MoreBatchExecutionTest.java
@@ -25,8 +25,8 @@ import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.mvel.CommonTestMethodBase;
import org.drools.mvel.compiler.Cheese;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.command.Command;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.ExecutionResults;
@@ -44,7 +44,7 @@ public class MoreBatchExecutionTest extends
CommonTestMethodBase {
private KieSession ksession = null;
- @After
+ @AfterEach
public void disposeKSession() {
if( ksession != null ) {
ksession.dispose();
diff --git
a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/SimpleBatchExecutionTest.java
b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/SimpleBatchExecutionTest.java
index 7bda60daf1..3cdd0ab39e 100644
---
a/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/SimpleBatchExecutionTest.java
+++
b/drools-legacy-test-util/src/test/java/org/drools/mvel/compiler/command/SimpleBatchExecutionTest.java
@@ -26,9 +26,9 @@ import java.util.List;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.mvel.CommonTestMethodBase;
-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.command.Command;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.ExecutionResults;
@@ -53,7 +53,7 @@ public class SimpleBatchExecutionTest extends
CommonTestMethodBase {
+ " then\n"
+ "end\n";
- @Before
+ @BeforeEach
public void createKSession() throws Exception {
final KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
kbuilder.add(
ResourceFactory.newByteArrayResource(ruleString.getBytes()), ResourceType.DRL );
@@ -64,7 +64,7 @@ public class SimpleBatchExecutionTest extends
CommonTestMethodBase {
ksession = createKnowledgeSession(kbase);
}
- @After
+ @AfterEach
public void disposeKSession() throws Exception {
if( ksession != null ) {
ksession.dispose();
diff --git a/drools-metric/pom.xml b/drools-metric/pom.xml
index 2f94634322..3e66126705 100644
--- a/drools-metric/pom.xml
+++ b/drools-metric/pom.xml
@@ -62,6 +62,11 @@
<artifactId>drools-mvel</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-legacy-test-util</artifactId>
@@ -83,12 +88,5 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-
</project>
diff --git
a/drools-metric/src/test/java/org/drools/metric/AbstractMetricTest.java
b/drools-metric/src/test/java/org/drools/metric/AbstractMetricTest.java
index 94afb25f89..36ce723302 100644
--- a/drools-metric/src/test/java/org/drools/metric/AbstractMetricTest.java
+++ b/drools-metric/src/test/java/org/drools/metric/AbstractMetricTest.java
@@ -24,21 +24,21 @@ import io.micrometer.core.instrument.search.Search;
import org.drools.metric.util.MetricLogUtils;
import org.drools.metric.util.MicrometerUtils;
import org.drools.mvel.CommonTestMethodBase;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
abstract class AbstractMetricTest extends CommonTestMethodBase {
protected MeterRegistry registry;
- @Before
+ @BeforeEach
public void setup() {
System.setProperty(MetricLogUtils.METRIC_LOGGER_ENABLED, "true");
System.setProperty(MetricLogUtils.METRIC_LOGGER_THRESHOLD, "-1");
this.registry = Metrics.globalRegistry;
}
- @After
+ @AfterEach
public void clearMeters() { // Remove meters we inserted without affecting
those that may have already been there.
Search.in(registry)
.name(name -> name.startsWith("org.drools.metric"))
diff --git a/drools-metric/src/test/java/org/drools/metric/CloneTest.java
b/drools-metric/src/test/java/org/drools/metric/CloneTest.java
index 7ac097eaad..abc068694f 100644
--- a/drools-metric/src/test/java/org/drools/metric/CloneTest.java
+++ b/drools-metric/src/test/java/org/drools/metric/CloneTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.metric;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.utils.KieHelper;
diff --git a/drools-metric/src/test/java/org/drools/metric/ConstraintsTest.java
b/drools-metric/src/test/java/org/drools/metric/ConstraintsTest.java
index 4c7a8c25d7..697132134a 100644
--- a/drools-metric/src/test/java/org/drools/metric/ConstraintsTest.java
+++ b/drools-metric/src/test/java/org/drools/metric/ConstraintsTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.drools.mvel.compiler.Person;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;
diff --git
a/drools-metric/src/test/java/org/drools/metric/MetricLogUtilsTest.java
b/drools-metric/src/test/java/org/drools/metric/MetricLogUtilsTest.java
index 3262031bbe..5b11c16bee 100644
--- a/drools-metric/src/test/java/org/drools/metric/MetricLogUtilsTest.java
+++ b/drools-metric/src/test/java/org/drools/metric/MetricLogUtilsTest.java
@@ -29,7 +29,7 @@ import io.micrometer.core.instrument.search.Search;
import org.drools.metric.util.MetricLogUtils;
import org.drools.mvel.compiler.Address;
import org.drools.mvel.compiler.Person;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;
diff --git a/drools-mvel/pom.xml b/drools-mvel/pom.xml
index df99d589db..3bd052b235 100644
--- a/drools-mvel/pom.xml
+++ b/drools-mvel/pom.xml
@@ -106,6 +106,11 @@
<artifactId>drools-tms</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
@@ -127,11 +132,6 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<!-- Logging -->
<dependency>
diff --git a/drools-mvel/src/test/java/org/drools/mvel/BuildUtilsTest.java
b/drools-mvel/src/test/java/org/drools/mvel/BuildUtilsTest.java
index 692c645024..387fdaee28 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/BuildUtilsTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/BuildUtilsTest.java
@@ -30,8 +30,8 @@ import org.drools.core.test.model.StockTick;
import org.drools.base.time.Interval;
import org.drools.core.time.TemporalDependencyMatrix;
import org.drools.mvel.evaluators.AfterEvaluatorDefinition;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.drools.base.time.Interval.MAX;
@@ -41,7 +41,7 @@ public class BuildUtilsTest {
private BuildUtils utils;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
utils = new BuildUtils();
}
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/MVELCalendarCoercionTest.java
b/drools-mvel/src/test/java/org/drools/mvel/MVELCalendarCoercionTest.java
index 748dcaa7ee..f7b420d40f 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/MVELCalendarCoercionTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/MVELCalendarCoercionTest.java
@@ -24,8 +24,8 @@ import java.util.Date;
import java.util.Locale;
import org.drools.util.DateUtils;
+import org.junit.jupiter.api.Test;
import org.drools.mvel.expr.MVELCalendarCoercion;
-import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/MVELDateCoercionTest.java
b/drools-mvel/src/test/java/org/drools/mvel/MVELDateCoercionTest.java
index 9e06729024..67f314e4ca 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/MVELDateCoercionTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/MVELDateCoercionTest.java
@@ -27,8 +27,8 @@ import java.util.Objects;
import
org.drools.mvel.MVELConstraintBuilder.StringCoercionCompatibilityEvaluator;
import org.drools.util.DateUtils;
+import org.junit.jupiter.api.Test;
import org.drools.mvel.expr.MVELDateCoercion;
-import org.junit.Test;
import org.mvel2.DataConversion;
import org.mvel2.MVEL;
import org.mvel2.ParserContext;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/asm/ClassFieldInspectorTest.java
b/drools-mvel/src/test/java/org/drools/mvel/asm/ClassFieldInspectorTest.java
index ed6aaee232..419a78505f 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/asm/ClassFieldInspectorTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/asm/ClassFieldInspectorTest.java
@@ -28,7 +28,7 @@ import org.drools.core.util.asm.InterfaceChild;
import org.drools.core.util.asm.InterfaceChildImpl;
import org.drools.core.util.asm.TestAbstract;
import org.drools.core.util.asm.TestInterface;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java
b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java
index 7f134ae42e..dd51cb2e5e 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.mvel.asm;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/asm/LambdaIntrospectorTest.java
b/drools-mvel/src/test/java/org/drools/mvel/asm/LambdaIntrospectorTest.java
index 75323f6476..a77018dcec 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/asm/LambdaIntrospectorTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/asm/LambdaIntrospectorTest.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.function.Supplier;
import org.drools.mvel.compiler.Person;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/asm/MethodComparerTest.java
b/drools-mvel/src/test/java/org/drools/mvel/asm/MethodComparerTest.java
index 955e5134e5..853c71e49e 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/asm/MethodComparerTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/asm/MethodComparerTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import org.drools.core.util.asm.MethodCompareA;
import org.drools.core.util.asm.MethodCompareB;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mvel2.asm.ClassReader;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/ClassGeneratorTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/ClassGeneratorTest.java
index da95070e0d..04d2fb4940 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/ClassGeneratorTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/ClassGeneratorTest.java
@@ -19,7 +19,7 @@
package org.drools.mvel.compiler.rule.builder.dialect.asm;
import org.drools.mvel.asm.ClassGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mvel2.asm.MethodVisitor;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/InvokerGeneratorTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/InvokerGeneratorTest.java
index 49e2435e3d..d805db0561 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/InvokerGeneratorTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/asm/InvokerGeneratorTest.java
@@ -30,7 +30,7 @@ import org.drools.mvel.asm.ClassGenerator;
import org.drools.mvel.asm.InvokerContext;
import org.drools.mvel.asm.InvokerGenerator;
import org.drools.mvel.asm.InvokerStub;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
index a9d787379f..f060800c11 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaAccumulateBuilderTest.java
@@ -37,8 +37,8 @@ import org.drools.drl.ast.descr.RuleDescr;
import org.drools.mvel.java.JavaAccumulateBuilder;
import org.drools.mvel.java.JavaAnalysisResult;
import org.drools.mvel.java.JavaExprAnalyzer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +46,7 @@ public class JavaAccumulateBuilderTest {
private JavaAccumulateBuilder builder;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
builder = new JavaAccumulateBuilder();
}
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderPRAlwaysTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderPRAlwaysTest.java
index 9df48d8dcd..17dc1b27f5 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderPRAlwaysTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderPRAlwaysTest.java
@@ -46,7 +46,7 @@ import org.drools.mvel.compiler.Cheese;
import org.drools.mvel.compiler.Person;
import org.drools.mvel.java.JavaAnalysisResult;
import org.drools.mvel.java.JavaExprAnalyzer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.builder.KnowledgeBuilderFactory;
import org.kie.internal.builder.conf.PropertySpecificOption;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
index 47f439c985..48a7780342 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
@@ -46,7 +46,7 @@ import org.drools.mvel.compiler.Cheese;
import org.drools.mvel.compiler.Person;
import org.drools.mvel.java.JavaAnalysisResult;
import org.drools.mvel.java.JavaExprAnalyzer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.builder.KnowledgeBuilderFactory;
import org.kie.internal.builder.conf.PropertySpecificOption;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaExprAnalyzerTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaExprAnalyzerTest.java
index 4b116b27dd..11d0067497 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaExprAnalyzerTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaExprAnalyzerTest.java
@@ -25,7 +25,7 @@ import org.antlr.runtime.RecognitionException;
import org.drools.compiler.compiler.BoundIdentifiers;
import org.drools.mvel.java.JavaAnalysisResult;
import org.drools.mvel.java.JavaExprAnalyzer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaForMvelDialectConfigurationTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaForMvelDialectConfigurationTest.java
index f00ff3c2ae..654ecb2175 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaForMvelDialectConfigurationTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/java/JavaForMvelDialectConfigurationTest.java
@@ -19,7 +19,7 @@
package org.drools.mvel.compiler.rule.builder.dialect.java;
import org.drools.mvel.java.JavaForMvelDialectConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JavaForMvelDialectConfigurationTest {
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
index 5aefec89e3..3bd1fd86a4 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
@@ -45,7 +45,7 @@ import org.drools.mvel.builder.MVELAccumulateBuilder;
import org.drools.mvel.builder.MVELDialect;
import org.drools.mvel.compiler.Cheese;
import org.drools.mvel.expr.MVELCompileable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
index 6e63fa9aac..84597f8871 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
@@ -83,7 +83,7 @@ import org.drools.mvel.builder.MVELDialect;
import org.drools.mvel.compiler.Cheese;
import org.drools.mvel.expr.MVELConsequence;
import org.drools.mvel.expr.MVELDebugHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.builder.KnowledgeBuilderFactory;
import org.kie.internal.builder.conf.LanguageLevelOption;
import org.mvel2.ParserContext;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELDebugTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELDebugTest.java
index def1708a34..a5206c26fb 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELDebugTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELDebugTest.java
@@ -24,7 +24,7 @@ import org.drools.drl.ast.descr.PackageDescr;
import org.drools.drl.ast.descr.RuleDescr;
import org.drools.base.definitions.InternalKnowledgePackage;
import org.drools.mvel.expr.MVELConsequence;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.builder.conf.LanguageLevelOption;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
index 09a5ae8ab7..a91477920d 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
@@ -50,8 +50,8 @@ import org.drools.mvel.builder.MVELDialect;
import org.drools.mvel.builder.MVELEvalBuilder;
import org.drools.mvel.compiler.Cheese;
import org.drools.mvel.expr.MVELEvalExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -59,7 +59,7 @@ public class MVELEvalBuilderTest {
ClassFieldAccessorStore store = new ClassFieldAccessorStore();
- @Before
+ @BeforeEach
public void setUp() throws Exception {
store.setClassFieldAccessorCache( new ClassFieldAccessorCache(
Thread.currentThread().getContextClassLoader() ) );
store.setEagerWire( true );
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
index 919a07b195..ce2274e5fe 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
@@ -19,14 +19,14 @@
package org.drools.mvel.compiler.rule.builder.dialect.mvel;
import org.drools.mvel.builder.MVELExprAnalyzer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MVELExprAnalyzerTest {
private MVELExprAnalyzer analyzer;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
analyzer = new MVELExprAnalyzer();
}
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
index 584439f953..247c79eb12 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/compiler/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
@@ -55,8 +55,8 @@ import org.drools.mvel.builder.MVELDialect;
import org.drools.mvel.builder.MVELSalienceBuilder;
import org.drools.mvel.compiler.Person;
import org.drools.mvel.expr.MVELSalienceExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.definition.rule.Rule;
import static org.assertj.core.api.Assertions.assertThat;
@@ -66,7 +66,7 @@ public class MVELSalienceBuilderTest {
private InternalKnowledgeBase kBase ;
private BuildContext buildContext;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
InternalKnowledgePackage pkg =
CoreComponentFactory.get().createKnowledgePackage( "pkg1" );
final RuleDescr ruleDescr = new RuleDescr( "rule 1" );
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/evaluators/TemporalEvaluatorFactoryTest.java
b/drools-mvel/src/test/java/org/drools/mvel/evaluators/TemporalEvaluatorFactoryTest.java
index d22c95224f..c99fb7ea1d 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/evaluators/TemporalEvaluatorFactoryTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/evaluators/TemporalEvaluatorFactoryTest.java
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
import org.drools.base.base.ValueResolver;
import org.drools.mvel.field.FieldFactory;
+import org.junit.jupiter.api.Test;
import org.drools.base.base.ValueType;
import org.drools.compiler.rule.builder.EvaluatorDefinition;
import org.drools.compiler.builder.impl.EvaluatorRegistry;
@@ -34,7 +35,6 @@ import org.drools.base.rule.Declaration;
import org.drools.base.rule.accessor.Evaluator;
import org.drools.base.rule.accessor.FieldValue;
import org.drools.base.rule.accessor.ReadAccessor;
-import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/field/FieldFactoryTest.java
b/drools-mvel/src/test/java/org/drools/mvel/field/FieldFactoryTest.java
index 1d62ec0295..4072d92230 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/field/FieldFactoryTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/field/FieldFactoryTest.java
@@ -26,7 +26,7 @@ import java.util.Locale;
import org.drools.base.base.ValueType;
import org.drools.base.rule.accessor.FieldValue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/field/FieldValueTest.java
b/drools-mvel/src/test/java/org/drools/mvel/field/FieldValueTest.java
index d1722a22f8..cf6241b9ec 100644
--- a/drools-mvel/src/test/java/org/drools/mvel/field/FieldValueTest.java
+++ b/drools-mvel/src/test/java/org/drools/mvel/field/FieldValueTest.java
@@ -19,8 +19,8 @@
package org.drools.mvel.field;
import org.drools.base.rule.accessor.FieldValue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,7 +31,7 @@ public class FieldValueTest {
FieldValue field4;
FieldValue field5;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.field1 = FieldFactory.getInstance().getFieldValue( null );
this.field2 = FieldFactory.getInstance().getFieldValue( null );
diff --git
a/drools-mvel/src/test/java/org/drools/mvel/integrationtests/LogicTransformerTest.java
b/drools-mvel/src/test/java/org/drools/mvel/integrationtests/LogicTransformerTest.java
index ec98c67454..85a53153e8 100644
---
a/drools-mvel/src/test/java/org/drools/mvel/integrationtests/LogicTransformerTest.java
+++
b/drools-mvel/src/test/java/org/drools/mvel/integrationtests/LogicTransformerTest.java
@@ -33,7 +33,7 @@ import org.drools.base.rule.InvalidRuleException;
import org.drools.base.rule.LogicTransformer;
import org.drools.base.rule.Pattern;
import org.drools.core.util.DroolsStreamUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/MoreBatchExecutionPersistenceTest.java
b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/MoreBatchExecutionPersistenceTest.java
index 1610d0563c..a086448473 100644
---
a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/MoreBatchExecutionPersistenceTest.java
+++
b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/MoreBatchExecutionPersistenceTest.java
@@ -18,24 +18,41 @@
*/
package org.drools.persistence.command;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import org.drools.core.impl.RuleBaseFactory;
-import org.drools.mvel.compiler.command.MoreBatchExecutionTest;
+import org.drools.kiesession.rulebase.InternalKnowledgeBase;
+import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
+import org.drools.mvel.CommonTestMethodBase;
+import org.drools.mvel.compiler.Cheese;
import org.drools.persistence.util.DroolsPersistenceUtil;
import org.junit.After;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.kie.api.KieBase;
+import org.kie.api.command.Command;
+import org.kie.api.io.ResourceType;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.EnvironmentName;
+import org.kie.api.runtime.ExecutionResults;
+import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieSessionConfiguration;
+import org.kie.api.runtime.rule.QueryResults;
+import org.kie.internal.builder.KnowledgeBuilder;
+import org.kie.internal.builder.KnowledgeBuilderFactory;
+import org.kie.internal.command.CommandFactory;
+import org.kie.internal.io.ResourceFactory;
import org.kie.internal.persistence.jpa.JPAKnowledgeService;
import org.kie.internal.runtime.StatefulKnowledgeSession;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
import static
org.drools.persistence.util.DroolsPersistenceUtil.DROOLS_PERSISTENCE_UNIT_NAME;
import static
org.drools.persistence.util.DroolsPersistenceUtil.OPTIMISTIC_LOCKING;
import static
org.drools.persistence.util.DroolsPersistenceUtil.PESSIMISTIC_LOCKING;
@@ -43,7 +60,10 @@ import static
org.drools.persistence.util.DroolsPersistenceUtil.cleanUp;
import static
org.drools.persistence.util.DroolsPersistenceUtil.createEnvironment;
@RunWith(Parameterized.class)
-public class MoreBatchExecutionPersistenceTest extends MoreBatchExecutionTest {
+public class MoreBatchExecutionPersistenceTest extends CommonTestMethodBase {
+
+
+ private KieSession ksession = null;
private Map<String, Object> context;
private boolean locking;
@@ -67,6 +87,13 @@ public class MoreBatchExecutionPersistenceTest extends
MoreBatchExecutionTest {
cleanUp(context);
context = null;
}
+
+ public void disposeKSession() {
+ if( ksession != null ) {
+ ksession.dispose();
+ ksession = null;
+ }
+ }
protected StatefulKnowledgeSession createKnowledgeSession(KieBase kbase) {
if( context == null ) {
@@ -77,6 +104,72 @@ public class MoreBatchExecutionPersistenceTest extends
MoreBatchExecutionTest {
if( this.locking ) {
env.set(EnvironmentName.USE_PESSIMISTIC_LOCKING, true);
}
- return JPAKnowledgeService.newStatefulKnowledgeSession(kbase, ksconf,
env); }
+ return JPAKnowledgeService.newStatefulKnowledgeSession(kbase, ksconf,
env);
+
+ }
+
+ @Test
+ public void testFireAllRules() {
+ KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
+
kbuilder.add(ResourceFactory.newClassPathResource("org/drools/mvel/integrationtests/drl/test_ImportFunctions.drl"),
ResourceType.DRL);
+ if (kbuilder.hasErrors()) {
+ fail(kbuilder.getErrors().toString());
+ }
+ InternalKnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ kbase.addPackages(kbuilder.getKnowledgePackages());
+ ksession = createKnowledgeSession(kbase);
+
+ final Cheese cheese = new Cheese("stilton", 15);
+ ksession.insert(cheese);
+ List<?> list = new ArrayList();
+ ksession.setGlobal("list", list);
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newFireAllRules("fired"));
+ Command<?> cmds = CommandFactory.newBatchExecution(commands);
+ ExecutionResults result = (ExecutionResults) ksession.execute(cmds);
+ assertThat(result).as("Batch execution result is null!").isNotNull();
+
+ Object firedObject = result.getValue("fired");
+ assertThat(firedObject instanceof Integer).as("Retrieved object is
null or incorrect!").isTrue();
+ assertThat(firedObject).isEqualTo(4);
+
+ list = (List<?>) ksession.getGlobal("list");
+ assertThat(list.size()).isEqualTo(4);
+
+ assertThat(list.get(0)).isEqualTo("rule1");
+ assertThat(list.get(1)).isEqualTo("rule2");
+ assertThat(list.get(2)).isEqualTo("rule3");
+ assertThat(list.get(3)).isEqualTo("rule4");
+ }
+
+ @Test
+ public void testQuery() {
+ KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
+
kbuilder.add(ResourceFactory.newClassPathResource("org/drools/mvel/integrationtests/simple_query_test.drl"),
ResourceType.DRL);
+ if (kbuilder.hasErrors()) {
+ fail(kbuilder.getErrors().toString());
+ }
+ InternalKnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ kbase.addPackages(kbuilder.getKnowledgePackages());
+ ksession = createKnowledgeSession(kbase);
+
+ ksession.insert( new Cheese( "stinky", 5 ) );
+ ksession.insert( new Cheese( "smelly", 7 ) );
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newQuery("numStinkyCheeses", "simple
query"));
+ Command<?> cmds = CommandFactory.newBatchExecution(commands);
+ ExecutionResults result = (ExecutionResults) ksession.execute(cmds);
+ assertThat(result).as("Batch execution result is null!").isNotNull();
+
+ Object queryResultsObject = result.getValue("numStinkyCheeses");
+ assertThat(queryResultsObject instanceof QueryResults).as("Retrieved
object is null or incorrect!").isTrue();
+
+ assertThat(((QueryResults) queryResultsObject).size()).isEqualTo(1);
+ }
+
+
+
}
diff --git
a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/SimpleBatchExecutionPersistenceTest.java
b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/SimpleBatchExecutionPersistenceTest.java
index c419dc0724..bdce54ea33 100644
---
a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/SimpleBatchExecutionPersistenceTest.java
+++
b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/command/SimpleBatchExecutionPersistenceTest.java
@@ -18,26 +18,44 @@
*/
package org.drools.persistence.command;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import org.drools.core.impl.RuleBaseFactory;
+import org.drools.kiesession.rulebase.InternalKnowledgeBase;
+import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
+import org.drools.mvel.CommonTestMethodBase;
import org.drools.mvel.compiler.command.SimpleBatchExecutionTest;
import org.drools.persistence.util.DroolsPersistenceUtil;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import org.kie.api.KieBase;
+import org.kie.api.command.Command;
+import org.kie.api.io.ResourceType;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.EnvironmentName;
+import org.kie.api.runtime.ExecutionResults;
+import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieSessionConfiguration;
+import org.kie.api.runtime.rule.FactHandle;
+import org.kie.internal.builder.KnowledgeBuilder;
+import org.kie.internal.builder.KnowledgeBuilderFactory;
+import org.kie.internal.command.CommandFactory;
+import org.kie.internal.io.ResourceFactory;
import org.kie.internal.persistence.jpa.JPAKnowledgeService;
import org.kie.internal.runtime.StatefulKnowledgeSession;
@RunWith(Parameterized.class)
-public class SimpleBatchExecutionPersistenceTest extends
SimpleBatchExecutionTest {
+public class SimpleBatchExecutionPersistenceTest extends CommonTestMethodBase {
private Map<String, Object> context;
private boolean locking;
@@ -73,4 +91,197 @@ public class SimpleBatchExecutionPersistenceTest extends
SimpleBatchExecutionTes
}
return JPAKnowledgeService.newStatefulKnowledgeSession(kbase, ksconf,
env);
}
+
+ private KieSession ksession;
+ protected final static String ruleString = ""
+ + "package org.kie.api.persistence \n"
+ + "global String globalCheeseCountry\n"
+ + "\n"
+ + "rule 'EmptyRule' \n"
+ + " when\n"
+ + " then\n"
+ + "end\n";
+
+ @Before
+ public void createKSession() throws Exception {
+ final KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.add(
ResourceFactory.newByteArrayResource(ruleString.getBytes()), ResourceType.DRL );
+ InternalKnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ assertThat(kbuilder.hasErrors()).isFalse();
+ kbase.addPackages( kbuilder.getKnowledgePackages() );
+
+ ksession = createKnowledgeSession(kbase);
+ }
+
+ @After
+ public void disposeKSession() throws Exception {
+ if( ksession != null ) {
+ ksession.dispose();
+ ksession = null;
+ }
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testInsertObjectCommand() throws Exception {
+
+ String expected_1 = "expected_1";
+ String expected_2 = "expected_2";
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newInsert(expected_1, "out_1"));
+ commands.add(CommandFactory.newInsert(expected_2, "out_2"));
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+
+ Object fact_1 = result.getValue("out_1");
+ assertThat(fact_1).isNotNull();
+ Object fact_2 = result.getValue("out_2");
+ assertThat(fact_2).isNotNull();
+ ksession.fireAllRules();
+
+ Object [] expectedArr = {expected_1, expected_2};
+ List<Object> expectedList = new
ArrayList<Object>(Arrays.asList(expectedArr));
+
+ Collection<? extends Object> factList = ksession.getObjects();
+ assertThat(factList.size() == expectedList.size()).as("Expected " +
expectedList.size() + " objects but retrieved " + factList.size()).isTrue();
+ for( Object fact : factList ) {
+ expectedList.remove(fact);
+ }
+ assertThat(expectedList.isEmpty()).as("Retrieved object list did not
contain expected objects.").isTrue();
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testInsertElementsCommand() throws Exception {
+
+ String expected_1 = "expected_1";
+ String expected_2 = "expected_2";
+ Object [] expectedArr = {expected_1, expected_2};
+ Collection<Object> factCollection = Arrays.asList(expectedArr);
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newInsertElements(factCollection,
"out_list", true, null));
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+
+ Collection<? extends Object> outList = (Collection<? extends Object>)
result.getValue("out_list");
+ assertThat(outList).isNotNull();
+ ksession.fireAllRules();
+
+ List<Object> expectedList = new
ArrayList<Object>(Arrays.asList(expectedArr));
+
+ Collection<? extends Object> factList = ksession.getObjects();
+ assertThat(factList.size() == expectedList.size()).as("Expected " +
expectedList.size() + " objects but retrieved " + factList.size()).isTrue();
+ for( Object fact : factList ) {
+ expectedList.remove(fact);
+ }
+ assertThat(expectedList.isEmpty()).as("Retrieved object list did not
contain expected objects.").isTrue();
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testSetGlobalCommand() throws Exception {
+
+ ksession.insert(new Integer(5));
+ ksession.insert(new Integer(7));
+ ksession.fireAllRules();
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newSetGlobal( "globalCheeseCountry",
"France", true ));
+
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+ assertThat(result).isNotNull();
+ Object global = result.getValue("globalCheeseCountry");
+ assertThat(global).isNotNull();
+ assertThat(global).isEqualTo("France");
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testGetGlobalCommand() throws Exception {
+
+ ksession.insert(new Integer(5));
+ ksession.insert(new Integer(7));
+ ksession.fireAllRules();
+ ksession.setGlobal("globalCheeseCountry", "France");
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newGetGlobal( "globalCheeseCountry",
"cheeseCountry" ));
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+ assertThat(result).as("GetGlobalCommand result is null!").isNotNull();
+ Object global = result.getValue("cheeseCountry");
+ assertThat(global).as("Retrieved global fact is null!").isNotNull();
+ assertThat(global).as("Retrieved global is not equal to
'France'.").isEqualTo("France");
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testGetObjectCommand() throws Exception {
+
+ String expected_1 = "expected_1";
+ String expected_2 = "expected_2";
+ FactHandle handle_1 = ksession.insert( expected_1 );
+ FactHandle handle_2 = ksession.insert( expected_2 );
+ ksession.fireAllRules();
+
+ Object fact = ksession.getObject(handle_1);
+ assertThat(fact).isNotNull();
+ assertThat(fact).isEqualTo(expected_1);
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newGetObject(handle_1, "out_1"));
+ commands.add(CommandFactory.newGetObject(handle_2, "out_2"));
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+ assertThat(result).as("GetObjectCommand result is null!").isNotNull();
+
+ assertThat(result.getValue("out_1")).isEqualTo(expected_1);
+ assertThat(result.getValue("out_2")).isEqualTo(expected_2);
+ }
+
+ @Test
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void testGetObjectsCommand() throws Exception {
+
+ String expected_1 = "expected_1";
+ String expected_2 = "expected_2";
+ FactHandle handle_1 = ksession.insert( expected_1 );
+ FactHandle handle_2 = ksession.insert( expected_2 );
+ ksession.fireAllRules();
+
+ Object object = ksession.getObject(handle_1);
+ assertThat(object).isNotNull();
+ assertThat(object).isEqualTo(expected_1);
+ object = ksession.getObject(handle_2);
+ assertThat(object).isNotNull();
+ assertThat(object).isEqualTo(expected_2);
+
+ List<Command<?>> commands = new ArrayList<Command<?>>();
+ commands.add(CommandFactory.newGetObjects("out_list"));
+ Command cmds = CommandFactory.newBatchExecution( commands );
+
+ ExecutionResults result = (ExecutionResults) ksession.execute( cmds );
+ assertThat(result).as("GetObjectsCommand result is null!").isNotNull();
+
+ List<Object> objectList = (List) result.getValue("out_list");
+ assertThat(objectList != null && !objectList.isEmpty()).as("Retrieved
object list is null or empty!").isTrue();
+
+ Collection<? extends Object> factList = ksession.getObjects();
+ Object [] expectedArr = {expected_1, expected_2};
+ List<Object> expectedList = new
ArrayList<Object>(Arrays.asList(expectedArr));
+ assertThat(factList.size() == expectedList.size()).as("Expected " +
expectedList.size() + " objects but retrieved " + factList.size()).isTrue();
+ for( Object fact : factList ) {
+ expectedList.remove(fact);
+ }
+ assertThat(expectedList.isEmpty()).as("Retrieved object list did not
contain expected objects.").isTrue();
+ }
+
}
diff --git a/drools-templates/pom.xml b/drools-templates/pom.xml
index 9194b46c1d..286ae1e329 100644
--- a/drools-templates/pom.xml
+++ b/drools-templates/pom.xml
@@ -79,13 +79,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git
a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java
b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java
index b95278bf3f..83eb143b44 100644
---
a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java
+++
b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java
@@ -29,8 +29,8 @@ import java.util.Map;
import org.drools.template.parser.Column;
import org.drools.template.parser.DefaultTemplateContainer;
import org.drools.template.parser.TemplateContainer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -83,7 +83,7 @@ public class DataProviderCompilerTest {
private ArrayList<String[]> rows = new ArrayList<String[]>();
- @Before
+ @BeforeEach
public void setUp() {
rows.add(new String[]{"1",
"STANDARD",
diff --git
a/drools-templates/src/test/java/org/drools/template/jdbc/ResultSetGeneratorTest.java
b/drools-templates/src/test/java/org/drools/template/jdbc/ResultSetGeneratorTest.java
index 7c91b775bc..734d24af85 100644
---
a/drools-templates/src/test/java/org/drools/template/jdbc/ResultSetGeneratorTest.java
+++
b/drools-templates/src/test/java/org/drools/template/jdbc/ResultSetGeneratorTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.builder.KnowledgeBuilder;
diff --git
a/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
b/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
index 0430fe73ce..6fe6dc6de5 100644
---
a/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
+++
b/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
b/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
index f974010747..9f67e1b11a 100644
---
a/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
+++
b/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-templates/src/test/java/org/drools/template/model/QueriesRenderTest.java
b/drools-templates/src/test/java/org/drools/template/model/QueriesRenderTest.java
index 65bf5da351..e8747074b8 100644
---
a/drools-templates/src/test/java/org/drools/template/model/QueriesRenderTest.java
+++
b/drools-templates/src/test/java/org/drools/template/model/QueriesRenderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
b/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
index 352156512d..f1f1629dad 100644
---
a/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
+++
b/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
b/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
index 4c30ec31e8..945d496d79 100644
---
a/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
+++
b/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.model;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
b/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
index 1a42ef0c86..cd9c256602 100644
---
a/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
+++
b/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.template.parser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git
a/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
b/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
index d9d6e3cd7e..98f2028bef 100644
---
a/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
+++
b/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
@@ -18,8 +18,8 @@
*/
package org.drools.template.parser;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class DefaultGeneratorTest {
private DefaultGenerator g;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Map<String, RuleTemplate> t = new HashMap<String, RuleTemplate>();
TemplateContainer tc = new TemplateContainer() {
diff --git
a/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
b/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
index c2fe0d302d..1c7379e24c 100644
---
a/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
+++
b/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git
a/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
b/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
index b605305d2d..66af096e4a 100644
---
a/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
+++
b/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.command.Command;
import org.kie.api.event.process.ProcessEventListener;
@@ -54,7 +54,7 @@ public class ExternalSheetListenerTest {
private List<Row> assertedRows = new ArrayList<>();
- @Before
+ @BeforeEach
public void setUp() throws Exception {
esl = new TemplateDataListener(2, 2, new TestTemplateContainer(), new
TestGenerator());
}
diff --git
a/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
b/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
index ea62ee8572..344ff92377 100644
---
a/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
+++
b/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
@@ -19,7 +19,7 @@
package org.drools.template.parser;
import org.drools.util.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
diff --git a/drools-tms/pom.xml b/drools-tms/pom.xml
index a04ae00e2a..a454a1b2d9 100644
--- a/drools-tms/pom.xml
+++ b/drools-tms/pom.xml
@@ -97,12 +97,11 @@
<artifactId>drools-wiring-dynamic</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</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>
@@ -115,5 +114,4 @@
</dependency>
</dependencies>
-
</project>
diff --git a/drools-tms/src/test/java/org/drools/tms/EqualityKeyTest.java
b/drools-tms/src/test/java/org/drools/tms/EqualityKeyTest.java
index c584a4a2ba..0e869e8e9b 100644
--- a/drools-tms/src/test/java/org/drools/tms/EqualityKeyTest.java
+++ b/drools-tms/src/test/java/org/drools/tms/EqualityKeyTest.java
@@ -22,7 +22,7 @@ import org.drools.core.common.EqualityKey;
import org.drools.core.common.InternalFactHandle;
import org.drools.core.reteoo.ReteooFactHandleFactory;
import org.drools.core.test.model.Cheese;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-tms/src/test/java/org/drools/tms/LazyTMSEnablingTest.java
b/drools-tms/src/test/java/org/drools/tms/LazyTMSEnablingTest.java
index 089d154546..12389353de 100644
--- a/drools-tms/src/test/java/org/drools/tms/LazyTMSEnablingTest.java
+++ b/drools-tms/src/test/java/org/drools/tms/LazyTMSEnablingTest.java
@@ -24,8 +24,8 @@ import org.drools.core.reteoo.ObjectTypeConf;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +46,7 @@ public class LazyTMSEnablingTest {
private StatefulKnowledgeSessionImpl ksession;
private TruthMaintenanceSystem tms;
- @Before
+ @BeforeEach
public void setUp() {
InternalKnowledgeBase kBase = KnowledgeBaseFactory.newKnowledgeBase();
ksession = (StatefulKnowledgeSessionImpl)kBase.newKieSession();
diff --git a/drools-wiring/drools-wiring-api/pom.xml
b/drools-wiring/drools-wiring-api/pom.xml
index ae3a1228f7..cb88a2d26d 100755
--- a/drools-wiring/drools-wiring-api/pom.xml
+++ b/drools-wiring/drools-wiring-api/pom.xml
@@ -61,11 +61,11 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-wiring/drools-wiring-api/src/test/java/org/drools/wiring/api/classloader/ProjectClassLoaderTest.java
b/drools-wiring/drools-wiring-api/src/test/java/org/drools/wiring/api/classloader/ProjectClassLoaderTest.java
index 15f7cfbd80..a90c8739e1 100644
---
a/drools-wiring/drools-wiring-api/src/test/java/org/drools/wiring/api/classloader/ProjectClassLoaderTest.java
+++
b/drools-wiring/drools-wiring-api/src/test/java/org/drools/wiring/api/classloader/ProjectClassLoaderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.wiring.api.classloader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/drools-wiring/drools-wiring-dynamic/pom.xml
b/drools-wiring/drools-wiring-dynamic/pom.xml
index 355a9d666d..58d833d294 100755
--- a/drools-wiring/drools-wiring-dynamic/pom.xml
+++ b/drools-wiring/drools-wiring-dynamic/pom.xml
@@ -83,11 +83,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-wiring/drools-wiring-dynamic/src/test/java/org/drools/dynamic/ClassLoaderTest.java
b/drools-wiring/drools-wiring-dynamic/src/test/java/org/drools/dynamic/ClassLoaderTest.java
index a120c4f390..dd92b9d518 100755
---
a/drools-wiring/drools-wiring-dynamic/src/test/java/org/drools/dynamic/ClassLoaderTest.java
+++
b/drools-wiring/drools-wiring-dynamic/src/test/java/org/drools/dynamic/ClassLoaderTest.java
@@ -24,13 +24,16 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.drools.wiring.api.classloader.ProjectClassLoader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
public class ClassLoaderTest {
- @Test(timeout = 20000)
+ @Test
+ @Timeout(value = 20000, unit = TimeUnit.MILLISECONDS)
public void testParallelClassLoading() {
final int THREAD_COUNT = 100;
diff --git a/drools-wiring/drools-wiring-static/pom.xml
b/drools-wiring/drools-wiring-static/pom.xml
index 07bd2d42bd..8f56b76232 100755
--- a/drools-wiring/drools-wiring-static/pom.xml
+++ b/drools-wiring/drools-wiring-static/pom.xml
@@ -62,16 +62,16 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/drools-wiring/drools-wiring-static/src/test/java/org/drools/wiring/statics/DummyByteArrayClassLoaderTest.java
b/drools-wiring/drools-wiring-static/src/test/java/org/drools/wiring/statics/DummyByteArrayClassLoaderTest.java
index 0c7eafc483..024f6d2b69 100644
---
a/drools-wiring/drools-wiring-static/src/test/java/org/drools/wiring/statics/DummyByteArrayClassLoaderTest.java
+++
b/drools-wiring/drools-wiring-static/src/test/java/org/drools/wiring/statics/DummyByteArrayClassLoaderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.wiring.statics;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
