From 18387049e9b051ba206ff4e7175cf14255f8ee07 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 11 Sep 2024 12:48:23 +0200 Subject: [PATCH] Migrated impact analysis to junit5 (#6079) --- .../pom.xml | 5 ---- .../pom.xml | 4 +-- .../graph/graphviz/GraphvizOutputTest.java | 6 ++--- .../drools-impact-analysis-graph-json/pom.xml | 4 +-- .../analysis/graph/json/JsonOutputTest.java | 2 +- .../drools-impact-analysis-itests/pom.xml | 8 +++--- .../analysis/example/ExampleUsageTest.java | 2 +- .../integrationtests/AbstractGraphTest.java | 25 +++++++------------ .../integrationtests/BasicGraphTest.java | 4 ++- .../DeleteSpecificFactActionTest.java | 2 +- .../integrationtests/DrlSyntaxTest.java | 2 +- .../integrationtests/GraphCollapsionTest.java | 2 +- .../integrationtests/ImpactAnalysisTest.java | 2 +- .../integrationtests/LinkFilterTest.java | 2 +- .../integrationtests/PropertyTest.java | 2 +- .../analysis/integrationtests/RhsTest.java | 2 +- .../integrationtests/SpecialUsageTest.java | 2 +- .../analysis/integrationtests/TypeTest.java | 2 +- .../kogito/KogitoDrlSyntaxTest.java | 2 +- .../drools-impact-analysis-parser/pom.xml | 4 +-- .../impact/analysis/parser/ParserTest.java | 2 +- 21 files changed, 38 insertions(+), 48 deletions(-) diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml index 96f0e980d9c..1a94b1a4a38 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml @@ -48,11 +48,6 @@ slf4j-api - - junit - junit - test - diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml index a9ef1f3f238..7d4e7e1aa6a 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml @@ -52,8 +52,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/java/org/drools/impact/analysis/graph/graphviz/GraphvizOutputTest.java b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/java/org/drools/impact/analysis/graph/graphviz/GraphvizOutputTest.java index 3400719c433..3430d1b0ce8 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/java/org/drools/impact/analysis/graph/graphviz/GraphvizOutputTest.java +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/java/org/drools/impact/analysis/graph/graphviz/GraphvizOutputTest.java @@ -28,8 +28,8 @@ import org.drools.impact.analysis.graph.Node; import org.drools.impact.analysis.graph.ReactivityType; import org.drools.impact.analysis.model.Rule; -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; import static org.assertj.core.api.Assertions.linesOf; @@ -43,7 +43,7 @@ */ public class GraphvizOutputTest { - @After + @AfterEach public void tearDown() { Graphviz.releaseEngine(); } diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml index 32de869fa02..45e84f50b9c 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml @@ -52,8 +52,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/src/test/java/org/drools/impact/analysis/graph/json/JsonOutputTest.java b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/src/test/java/org/drools/impact/analysis/graph/json/JsonOutputTest.java index 3a226e1c477..c2d3e671b3d 100644 --- a/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/src/test/java/org/drools/impact/analysis/graph/json/JsonOutputTest.java +++ b/drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/src/test/java/org/drools/impact/analysis/graph/json/JsonOutputTest.java @@ -28,7 +28,7 @@ import org.drools.impact.analysis.graph.Node; import org.drools.impact.analysis.graph.ReactivityType; import org.drools.impact.analysis.model.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml index d9e9e08faa5..d92a6ec7365 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-itests/pom.xml @@ -67,13 +67,13 @@ test - org.assertj - assertj-core + org.junit.jupiter + junit-jupiter test - junit - junit + org.assertj + assertj-core test diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/example/ExampleUsageTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/example/ExampleUsageTest.java index fe6ff62228e..00092fb27b1 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/example/ExampleUsageTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/example/ExampleUsageTest.java @@ -34,7 +34,7 @@ import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.internal.ImpactAnalysisKieModule; import org.drools.impact.analysis.parser.internal.ImpactAnalysisProject; -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-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/AbstractGraphTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/AbstractGraphTest.java index 8cddb8a7f9b..9a22cf5b085 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/AbstractGraphTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/AbstractGraphTest.java @@ -30,8 +30,7 @@ import org.drools.impact.analysis.graph.Node; import org.drools.impact.analysis.graph.ReactivityType; import org.drools.impact.analysis.graph.graphviz.GraphImageGenerator; -import org.junit.Rule; -import org.junit.rules.TestName; +import org.junit.jupiter.api.TestInfo; import org.kie.api.KieServices; import org.kie.api.builder.KieFileSystem; import org.kie.api.builder.ReleaseId; @@ -48,32 +47,26 @@ public class AbstractGraphTest { private static final Logger logger = LoggerFactory.getLogger(AbstractGraphTest.class); - @Rule - public TestName testName = new TestName(); - - protected String getTestMethodName() { - return testName.getMethodName(); - } // Keep this method for test convenience - protected void generatePng(Graph graph) { - generatePng(graph, ""); + protected void generatePng(TestInfo testInfo, Graph graph) { + generatePng(testInfo, graph, ""); } // Keep this method for test convenience - protected void generateSvg(Graph graph) { - generateSvg(graph, ""); + protected void generateSvg(TestInfo testInfo, Graph graph) { + generateSvg(testInfo, graph, ""); } // Keep this method for test convenience - protected void generatePng(Graph graph, String suffix) { - GraphImageGenerator generator = new GraphImageGenerator(getTestMethodName() + suffix); + protected void generatePng(TestInfo testInfo, Graph graph, String suffix) { + GraphImageGenerator generator = new GraphImageGenerator(testInfo.getDisplayName() + suffix); generator.generatePng(graph); } // Keep this method for test convenience - protected void generateSvg(Graph graph, String suffix) { - GraphImageGenerator generator = new GraphImageGenerator(getTestMethodName() + suffix); + protected void generateSvg(TestInfo testInfo, Graph graph, String suffix) { + GraphImageGenerator generator = new GraphImageGenerator(testInfo.getDisplayName() + suffix); generator.generateSvg(graph); } diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/BasicGraphTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/BasicGraphTest.java index 5ad4a7d68a0..76078d75f2a 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/BasicGraphTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/BasicGraphTest.java @@ -25,7 +25,9 @@ import org.drools.impact.analysis.integrationtests.domain.Person; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; + + public class BasicGraphTest extends AbstractGraphTest { diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DeleteSpecificFactActionTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DeleteSpecificFactActionTest.java index c87723be523..56025337e7e 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DeleteSpecificFactActionTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DeleteSpecificFactActionTest.java @@ -30,7 +30,7 @@ import org.drools.impact.analysis.model.right.DeleteSpecificFactAction; import org.drools.impact.analysis.model.right.SpecificProperty; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * This test is to verify that DeleteSpecificFactAction can be handled correctly. diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DrlSyntaxTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DrlSyntaxTest.java index bc7909ff720..8f7e15bd177 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DrlSyntaxTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DrlSyntaxTest.java @@ -28,7 +28,7 @@ import org.drools.impact.analysis.integrationtests.domain.Person; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/GraphCollapsionTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/GraphCollapsionTest.java index fb2d95d3212..1dc087ce247 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/GraphCollapsionTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/GraphCollapsionTest.java @@ -32,7 +32,7 @@ import org.drools.impact.analysis.parser.ModelBuilder; import org.drools.impact.analysis.parser.internal.ImpactAnalysisKieModule; import org.drools.impact.analysis.parser.internal.ImpactAnalysisProject; -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-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java index 261621473c3..5abbb975c99 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java @@ -29,7 +29,7 @@ import org.drools.impact.analysis.integrationtests.domain.Order; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.drools.impact.analysis.graph.TextReporter.INDENT; diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/LinkFilterTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/LinkFilterTest.java index 7f8d1e51e58..a1cf2f3bf7b 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/LinkFilterTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/LinkFilterTest.java @@ -28,7 +28,7 @@ import org.drools.impact.analysis.integrationtests.domain.Person; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/PropertyTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/PropertyTest.java index 19fa869b432..e47b62f9990 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/PropertyTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/PropertyTest.java @@ -24,7 +24,7 @@ import org.drools.impact.analysis.integrationtests.domain.Person; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/RhsTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/RhsTest.java index c1c626bad73..00395a92f28 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/RhsTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/RhsTest.java @@ -27,7 +27,7 @@ import org.drools.impact.analysis.integrationtests.domain.Person; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/SpecialUsageTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/SpecialUsageTest.java index 9177ca88fbc..6e27334a11d 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/SpecialUsageTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/SpecialUsageTest.java @@ -28,7 +28,7 @@ import org.drools.impact.analysis.integrationtests.domain.ProductItem; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/TypeTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/TypeTest.java index b88407b7e39..c90063b7ee7 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/TypeTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/TypeTest.java @@ -22,13 +22,13 @@ import java.math.BigInteger; import org.drools.util.StringUtils; +import org.junit.jupiter.api.Test; import org.drools.impact.analysis.graph.Graph; import org.drools.impact.analysis.graph.ModelToGraphConverter; import org.drools.impact.analysis.graph.ReactivityType; import org.drools.impact.analysis.integrationtests.domain.PropHolder; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; public class TypeTest extends AbstractGraphTest { diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/kogito/KogitoDrlSyntaxTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/kogito/KogitoDrlSyntaxTest.java index 1a5285da180..f189bf64246 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/kogito/KogitoDrlSyntaxTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/kogito/KogitoDrlSyntaxTest.java @@ -25,7 +25,7 @@ import org.drools.impact.analysis.integrationtests.kogito.domain.LoanApplication; import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.ModelBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * diff --git a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml index ca8d52cecd4..10741f33879 100644 --- a/drools-impact-analysis/drools-impact-analysis-parser/pom.xml +++ b/drools-impact-analysis/drools-impact-analysis-parser/pom.xml @@ -48,8 +48,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/drools-impact-analysis/drools-impact-analysis-parser/src/test/java/org/drools/impact/analysis/parser/ParserTest.java b/drools-impact-analysis/drools-impact-analysis-parser/src/test/java/org/drools/impact/analysis/parser/ParserTest.java index b78559ce267..d507763ed1c 100644 --- a/drools-impact-analysis/drools-impact-analysis-parser/src/test/java/org/drools/impact/analysis/parser/ParserTest.java +++ b/drools-impact-analysis/drools-impact-analysis-parser/src/test/java/org/drools/impact/analysis/parser/ParserTest.java @@ -20,7 +20,7 @@ import org.drools.impact.analysis.model.AnalysisModel; import org.drools.impact.analysis.parser.domain.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ParserTest {