Junit 5 Upgrade

covered by: cerebral-vincenzo_incutti.dco
goldmansachs · Jun 24, 2024 · 8e9d30b · 8e9d30b
1 parent 440c1bc
commit 8e9d30b
Show file tree

Hide file tree

Showing 93 changed files with 701 additions and 687 deletions.
diff --git a/dco/cerebral-vincenzo_incutti.dco b/dco/cerebral-vincenzo_incutti.dco
@@ -0,0 +1,10 @@
+1) I, Vincenzo Incutti, certify that all work committed with the commit message
+"covered by: cerebral-vincenzo_incutti.dco" is copyright
+Cerebral Adaptive Forecasting and that I am authorized by Cerebral Adaptive Forecasting
+to contribute this code under the Apache 2.0 license.
+
+2) I understand and agree all contribution including all personal
+information I submit with it is maintained indefinitely and may be
+redistributed consistent with the open source license(s) involved.
+
+This certification is effective for all code contributed from 2024-06-24 to 9999-01-01.
diff --git a/dmn-core/pom.xml b/dmn-core/pom.xml
@@ -123,6 +123,12 @@
 			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.10.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>

diff --git a/dmn-core/src/main/resources/templates/aws/pomFile.ftl b/dmn-core/src/main/resources/templates/aws/pomFile.ftl
@@ -76,8 +76,8 @@
            <scope>test</scope>
         </dependency>
         <dependency>
-           <groupId>org.junit.vintage</groupId>
-           <artifactId>junit-vintage-engine</artifactId>
+           <groupId>org.junit.jupiter</groupId>
+           <artifactId>junit-jupiter-engine</artifactId>
            <version>5.10.1</version>
            <scope>test</scope>
         </dependency>

diff --git a/dmn-core/src/main/resources/templates/tck/java/common/junit.ftl b/dmn-core/src/main/resources/templates/tck/java/common/junit.ftl
@@ -36,7 +36,7 @@ public class ${testClassName} extends ${decisionBaseClass} {
 <#macro addTestCases>
     <#list testCases.testCase>
         <#items as tc>
-    @org.junit.Test
+    @org.junit.jupiter.api.Test
     public void testCase${tckUtil.testCaseId(tc)}() {
         <@initializeInputs tc/>
 

diff --git a/dmn-core/src/main/resources/templates/tck/kotlin/common/junit.ftl b/dmn-core/src/main/resources/templates/tck/kotlin/common/junit.ftl
@@ -24,7 +24,7 @@ class ${testClassName} : ${decisionBaseClass}() {
 <#macro addTestCases>
     <#list testCases.testCase>
         <#items as tc>
-    @org.junit.Test
+    @org.junit.jupiter.api.Test
     fun testCase${tc.id}() {
         <@initializeInputs tc/>
 

diff --git a/dmn-runtime/pom.xml b/dmn-runtime/pom.xml
@@ -121,8 +121,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/...slator/src/test/resources/traces/example_credit_decision/50-25-postorder-with-filter.json b/...slator/src/test/resources/traces/example_credit_decision/50-25-postorder-with-filter.json
@@ -47,7 +47,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -64,7 +64,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {

diff --git a/...-kotlin-translator/src/test/resources/traces/example_credit_decision/50-25-postorder.json b/...-kotlin-translator/src/test/resources/traces/example_credit_decision/50-25-postorder.json
@@ -27,7 +27,7 @@
       {
         "rule": {
           "index": 1,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -44,7 +44,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -61,7 +61,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -78,7 +78,7 @@
       {
         "rule": {
           "index": 4,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -95,7 +95,7 @@
       {
         "rule": {
           "index": 5,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -198,7 +198,7 @@
       {
         "rule": {
           "index": 1,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -215,7 +215,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -232,7 +232,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -276,7 +276,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -362,7 +362,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -379,7 +379,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -424,7 +424,7 @@
       {
         "rule": {
           "index": 1,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -441,7 +441,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -458,7 +458,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -475,7 +475,7 @@
       {
         "rule": {
           "index": 4,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -492,7 +492,7 @@
       {
         "rule": {
           "index": 5,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -595,7 +595,7 @@
       {
         "rule": {
           "index": 1,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -612,7 +612,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -629,7 +629,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -673,7 +673,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -735,7 +735,7 @@
       {
         "rule": {
           "index": 1,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {
@@ -752,7 +752,7 @@
       {
         "rule": {
           "index": 2,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -769,7 +769,7 @@
       {
         "rule": {
           "index": 3,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -786,7 +786,7 @@
       {
         "rule": {
           "index": 4,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": false,
         "result": {
@@ -803,7 +803,7 @@
       {
         "rule": {
           "index": 5,
-          "annotation": "\"\""
+          "annotation": ""
         },
         "matched": true,
         "result": {