This is an automated email from the ASF dual-hosted git repository.
pibizza 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 d7ca8b357b Migrated tests in decisiontables to Junit5 (#6084)
d7ca8b357b is described below
commit d7ca8b357b7245455f4d94765d104ccb9f4264bb
Author: Paolo Bizzarri <[email protected]>
AuthorDate: Fri Sep 13 20:56:06 2024 +0200
Migrated tests in decisiontables to Junit5 (#6084)
---
drools-decisiontables/pom.xml | 14 +++++++-------
.../drools/decisiontable/CalendarTimerResourcesTest.java | 10 +++++-----
.../java/org/drools/decisiontable/ColumnReplaceTest.java | 2 +-
.../org/drools/decisiontable/DecimalSeparatorTest.java | 6 +++---
.../org/drools/decisiontable/DumpGeneratedDrlTest.java | 10 +++++-----
.../java/org/drools/decisiontable/EmptyHeaderTest.java | 13 ++++++++-----
.../decisiontable/ExternalSpreadsheetCompilerTest.java | 6 +++---
.../java/org/drools/decisiontable/FixedPatternTest.java | 6 +++---
.../org/drools/decisiontable/IgnoreNumericFormatTest.java | 6 +++---
.../java/org/drools/decisiontable/LineBreakXLSTest.java | 6 +++---
.../java/org/drools/decisiontable/LinkedWorkbookTest.java | 2 +-
.../drools/decisiontable/MakeSureMultiLinesWorkTest.java | 7 +++----
.../drools/decisiontable/PrioritySetWithFormulaTest.java | 6 +++---
.../drools/decisiontable/SpreadsheetCompilerUnitTest.java | 6 +++---
.../decisiontable/SpreadsheetIntegrationExampleTest.java | 6 +++---
.../java/org/drools/decisiontable/UnicodeInCSVTest.java | 6 +++---
.../java/org/drools/decisiontable/UnicodeInXLSTest.java | 6 +++---
.../test/java/org/drools/decisiontable/XlsFormulaTest.java | 6 +++---
.../integrationtests/IncrementalCompilationTest.java | 2 +-
.../integrationtests/KModuleWithDecisionTablesTest.java | 3 ++-
.../org/drools/decisiontable/parser/ActionTypeTest.java | 2 +-
.../org/drools/decisiontable/parser/ColumnFactoryTest.java | 6 +++---
.../org/drools/decisiontable/parser/LhsBuilderTest.java | 2 +-
.../decisiontable/parser/PropertiesSheetListenerTest.java | 2 +-
.../org/drools/decisiontable/parser/RhsBuilderTest.java | 2 +-
.../decisiontable/parser/RuleSheetParserUtilTest.java | 6 +++---
.../decisiontable/parser/RuleWorksheetParse2Test.java | 2 +-
.../parser/RuleWorksheetParseFromFileTest.java | 7 ++++---
.../decisiontable/parser/RuleWorksheetParseLargeTest.java | 2 +-
.../drools/decisiontable/parser/csv/CsvLineParserTest.java | 2 +-
.../org/drools/decisiontable/parser/csv/CsvParserTest.java | 2 +-
.../drools/decisiontable/parser/xls/ExcelParserTest.java | 6 +++---
.../org/drools/decisiontable/project/MultiKieBaseTest.java | 6 +++---
.../org/drools/decisiontable/project/MultiSheetsTest.java | 7 ++++---
34 files changed, 94 insertions(+), 89 deletions(-)
diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml
index f916aee6d0..9aaa947aa2 100644
--- a/drools-decisiontables/pom.xml
+++ b/drools-decisiontables/pom.xml
@@ -87,8 +87,13 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<!-- Logging -->
@@ -101,11 +106,6 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java
index 875c57a2f9..35ce863d23 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java
@@ -21,9 +21,9 @@ package org.drools.decisiontable;
import java.util.Calendar;
import java.util.concurrent.TimeUnit;
-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;
@@ -42,7 +42,7 @@ public class CalendarTimerResourcesTest {
private SessionPseudoClock clock;
- @Before
+ @BeforeEach
public void init() {
final KieServices ks = KieServices.Factory.get();
@@ -66,7 +66,7 @@ public class CalendarTimerResourcesTest {
clock = ksession.getSessionClock();
}
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
index 62b75c7751..a70b119ddd 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
@@ -21,7 +21,7 @@ package org.drools.decisiontable;
import org.drools.base.definitions.rule.impl.RuleImpl;
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.internal.builder.DecisionTableConfiguration;
import org.kie.internal.builder.DecisionTableInputType;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java
index 92e749eca2..da45b0d48c 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java
@@ -20,8 +20,8 @@ package org.drools.decisiontable;
import java.util.Locale;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -56,7 +56,7 @@ public class DecimalSeparatorTest {
ksession =
ks.newKieContainer(ks.getRepository().getDefaultReleaseId()).newKieSession();
}
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java
index 214859716f..b58f03248d 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java
@@ -23,9 +23,9 @@ import java.io.FilenameFilter;
import org.apache.commons.io.FileUtils;
import org.drools.util.IoUtils;
-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.io.Resource;
@@ -57,7 +57,7 @@ public class DumpGeneratedDrlTest {
private File dumpDir;
private String dumpDirPropOrigValue;
- @Before
+ @BeforeEach
public void setUp() {
dumpDir = new File("target/drools-dump-dir");
// delete the dir before test to remove possible leftovers from
previous runs
@@ -71,7 +71,7 @@ public class DumpGeneratedDrlTest {
System.setProperty(DumpDirOption.PROPERTY_NAME,
dumpDir.getAbsolutePath());
}
- @After
+ @AfterEach
public void tearDown() {
if (dumpDirPropOrigValue != null) {
System.setProperty(DumpDirOption.PROPERTY_NAME,
dumpDirPropOrigValue);
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
index d3be1fbfb0..1a03b5bdee 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
@@ -19,11 +19,12 @@
package org.drools.decisiontable;
import org.drools.template.parser.DecisionTableParseException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.internal.builder.DecisionTableConfiguration;
import org.kie.internal.builder.KnowledgeBuilder;
import org.kie.internal.builder.KnowledgeBuilderFactory;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.kie.api.io.ResourceType.DTABLE;
import static org.kie.internal.builder.DecisionTableInputType.CSV;
import static org.kie.internal.builder.DecisionTableInputType.XLS;
@@ -31,21 +32,23 @@ import static
org.kie.internal.io.ResourceFactory.newClassPathResource;
public class EmptyHeaderTest {
- @Test(expected = DecisionTableParseException.class)
+ @Test
public void testEmptyConditionInXLS() {
DecisionTableConfiguration dtconf =
KnowledgeBuilderFactory.newDecisionTableConfiguration();
dtconf.setInputType(XLS);
KnowledgeBuilder kbuilder = KnowledgeBuilderFactory
.newKnowledgeBuilder();
- kbuilder.add(newClassPathResource("emptyCondition.drl.xls",
getClass()), DTABLE, dtconf);
+
assertThatExceptionOfType((DecisionTableParseException.class)).isThrownBy(
+ () ->
kbuilder.add(newClassPathResource("emptyCondition.drl.xls", getClass()),
DTABLE, dtconf));
}
- @Test(expected = DecisionTableParseException.class)
+ @Test
public void testEmptyActionInCSV() {
DecisionTableConfiguration dtconf =
KnowledgeBuilderFactory.newDecisionTableConfiguration();
dtconf.setInputType(CSV);
KnowledgeBuilder kbuilder =
KnowledgeBuilderFactory.newKnowledgeBuilder();
- kbuilder.add(newClassPathResource("emptyAction.drl.csv", getClass()),
DTABLE, dtconf);
+
assertThatExceptionOfType((DecisionTableParseException.class)).isThrownBy(
+ () -> kbuilder.add(newClassPathResource("emptyAction.drl.csv",
getClass()), DTABLE, dtconf));
}
}
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
index ede2030c4d..6ce3b82e13 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
@@ -29,8 +29,8 @@ import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.template.parser.DataListener;
import org.drools.template.parser.TemplateDataListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.builder.KnowledgeBuilder;
@@ -49,7 +49,7 @@ public class ExternalSpreadsheetCompilerTest {
private ExternalSpreadsheetCompiler converter;
- @Before
+ @BeforeEach
public void setUp() {
converter = new ExternalSpreadsheetCompiler();
}
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java
index 99d1f0adc4..02fe7159aa 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.builder.DecisionTableConfiguration;
@@ -40,7 +40,7 @@ public class FixedPatternTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java
index 857ace0432..1f854ee232 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java
@@ -23,8 +23,8 @@ import java.math.BigDecimal;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.builder.DecisionTableConfiguration;
@@ -40,7 +40,7 @@ public class IgnoreNumericFormatTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java
index 864e15ccd4..37903db858 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java
@@ -21,8 +21,8 @@ package org.drools.decisiontable;
import com.sample.FactData;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.io.ResourceType;
import org.kie.api.runtime.KieSession;
import org.kie.internal.builder.DecisionTableConfiguration;
@@ -38,7 +38,7 @@ public class LineBreakXLSTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java
index 557bbc8fdf..7be86113af 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java
@@ -20,7 +20,7 @@ package org.drools.decisiontable;
import java.io.InputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.io.ResourceType;
import org.kie.internal.io.ResourceFactory;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java
index 4200d90699..2d53908787 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java
@@ -20,8 +20,7 @@ package org.drools.decisiontable;
import java.io.InputStream;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
import org.kie.api.KieBase;
import org.kie.api.io.ResourceType;
import org.kie.internal.io.ResourceFactory;
@@ -29,10 +28,10 @@ import org.kie.internal.utils.KieHelper;
import static org.assertj.core.api.Assertions.assertThat;
-@Ignore
+@Disabled
public class MakeSureMultiLinesWorkTest {
- @Test
+ @org.junit.jupiter.api.Test
public void makeSureMultiLinesWork() {
KieHelper kieHelper = new KieHelper();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/PrioritySetWithFormulaTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/PrioritySetWithFormulaTest.java
index 35f057a84d..9610a8baac 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/PrioritySetWithFormulaTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/PrioritySetWithFormulaTest.java
@@ -19,8 +19,8 @@
package org.drools.decisiontable;
import org.drools.base.definitions.rule.impl.RuleImpl;
-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.KieServices;
import org.kie.api.builder.KieBuilder;
@@ -33,7 +33,7 @@ public class PrioritySetWithFormulaTest {
private KieBase kieBase;
- @Before
+ @BeforeEach
public void init() {
final KieServices ks = KieServices.Factory.get();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
index b7b7a897ca..33f3d2d7dd 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
@@ -34,8 +34,8 @@ import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
import org.drools.template.model.Global;
import org.drools.template.model.Import;
import org.drools.template.parser.DataListener;
-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.io.ResourceType;
import org.kie.api.runtime.KieSession;
@@ -61,7 +61,7 @@ public class SpreadsheetCompilerUnitTest {
private SpreadsheetCompiler converter;
- @Before
+ @BeforeEach
public void setUp() {
converter = new SpreadsheetCompiler();
}
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationExampleTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationExampleTest.java
index 4114466232..11e5711d95 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationExampleTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationExampleTest.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import org.acme.insurance.launcher.PricingRuleLauncher;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
@@ -44,7 +44,7 @@ public class SpreadsheetIntegrationExampleTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInCSVTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInCSVTest.java
index 9f8da87672..9b8da2b6ea 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInCSVTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInCSVTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import org.drools.drl.extensions.DecisionTableFactory;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-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.KieSession;
@@ -43,7 +43,7 @@ public class UnicodeInCSVTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInXLSTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInXLSTest.java
index 43dedef0e9..c385dadcc3 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInXLSTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/UnicodeInXLSTest.java
@@ -24,8 +24,8 @@ import java.util.List;
import org.drools.drl.extensions.DecisionTableFactory;
import org.drools.kiesession.rulebase.InternalKnowledgeBase;
import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-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.KieSession;
@@ -43,7 +43,7 @@ public class UnicodeInXLSTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/XlsFormulaTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/XlsFormulaTest.java
index 0536688654..eb0a5bb317 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/XlsFormulaTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/XlsFormulaTest.java
@@ -21,8 +21,8 @@ package org.drools.decisiontable;
import java.util.ArrayList;
import java.util.List;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -36,7 +36,7 @@ public class XlsFormulaTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
ksession.dispose();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/IncrementalCompilationTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/IncrementalCompilationTest.java
index ff6213f89f..373ce0b37c 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/IncrementalCompilationTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/IncrementalCompilationTest.java
@@ -21,7 +21,7 @@ package org.drools.decisiontable.integrationtests;
import java.io.InputStream;
import java.util.List;
-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/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/KModuleWithDecisionTablesTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/KModuleWithDecisionTablesTest.java
index 8ec05fd9d7..4eee4f66c4 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/KModuleWithDecisionTablesTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/integrationtests/KModuleWithDecisionTablesTest.java
@@ -18,7 +18,6 @@
*/
package org.drools.decisiontable.integrationtests;
-import org.junit.Test;
import org.kie.api.KieBase;
import org.kie.api.KieServices;
import org.kie.api.builder.KieFileSystem;
@@ -27,6 +26,8 @@ import org.kie.api.runtime.KieContainer;
import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
+
/**
* Basic tests for creation of a KieBase from CSV and XLS resources.
*/
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
index d86cd60618..1c0572eda7 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ActionTypeTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.drools.decisiontable.parser.ActionType.Code;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ColumnFactoryTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ColumnFactoryTest.java
index 20384ab511..3bf6c55811 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ColumnFactoryTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/ColumnFactoryTest.java
@@ -23,8 +23,8 @@ import org.drools.template.parser.Column;
import org.drools.template.parser.ColumnFactory;
import org.drools.template.parser.LongColumn;
import org.drools.template.parser.StringColumn;
-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.assertThatIllegalArgumentException;
@@ -33,7 +33,7 @@ public class ColumnFactoryTest {
private ColumnFactory f;
- @Before
+ @BeforeEach
public void setUp() {
f = new ColumnFactory();
}
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/LhsBuilderTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/LhsBuilderTest.java
index 4ba1b0c0be..25ff4a2e59 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/LhsBuilderTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/LhsBuilderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.decisiontable.parser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static
org.drools.decisiontable.parser.LhsBuilder.FieldType.FORALL_FIELD;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
index acba2c64b5..1a7657af20 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
@@ -20,7 +20,7 @@ package org.drools.decisiontable.parser;
import org.drools.decisiontable.parser.xls.PropertiesSheetListener;
import
org.drools.decisiontable.parser.xls.PropertiesSheetListener.CaseInsensitiveMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.drools.template.parser.DataListener.NON_MERGED;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RhsBuilderTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RhsBuilderTest.java
index 555af32b98..81cadaa641 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RhsBuilderTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RhsBuilderTest.java
@@ -18,7 +18,7 @@
*/
package org.drools.decisiontable.parser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
index 3463fc4382..e10aa37886 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
@@ -23,8 +23,8 @@ import java.util.List;
import org.drools.template.model.Global;
import org.drools.template.model.Import;
import org.drools.template.parser.DecisionTableParseException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -52,7 +52,7 @@ public class RuleSheetParserUtilTest {
/**
* This is here as the old way was to do this.
*/
- @Ignore
+ @Disabled
@Test
public void testInvalidRuleName() {
final String row = "RuleTable This is my rule name (type class)";
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParse2Test.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParse2Test.java
index 64f56d6cc1..cc98b5b43a 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParse2Test.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParse2Test.java
@@ -22,7 +22,7 @@ import org.drools.template.model.DRLOutput;
import org.drools.template.model.Package;
import org.drools.template.parser.DataListener;
import org.drools.template.parser.DecisionTableParseException;
-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.assertThatException;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseFromFileTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseFromFileTest.java
index 1857e5fed3..7dbbe642b7 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseFromFileTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseFromFileTest.java
@@ -29,8 +29,8 @@ import org.drools.template.model.Consequence;
import org.drools.template.model.Package;
import org.drools.template.model.Rule;
import org.drools.template.parser.DecisionTableParseException;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -180,7 +180,8 @@ public class RuleWorksheetParseFromFileTest {
}
}
- @Test @Ignore // TODO JBRULES-2880 TIRELLI: Ignore test while we decide
what to do in order to solve i18n issues
+ @Disabled // TODO JBRULES-2880 TIRELLI: Ignore test while we decide what
to do in order to solve i18n issues
+ @Test
public void testComplexWorksheetMissingConditionsInLocaleFrFr() throws
Exception {
Locale originalDefaultLocale = Locale.getDefault();
Locale.setDefault(Locale.FRANCE);
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
index 5aa984eb3b..de7a9edcea 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
@@ -21,7 +21,7 @@ package org.drools.decisiontable.parser;
import java.io.InputStream;
import org.drools.template.model.Package;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
index 01cdff8984..66d1cd5e00 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
@@ -20,7 +20,7 @@ package org.drools.decisiontable.parser.csv;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
index ff69bb3ad5..0c120756e3 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.drools.template.parser.DataListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.drools.template.parser.DataListener.NON_MERGED;
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
index 90556d0615..219db5752d 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
@@ -29,8 +29,8 @@ import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.drools.template.parser.DataListener;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,7 +47,7 @@ public class ExcelParserTest {
private Sheet sheet;
- @After
+ @AfterEach
public void tearDown() throws IOException {
if(workbook != null) {
workbook.close();
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiKieBaseTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiKieBaseTest.java
index 1deb04797a..8d28fd985b 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiKieBaseTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiKieBaseTest.java
@@ -18,8 +18,8 @@
*/
package org.drools.decisiontable.project;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -34,7 +34,7 @@ public class MultiKieBaseTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
diff --git
a/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiSheetsTest.java
b/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiSheetsTest.java
index 0b44cf395b..182f8c8afa 100644
---
a/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiSheetsTest.java
+++
b/drools-decisiontables/src/test/java/org/drools/decisiontable/project/MultiSheetsTest.java
@@ -18,8 +18,6 @@
*/
package org.drools.decisiontable.project;
-import org.junit.After;
-import org.junit.Test;
import org.kie.api.KieServices;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.KieFileSystem;
@@ -28,13 +26,16 @@ import org.kie.api.io.KieResources;
import org.kie.api.runtime.KieContainer;
import org.kie.api.runtime.KieSession;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
import static org.assertj.core.api.Assertions.assertThat;
public class MultiSheetsTest {
private KieSession ksession;
- @After
+ @AfterEach
public void tearDown() {
if (ksession != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
