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 8634df0ce6 [incubator-kie-drools-6136] Migrate drools kie manve plugin
tests to JUnit5 - #6 (#6170)
8634df0ce6 is described below
commit 8634df0ce6cadd036e18d6c38a4a7dcbff00291c
Author: Paolo Bizzarri <[email protected]>
AuthorDate: Fri Nov 22 18:30:01 2024 +0100
[incubator-kie-drools-6136] Migrate drools kie manve plugin tests to JUnit5
- #6 (#6170)
* More tests migrated
* Migrated tests to Junit5
* Migrated module to JUnit5
* Migrated kie-ci module
---
kie-ci/pom.xml | 6 +++---
...KieModuleDeploymentHelperLoadResourcesTest.java | 2 +-
.../helper/KieModuleDeploymentHelperTest.java | 6 +++---
.../declarativetypes/JavaBeansEventRoleTest.java | 2 +-
.../kie/scanner/DependentScopeNamedBeanTest.java | 2 +-
.../java/org/kie/scanner/KieModuleBuilderTest.java | 10 ++++-----
.../KieModuleIncrementalCompilationTest.java | 2 +-
.../java/org/kie/scanner/KieModuleMavenTest.java | 2 +-
.../org/kie/scanner/KieModuleMetaDataImplTest.java | 2 +-
.../org/kie/scanner/KieModuleMetaDataTest.java | 2 +-
.../kie/scanner/KieRepositoryScannerNexusTest.java | 14 ++++++-------
.../org/kie/scanner/KieRepositoryScannerTest.java | 24 +++++++++++++---------
.../KieScannerIncrementalCompilationTest.java | 6 +++---
.../scanner/concurrent/ConcurrentBuildTest.java | 14 +++++++------
.../org/kie/scanner/embedder/MavenDeployTest.java | 2 +-
.../scanner/management/KieScannerMBeanTest.java | 10 ++++-----
kie-maven-plugin/pom.xml | 5 -----
.../plugin/ittests/ExecModelParameterTestIT.java | 7 ++-----
.../plugin/ittests/ExecModelParameterTestIT.java | 7 ++-----
.../plugin/ittests/ExecModelParameterTestIT.java | 5 ++---
.../plugin/ittests/ExecModelParameterTestIT.java | 7 ++-----
.../plugin/ittests/BuildPMMLTrustyTestIT.java | 13 ++++++------
.../plugin/ittests/AlphaNetworkCompilerTestIT.java | 14 ++++++-------
.../java/org/drools/ruleunit/example/LoanTest.java | 10 ++++-----
.../org/kie/maven/plugin/ittests/YamlTestIT.java | 21 ++++++++-----------
.../AdditionalPropertiesIntegrationTestIT.java | 8 ++++----
.../ittests/KJarWithDMNIntegrationTestIT.java | 3 +--
.../ittests/KJarWithDMNIntegrationTestIT.java | 5 ++---
.../maven/plugin/ittests/MultiModuleTestIT.java | 7 ++-----
.../maven/plugin/ittests/MultiModuleTestIT.java | 5 ++---
.../maven/plugin/ittests/DeclaredTypesTestIT.java | 12 +++++------
.../maven/plugin/ittests/DeclaredTypesTestIT.java | 12 +++++------
.../kie-maven-plugin-test-kjar-common/pom.xml | 9 ++++----
.../org/kie/maven/plugin/ittests/ITTestsUtils.java | 18 ++++++++--------
.../kie-maven-plugin-test-kjar-parent/pom.xml | 9 ++++----
35 files changed, 131 insertions(+), 152 deletions(-)
diff --git a/kie-ci/pom.xml b/kie-ci/pom.xml
index 4e5c85613b..3aee239da1 100644
--- a/kie-ci/pom.xml
+++ b/kie-ci/pom.xml
@@ -150,10 +150,10 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
diff --git
a/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperLoadResourcesTest.java
b/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperLoadResourcesTest.java
index 4f4ae25e5b..e5fee8b3da 100644
---
a/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperLoadResourcesTest.java
+++
b/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperLoadResourcesTest.java
@@ -23,7 +23,7 @@ import java.io.FileOutputStream;
import java.util.List;
import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.builder.helper.KieModuleDeploymentHelperImpl.KJarResource;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperTest.java
b/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperTest.java
index def9532ac3..005054d844 100644
---
a/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperTest.java
+++
b/kie-ci/src/test/java/org/kie/api/builder/helper/KieModuleDeploymentHelperTest.java
@@ -30,8 +30,8 @@ import java.util.zip.ZipInputStream;
import org.drools.core.impl.EnvironmentImpl;
import org.drools.core.test.model.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.builder.KieModule;
import org.kie.api.builder.model.KieBaseModel;
import org.kie.api.conf.EqualityBehaviorOption;
@@ -49,7 +49,7 @@ public class KieModuleDeploymentHelperTest {
private ZipInputStream zip;
- @After
+ @AfterEach
public void cleanUp() {
if (zip != null) {
try {
diff --git
a/kie-ci/src/test/java/org/kie/declarativetypes/JavaBeansEventRoleTest.java
b/kie-ci/src/test/java/org/kie/declarativetypes/JavaBeansEventRoleTest.java
index a196274469..35a4c7c439 100644
--- a/kie-ci/src/test/java/org/kie/declarativetypes/JavaBeansEventRoleTest.java
+++ b/kie-ci/src/test/java/org/kie/declarativetypes/JavaBeansEventRoleTest.java
@@ -20,7 +20,7 @@ package org.kie.declarativetypes;
import org.drools.base.rule.TypeMetaInfo;
import org.drools.mvel.CommonTestMethodBase;
-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.builder.KieFileSystem;
diff --git
a/kie-ci/src/test/java/org/kie/scanner/DependentScopeNamedBeanTest.java
b/kie-ci/src/test/java/org/kie/scanner/DependentScopeNamedBeanTest.java
index 8a7b98370f..9ee8df1bee 100644
--- a/kie-ci/src/test/java/org/kie/scanner/DependentScopeNamedBeanTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/DependentScopeNamedBeanTest.java
@@ -20,7 +20,7 @@ package org.kie.scanner;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.maven.integration.MavenPomModelGenerator;
import org.kie.util.maven.support.PomModel;
import org.kie.util.maven.support.PomModelGenerator;
diff --git a/kie-ci/src/test/java/org/kie/scanner/KieModuleBuilderTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieModuleBuilderTest.java
index bc7e0ad68c..aa5c97d583 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieModuleBuilderTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieModuleBuilderTest.java
@@ -26,9 +26,9 @@ import java.io.InputStream;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.core.util.FileManager;
-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.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -44,13 +44,13 @@ public class KieModuleBuilderTest extends AbstractKieCiTest
{
private FileManager fileManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.fileManager = new FileManager();
this.fileManager.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.fileManager.tearDown();
}
diff --git
a/kie-ci/src/test/java/org/kie/scanner/KieModuleIncrementalCompilationTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieModuleIncrementalCompilationTest.java
index 6f4d6e53be..7b98d52502 100644
---
a/kie-ci/src/test/java/org/kie/scanner/KieModuleIncrementalCompilationTest.java
+++
b/kie-ci/src/test/java/org/kie/scanner/KieModuleIncrementalCompilationTest.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.HashMap;
import org.drools.drl.parser.MessageImpl;
-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.builder.KieFileSystem;
diff --git a/kie-ci/src/test/java/org/kie/scanner/KieModuleMavenTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieModuleMavenTest.java
index 2d66e152fb..b3fb596152 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieModuleMavenTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieModuleMavenTest.java
@@ -34,7 +34,7 @@ import org.drools.compiler.kie.builder.impl.KieContainerImpl;
import org.drools.compiler.kie.builder.impl.KieRepositoryImpl;
import org.drools.compiler.kie.builder.impl.KieServicesImpl;
import org.drools.mvel.asm.DefaultBeanClassBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
diff --git
a/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataImplTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataImplTest.java
index 830e851cb2..35c244e560 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataImplTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataImplTest.java
@@ -18,7 +18,7 @@
*/
package org.kie.scanner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataTest.java
index 8188a23e8a..7f031a7231 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataTest.java
@@ -19,8 +19,8 @@
package org.kie.scanner;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
+import org.junit.jupiter.api.Test;
import org.drools.base.rule.TypeMetaInfo;
-import org.junit.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
diff --git
a/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerNexusTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerNexusTest.java
index 6855bb248b..a180ab7ca3 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerNexusTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerNexusTest.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.core.util.FileManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieModule;
import org.kie.api.builder.ReleaseId;
@@ -48,13 +48,13 @@ import static
org.kie.scanner.KieMavenRepository.getKieMavenRepository;
* 3. Note that this test uses 'http://localhost:8081' as nexus target, with
the default nexus user name 'admin' and password 'admin123'
*
*/
-@Ignore("ignored because it needs a running nexus server")
+@Disabled("ignored because it needs a running nexus server")
public class KieRepositoryScannerNexusTest extends AbstractKieCiTest {
private static final Logger LOG =
LoggerFactory.getLogger(KieRepositoryScannerNexusTest.class);
private FileManager fileManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
System.setProperty("kie.maven.settings.custom", new
File("target/test-classes/org/kie/scanner/settings_nexus.xml").getAbsolutePath());
this.fileManager = new FileManager();
@@ -62,7 +62,7 @@ public class KieRepositoryScannerNexusTest extends
AbstractKieCiTest {
ReleaseId releaseId =
KieServices.Factory.get().newReleaseId("org.kie", "scanner-test",
"1.0-SNAPSHOT");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.fileManager.tearDown();
}
diff --git a/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerTest.java
index b06a622833..240caa36d6 100644
--- a/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerTest.java
@@ -31,10 +31,10 @@ import
org.drools.compiler.kie.builder.impl.KieFileSystemImpl;
import
org.drools.compiler.kie.builder.impl.event.KieScannerStatusChangeEventImpl;
import
org.drools.compiler.kie.builder.impl.event.KieScannerUpdateResultsEventImpl;
import org.drools.core.util.FileManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -63,14 +63,14 @@ public class KieRepositoryScannerTest extends
AbstractKieCiTest {
private FileManager fileManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.fileManager = new FileManager();
this.fileManager.setUp();
ReleaseId releaseId =
KieServices.Factory.get().newReleaseId("org.kie", "scanner-test",
"1.0-SNAPSHOT");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.fileManager.tearDown();
}
@@ -115,7 +115,8 @@ public class KieRepositoryScannerTest extends
AbstractKieCiTest {
ks.getRepository().removeKieModule(releaseId);
}
- @Test @Ignore("used only for check performances")
+ @Test
+ @Disabled("used only for check performances")
public void testKScannerWithDependencies() throws Exception {
KieServices ks = KieServices.Factory.get();
ReleaseId releaseIdNoDep = ks.newReleaseId( "org.kie", "test-no-dep",
"1.0-SNAPSHOT" );
@@ -136,7 +137,8 @@ public class KieRepositoryScannerTest extends
AbstractKieCiTest {
System.out.println("done in " + (System.nanoTime() - start));
}
- @Test @Ignore("avoid use external dependency")
+ @Test
+ @Disabled("avoid use external dependency")
public void testKScannerWithTransitiveInclusion() throws Exception {
String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
@@ -168,7 +170,8 @@ public class KieRepositoryScannerTest extends
AbstractKieCiTest {
}
}
- @Test @Ignore("avoid use external dependency")
+ @Test
+ @Disabled("avoid use external dependency")
public void testKScannerWithExclusion() throws Exception {
String pom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<project xmlns=\"http://maven.apache.org/POM/4.0.0\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
@@ -902,7 +905,8 @@ public class KieRepositoryScannerTest extends
AbstractKieCiTest {
ks.getRepository().removeKieModule(includedReleaseId);
}
- @Test @Ignore
+ @Test
+ @Disabled
public void testScanIncludedAndIncludingDependency() throws Exception {
KieMavenRepository repository = getKieMavenRepository();
KieServices ks = KieServices.Factory.get();
diff --git
a/kie-ci/src/test/java/org/kie/scanner/KieScannerIncrementalCompilationTest.java
b/kie-ci/src/test/java/org/kie/scanner/KieScannerIncrementalCompilationTest.java
index 8b48b8f57a..ceee7f00ec 100644
---
a/kie-ci/src/test/java/org/kie/scanner/KieScannerIncrementalCompilationTest.java
+++
b/kie-ci/src/test/java/org/kie/scanner/KieScannerIncrementalCompilationTest.java
@@ -25,8 +25,8 @@ import java.util.List;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.core.util.FileManager;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -46,7 +46,7 @@ public class KieScannerIncrementalCompilationTest extends
AbstractKieCiTest {
private FileManager fileManager;
private ReleaseId releaseId;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.fileManager = new FileManager();
this.fileManager.setUp();
diff --git
a/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java
b/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java
index f551e52196..0b49f0707e 100644
--- a/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/concurrent/ConcurrentBuildTest.java
@@ -25,10 +25,11 @@ import java.util.concurrent.TimeUnit;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.core.util.FileManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.kie.api.KieServices;
import org.kie.api.builder.ReleaseId;
import org.kie.scanner.AbstractKieCiTest;
@@ -46,20 +47,21 @@ public class ConcurrentBuildTest extends AbstractKieCiTest {
private FileManager fileManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
this.fileManager = new FileManager();
this.fileManager.setUp();
ReleaseId releaseId =
KieServices.Factory.get().newReleaseId("org.kie", "scanner-test",
"1.0-SNAPSHOT");
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.fileManager.tearDown();
}
// This is TurtleTest. You can run this test with -PrunTurtleTests
- @Test(timeout=600000)
+ @Test
+ @Timeout(600000)
public void concurrentBuildWithDependency() throws Exception {
KieServices ks = KieServices.Factory.get();
KieMavenRepository repository = getKieMavenRepository();
diff --git a/kie-ci/src/test/java/org/kie/scanner/embedder/MavenDeployTest.java
b/kie-ci/src/test/java/org/kie/scanner/embedder/MavenDeployTest.java
index 3323901be3..041a670bac 100644
--- a/kie-ci/src/test/java/org/kie/scanner/embedder/MavenDeployTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/embedder/MavenDeployTest.java
@@ -25,7 +25,7 @@ import java.nio.file.Path;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.eclipse.aether.repository.RemoteRepository;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieScanner;
import org.kie.api.builder.ReleaseId;
diff --git
a/kie-ci/src/test/java/org/kie/scanner/management/KieScannerMBeanTest.java
b/kie-ci/src/test/java/org/kie/scanner/management/KieScannerMBeanTest.java
index bffab7438d..f22df73db3 100644
--- a/kie-ci/src/test/java/org/kie/scanner/management/KieScannerMBeanTest.java
+++ b/kie-ci/src/test/java/org/kie/scanner/management/KieScannerMBeanTest.java
@@ -25,9 +25,9 @@ import javax.management.ObjectName;
import org.drools.compiler.kie.builder.impl.InternalKieModule;
import org.drools.compiler.kie.builder.impl.InternalKieScanner;
import org.drools.core.util.FileManager;
-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.KieServices;
import org.kie.api.builder.ReleaseId;
import org.kie.api.runtime.KieContainer;
@@ -43,7 +43,7 @@ public class KieScannerMBeanTest extends AbstractKieCiTest {
private FileManager fileManager;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
MBeanUtils.setMBeanEnabled(true);
System.setProperty(MBeanUtils.MBEANS_PROPERTY, "enabled");
@@ -51,7 +51,7 @@ public class KieScannerMBeanTest extends AbstractKieCiTest {
this.fileManager.setUp();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.fileManager.tearDown();
System.setProperty(MBeanUtils.MBEANS_PROPERTY, "");
diff --git a/kie-maven-plugin/pom.xml b/kie-maven-plugin/pom.xml
index f982fb0aaf..7211308b75 100644
--- a/kie-maven-plugin/pom.xml
+++ b/kie-maven-plugin/pom.xml
@@ -366,11 +366,6 @@
<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-engine</artifactId>
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
index c9a0de4cf9..4042783e45 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
@@ -20,16 +20,13 @@ package org.kie.maven.plugin.ittests;
import java.net.URL;
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.builder.KieModule;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
public class ExecModelParameterTestIT {
@@ -43,7 +40,7 @@ public class ExecModelParameterTestIT {
public void testWithoutDroolsModelCompilerOnClassPathDoNotRunExecModel()
throws Exception {
KieModule kieModule = fireRule();
assertThat(kieModule).isNotNull();
-
assertFalse(kieModule.getClass().getCanonicalName().equals(CANONICAL_KIE_MODULE));
+
assertThat(kieModule.getClass().getCanonicalName()).isNotEqualTo(CANONICAL_KIE_MODULE);
}
private KieModule fireRule() throws Exception {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
index 1436b80970..21bf6041e3 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-10-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
@@ -20,16 +20,13 @@ package org.kie.maven.plugin.ittests;
import java.net.URL;
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.builder.KieModule;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
public class ExecModelParameterTestIT {
@@ -43,7 +40,7 @@ public class ExecModelParameterTestIT {
public void testWithoutDroolsModelCompilerOnClassPathDoNotRunExecModel()
throws Exception {
KieModule kieModule = fireRule();
assertThat(kieModule).isNotNull();
-
assertFalse(kieModule.getClass().getCanonicalName().equals(CANONICAL_KIE_MODULE));
+
assertThat(kieModule.getClass().getCanonicalName()).isNotEqualTo(CANONICAL_KIE_MODULE);
}
private KieModule fireRule() throws Exception {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
index 6a05bd465d..83c22a9091 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-default/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
@@ -21,11 +21,10 @@ package org.kie.maven.plugin.ittests;
import java.net.URL;
import org.drools.modelcompiler.CanonicalKieModule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.builder.KieModule;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
public class ExecModelParameterTestIT {
@@ -38,7 +37,7 @@ public class ExecModelParameterTestIT {
public void testWithoutDroolsModelCompilerOnClassPathDoNotRunExecModel()
throws Exception {
KieModule kieModule = fireRule();
assertThat(kieModule).isNotNull();
- assertTrue(kieModule instanceof CanonicalKieModule);
+ assertThat(kieModule).isInstanceOf(CanonicalKieModule.class);
}
private KieModule fireRule() throws Exception {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
index 8afd4f2090..88fbad464b 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-11-yes-generate/src/test/java-filtered/org/kie/maven/plugin/ittests/ExecModelParameterTestIT.java
@@ -20,17 +20,14 @@ package org.kie.maven.plugin.ittests;
import java.net.URL;
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
import org.drools.modelcompiler.CanonicalKieModule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.builder.KieModule;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
public class ExecModelParameterTestIT {
@@ -43,7 +40,7 @@ public class ExecModelParameterTestIT {
public void testWithoutDroolsModelCompilerOnClassPathDoNotRunExecModel()
throws Exception {
KieModule kieModule = fireRule();
assertThat(kieModule).isNotNull();
- assertTrue(kieModule instanceof CanonicalKieModule);
+ assertThat(kieModule).isInstanceOf(CanonicalKieModule.class);
}
private KieModule fireRule() throws Exception {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-12/src/test/java-filtered/org/kie/maven/plugin/ittests/BuildPMMLTrustyTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-12/src/test/java-filtered/org/kie/maven/plugin/ittests/BuildPMMLTrustyTestIT.java
index 287b2d6534..742fc12a2f 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-12/src/test/java-filtered/org/kie/maven/plugin/ittests/BuildPMMLTrustyTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-12/src/test/java-filtered/org/kie/maven/plugin/ittests/BuildPMMLTrustyTestIT.java
@@ -28,8 +28,9 @@ import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
public class BuildPMMLTrustyTestIT {
@@ -54,9 +55,9 @@ public class BuildPMMLTrustyTestIT {
jarContent.add(entryName);
}
- Assertions.assertThat(jarContent).isNotEmpty();
- Assertions.assertThat(jarContent).contains(PMML_FILE_NAME);
- Assertions.assertThat(jarContent).contains(INDEX_FILE_NAME);
- EXAMPLE_PMML_CLASSES.forEach(examplePMMLClass ->
Assertions.assertThat(jarContent).contains(examplePMMLClass));
+ assertThat(jarContent).isNotEmpty();
+ assertThat(jarContent).contains(PMML_FILE_NAME);
+ assertThat(jarContent).contains(INDEX_FILE_NAME);
+ EXAMPLE_PMML_CLASSES.forEach(examplePMMLClass ->
assertThat(jarContent).contains(examplePMMLClass));
}
}
\ No newline at end of file
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-13/src/test/java-filtered/org/kie/maven/plugin/ittests/AlphaNetworkCompilerTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-13/src/test/java-filtered/org/kie/maven/plugin/ittests/AlphaNetworkCompilerTestIT.java
index 08613bff8f..5ec8900120 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-13/src/test/java-filtered/org/kie/maven/plugin/ittests/AlphaNetworkCompilerTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-13/src/test/java-filtered/org/kie/maven/plugin/ittests/AlphaNetworkCompilerTestIT.java
@@ -22,20 +22,18 @@ import java.lang.reflect.Constructor;
import java.net.URL;
import java.util.List;
-import org.assertj.core.api.Assertions;
import org.drools.ancompiler.CompiledNetwork;
import org.drools.ancompiler.ObjectTypeNodeCompiler;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.core.reteoo.ObjectSinkPropagator;
import org.drools.core.reteoo.ObjectTypeNode;
import org.drools.core.reteoo.Rete;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
public class AlphaNetworkCompilerTestIT {
@@ -48,12 +46,12 @@ public class AlphaNetworkCompilerTestIT {
final URL targetLocation =
AlphaNetworkCompilerTestIT.class.getProtectionDomain().getCodeSource().getLocation();
final KieContainer kieContainer =
ITTestsUtils.getKieContainer(targetLocation, GAV_ARTIFACT_ID, GAV_VERSION);
final KieBase kieBase = kieContainer.getKieBase(KBASE_NAME);
- Assertions.assertThat(kieBase).isNotNull();
+ assertThat(kieBase).isNotNull();
KieSession kSession = null;
try {
kSession = kieBase.newKieSession();
- Assertions.assertThat(kSession).isNotNull();
+ assertThat(kSession).isNotNull();
ClassLoader classLoader = kieContainer.getClassLoader();
Class<?> aClass = Class.forName("org.compiledalphanetwork.Person",
true, classLoader);
@@ -64,7 +62,7 @@ public class AlphaNetworkCompilerTestIT {
int rulesFired = kSession.fireAllRules();
kSession.dispose();
- assertEquals(1, rulesFired);
+ assertThat(rulesFired).isEqualTo(1);
assertReteIsAlphaNetworkCompiled(kSession);
@@ -79,7 +77,7 @@ public class AlphaNetworkCompilerTestIT {
for(ObjectTypeNode otn : objectTypeNodes) {
ObjectSinkPropagator objectSinkPropagator =
otn.getObjectSinkPropagator();
System.out.println(objectSinkPropagator.getClass().getCanonicalName());
- assertTrue(objectSinkPropagator instanceof CompiledNetwork);
+
assertThat(objectSinkPropagator).isInstanceOf(CompiledNetwork.class);
}
}
}
\ No newline at end of file
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-14-ruleunits/src/test/java/org/drools/ruleunit/example/LoanTest.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-14-ruleunits/src/test/java/org/drools/ruleunit/example/LoanTest.java
index c973178b15..3c6b0bc6aa 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-14-ruleunits/src/test/java/org/drools/ruleunit/example/LoanTest.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-14-ruleunits/src/test/java/org/drools/ruleunit/example/LoanTest.java
@@ -23,10 +23,10 @@ import java.util.Map;
import org.drools.ruleunits.api.RuleUnitInstance;
import org.drools.ruleunits.api.RuleUnitProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
public class LoanTest {
@@ -43,8 +43,8 @@ public class LoanTest {
List<LoanApplication> results =
instance.executeQuery("FindApproved").toList("$l");
- assertEquals(1, results.size());
- assertEquals("ABC10001", results.get(0).getId());
- assertEquals("John", results.get(0).getApplicant().getName());
+ assertThat(results).hasSize(1);
+ assertThat(results.get(0).getId()).isEqualTo("ABC10001");
+ assertThat(results.get(0).getApplicant().getName()).isEqualTo("John");
}
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-15-yaml/src/test/java-filtered/org/kie/maven/plugin/ittests/YamlTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-15-yaml/src/test/java-filtered/org/kie/maven/plugin/ittests/YamlTestIT.java
index ded38386ad..d95c193fb0 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-15-yaml/src/test/java-filtered/org/kie/maven/plugin/ittests/YamlTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-15-yaml/src/test/java-filtered/org/kie/maven/plugin/ittests/YamlTestIT.java
@@ -27,15 +27,11 @@ import java.util.Set;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieContainer;
-
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
import org.kie.api.runtime.KieSession;
-
+import org.junit.jupiter.api.Test;
import org.yaml.Measurement;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
public class YamlTestIT {
@@ -50,12 +46,12 @@ public class YamlTestIT {
final URL targetLocation =
YamlTestIT.class.getProtectionDomain().getCodeSource().getLocation();
final KieContainer kieContainer =
ITTestsUtils.getKieContainer(targetLocation, GAV_ARTIFACT_ID, GAV_VERSION);
final KieBase kieBase = kieContainer.getKieBase(KBASE_NAME);
- Assertions.assertThat(kieBase).isNotNull();
+ assertThat(kieBase).isNotNull();
KieSession kSession = null;
try {
kSession = kieBase.newKieSession();
- Assertions.assertThat(kSession).isNotNull();
+ assertThat(kSession).isNotNull();
Set<String> check = new HashSet<String>();
kSession.setGlobal("controlSet", check);
@@ -72,11 +68,10 @@ public class YamlTestIT {
kSession.insert(mBlue);
kSession.fireAllRules();
- assertEquals("Size of object in Working Memory is 3", 3,
kSession.getObjects().size());
- assertTrue("contains red", check.contains("red"));
- assertTrue("contains green", check.contains("green"));
- assertTrue("contains blue", check.contains("blue"));
-
+ assertThat(kSession.getObjects()).as("Size of object in Working
Memory is 3").hasSize(3);
+ assertThat(check).as("contains red").contains("red");
+ assertThat(check).as("contains green").contains("green");
+ assertThat(check).as("contains blue").contains("blue");
} finally {
kSession.dispose();
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-3/src/test/java/org/kie/maven/plugin/ittests/AdditionalPropertiesIntegrationTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-3/src/test/java/org/kie/maven/plugin/ittests/AdditionalPropertiesIntegrationTestIT.java
index 8456c26268..1c24a20ddb 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-3/src/test/java/org/kie/maven/plugin/ittests/AdditionalPropertiesIntegrationTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-3/src/test/java/org/kie/maven/plugin/ittests/AdditionalPropertiesIntegrationTestIT.java
@@ -23,9 +23,9 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
public class AdditionalPropertiesIntegrationTestIT {
@@ -38,7 +38,7 @@ public class AdditionalPropertiesIntegrationTestIT {
final File basedir = new
File(targetLocation.getFile().replace("/target/test-classes/", ""));
final File buildLog = new File(basedir, "build.log");
final String expected = "Additional system properties:
{drools.dialect.java.compiler.lnglevel=1.8, my.property=some-value}";
- assertTrue(Files.lines(buildLog.toPath(), StandardCharsets.UTF_8)
- .anyMatch(line -> line.contains(expected)));
+ assertThat(Files.lines(buildLog.toPath(), StandardCharsets.UTF_8)
+ .anyMatch(line ->
line.contains(expected))).isTrue();
}
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
index e4b4c55e3a..7226cea4d3 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
@@ -27,8 +27,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.runtime.KieContainer;
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
index cd4e188ded..e3f4da553d 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-7-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/KJarWithDMNIntegrationTestIT.java
@@ -27,8 +27,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.runtime.KieContainer;
@@ -38,8 +37,8 @@ import org.kie.dmn.api.core.DMNModel;
import org.kie.dmn.api.core.DMNResult;
import org.kie.dmn.api.core.DMNRuntime;
import org.kie.dmn.core.api.DMNFactory;
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class KJarWithDMNIntegrationTestIT {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-exec-model/kie-maven-plugin-test-kjar-8-modA-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-exec-model/kie-maven-plugin-test-kjar-8-modA-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
index 1e6526ad73..3c832527c7 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-exec-model/kie-maven-plugin-test-kjar-8-modA-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-exec-model/kie-maven-plugin-test-kjar-8-modA-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
@@ -26,11 +26,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
-
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.definition.KiePackage;
import org.kie.api.definition.type.FactType;
@@ -38,7 +35,7 @@ import org.kie.api.runtime.KieContainer;
import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
public class MultiModuleTestIT {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-no-exec-model/kie-maven-plugin-test-kjar-8-modA-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-no-exec-model/kie-maven-plugin-test-kjar-8-modA-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
index 8c59f02e6d..496e302d52 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-no-exec-model/kie-maven-plugin-test-kjar-8-modA-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-8-no-exec-model/kie-maven-plugin-test-kjar-8-modA-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/MultiModuleTestIT.java
@@ -26,9 +26,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.definition.KiePackage;
import org.kie.api.definition.type.FactType;
@@ -36,7 +35,7 @@ import org.kie.api.runtime.KieContainer;
import static java.util.Arrays.asList;
import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
public class MultiModuleTestIT {
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
index cfdda1d8a4..acd96b7eae 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
@@ -25,15 +25,13 @@ import java.net.URLClassLoader;
import java.util.HashSet;
import java.util.Set;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
-
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
import org.kie.api.runtime.KieSession;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
public class DeclaredTypesTestIT {
@@ -48,12 +46,12 @@ public class DeclaredTypesTestIT {
final URL targetLocation =
DeclaredTypesTestIT.class.getProtectionDomain().getCodeSource().getLocation();
final KieContainer kieContainer =
ITTestsUtils.getKieContainer(targetLocation, GAV_ARTIFACT_ID, GAV_VERSION);
final KieBase kieBase = kieContainer.getKieBase(KBASE_NAME);
- Assertions.assertThat(kieBase).isNotNull();
+ assertThat(kieBase).isNotNull();
KieSession kSession = null;
try {
kSession = kieBase.newKieSession();
- Assertions.assertThat(kSession).isNotNull();
+ assertThat(kSession).isNotNull();
ClassLoader classLoader = kieContainer.getClassLoader();
Class<?> aClass = Class.forName("org.declaredtype.FactA", true,
classLoader);
@@ -64,7 +62,7 @@ public class DeclaredTypesTestIT {
int rulesFired = kSession.fireAllRules();
kSession.dispose();
- assertEquals(1, rulesFired);
+ assertThat(rulesFired).isEqualTo(1);
} finally {
kSession.dispose();
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
index 15d5533cba..6bdeb02f47 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-9-no-exec-model/src/test/java-filtered/org/kie/maven/plugin/ittests/DeclaredTypesTestIT.java
@@ -27,11 +27,11 @@ import org.kie.api.KieBase;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.runtime.KieSession;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class DeclaredTypesTestIT {
@@ -45,12 +45,12 @@ public class DeclaredTypesTestIT {
final URL targetLocation =
DeclaredTypesTestIT.class.getProtectionDomain().getCodeSource().getLocation();
final KieContainer kieContainer =
ITTestsUtils.getKieContainer(targetLocation, GAV_ARTIFACT_ID, GAV_VERSION);
final KieBase kieBase = kieContainer.getKieBase(KBASE_NAME);
- Assertions.assertThat(kieBase).isNotNull();
+ assertThat(kieBase).isNotNull();
KieSession kSession = null;
try {
kSession = kieBase.newKieSession();
- Assertions.assertThat(kSession).isNotNull();
+ assertThat(kSession).isNotNull();
ClassLoader classLoader = kieContainer.getClassLoader();
Class<?> aClass = Class.forName("org.declaredtype.FactA", true,
classLoader);
@@ -61,7 +61,7 @@ public class DeclaredTypesTestIT {
int rulesFired = kSession.fireAllRules();
kSession.dispose();
- assertEquals(1, rulesFired);
+ assertThat(rulesFired).isEqualTo(1);
} finally {
kSession.dispose();
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/pom.xml
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/pom.xml
index 66518508a8..a90120b919 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/pom.xml
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/pom.xml
@@ -42,10 +42,11 @@
<version>@org.kie.version@</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/src/main/java/org/kie/maven/plugin/ittests/ITTestsUtils.java
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/src/main/java/org/kie/maven/plugin/ittests/ITTestsUtils.java
index 98b427469b..9afae835fb 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/src/main/java/org/kie/maven/plugin/ittests/ITTestsUtils.java
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-common/src/main/java/org/kie/maven/plugin/ittests/ITTestsUtils.java
@@ -24,7 +24,6 @@ import java.net.URLClassLoader;
import java.util.HashSet;
import java.util.Set;
-import org.assertj.core.api.Assertions;
import org.drools.compiler.kie.builder.impl.KieContainerImpl;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
@@ -32,7 +31,8 @@ import org.kie.api.builder.KieModule;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+
public class ITTestsUtils {
@@ -43,7 +43,7 @@ public class ITTestsUtils {
public static File getKjarFile(final URL targetLocation, final String
gavArtifactId, final String gavVersion) throws Exception {
final File basedir = new
File(targetLocation.getFile().replace("/test-classes/", ""));
final File toReturn = new File(basedir, gavArtifactId + "-" +
gavVersion + ".jar");
- Assertions.assertThat(toReturn).exists();
+ assertThat(toReturn).exists();
return toReturn;
}
@@ -55,28 +55,28 @@ public class ITTestsUtils {
final KieServices kieServices = KieServices.get();
final KieContainer toReturn =
kieServices.getKieClasspathContainer(projectClassLoader);
- Assertions.assertThat(toReturn).isNotNull();
+ assertThat(toReturn).isNotNull();
return toReturn;
}
public static KieBase getKieBase(final URL targetLocation, final String
gavArtifactId, final String gavVersion, final String kieBaseName) throws
Exception {
final KieContainer kieContainer = getKieContainer(targetLocation,
gavArtifactId, gavVersion);
KieBase toReturn = kieContainer.getKieBase(kieBaseName);
- Assertions.assertThat(toReturn).isNotNull();
+ assertThat(toReturn).isNotNull();
return toReturn;
}
public static KieSession getKieSession(final URL targetLocation, final
String gavArtifactId, final String gavVersion, final String kieBaseName)
throws Exception {
final KieBase kieBase = getKieBase(targetLocation, gavArtifactId,
gavVersion, kieBaseName);
KieSession toReturn = kieBase.newKieSession();
- Assertions.assertThat(toReturn).isNotNull();
+ assertThat(toReturn).isNotNull();
return toReturn;
}
public static KieModule fireRule(final URL targetLocation, final String
gavArtifactId, final String gavVersion, final String kieBaseName, final String
ruleName) throws Exception {
final KieContainer kieContainer = getKieContainer(targetLocation,
gavArtifactId, gavVersion);
final KieBase kieBase = kieContainer.getKieBase(kieBaseName);
- Assertions.assertThat(kieBase).isNotNull();
+ assertThat(kieBase).isNotNull();
KieSession kSession = null;
try {
@@ -87,14 +87,14 @@ public class ITTestsUtils {
int rulesFired = kSession.fireAllRules();
kSession.dispose();
- assertEquals(1, rulesFired);
+ assertThat(rulesFired).isEqualTo(1);
} finally {
if (kSession != null) {
kSession.dispose();
}
}
KieModule toReturn = ((KieContainerImpl)
kieContainer).getKieModuleForKBase(kieBaseName);
- Assertions.assertThat(toReturn).isNotNull();
+ assertThat(toReturn).isNotNull();
return toReturn;
}
diff --git
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-parent/pom.xml
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-parent/pom.xml
index 85d496c944..0f5a7199b3 100644
---
a/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-parent/pom.xml
+++
b/kie-maven-plugin/src/it/kie-maven-plugin-test-kjar-setup/kie-maven-plugin-test-kjar-parent/pom.xml
@@ -35,6 +35,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
<junit.version>4.13.1</junit.version>
+ <junit.jupiter.version>5.10.2</junit.jupiter.version>
<assertj.version>3.14.0</assertj.version>
<compiler.plugin.version>3.11.0</compiler.plugin.version>
<surefire.plugin.version>3.1.0</surefire.plugin.version>
@@ -48,11 +49,11 @@
<version>${org.kie.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
