Migrated impact analysis to junit5 (apache#6079)

pibizza · Sep 11, 2024 · 1838704 · 1838704
1 parent e3124f5
commit 1838704
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 48 deletions.
diff --git a/...-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml b/...-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-common/pom.xml
@@ -48,11 +48,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/...mpact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml b/...mpact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/pom.xml
@@ -52,8 +52,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...-graphviz/src/test/java/org/drools/impact/analysis/graph/graphviz/GraphvizOutputTest.java b/...-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/...ls-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml b/...ls-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-json/pom.xml
@@ -52,8 +52,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...alysis-graph-json/src/test/java/org/drools/impact/analysis/graph/json/JsonOutputTest.java b/...alysis-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
@@ -67,13 +67,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/...ct-analysis-itests/src/test/java/org/drools/impact/analysis/example/ExampleUsageTest.java b/...ct-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/...s-itests/src/test/java/org/drools/impact/analysis/integrationtests/AbstractGraphTest.java b/...s-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/...ysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/BasicGraphTest.java b/...ysis-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/...c/test/java/org/drools/impact/analysis/integrationtests/DeleteSpecificFactActionTest.java b/...c/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/...lysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/DrlSyntaxTest.java b/...lysis-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/...itests/src/test/java/org/drools/impact/analysis/integrationtests/GraphCollapsionTest.java b/...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/...-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java b/...-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/...ysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/LinkFilterTest.java b/...ysis-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/...alysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/PropertyTest.java b/...alysis-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/...ct-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/RhsTest.java b/...ct-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/...is-itests/src/test/java/org/drools/impact/analysis/integrationtests/SpecialUsageTest.java b/...is-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/...t-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/TypeTest.java b/...t-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/...src/test/java/org/drools/impact/analysis/integrationtests/kogito/KogitoDrlSyntaxTest.java b/...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
@@ -48,8 +48,8 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ls-impact-analysis-parser/src/test/java/org/drools/impact/analysis/parser/ParserTest.java b/...ls-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 {