[#696] Fix default values for missing InputNodes

goldmansachs · Aug 2, 2024 · 1c1e4ce · 1c1e4ce
1 parent 3e1fdc2
commit 1c1e4ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java b/dmn-core/src/main/java/com/gs/dmn/tck/TCKUtil.java
@@ -185,7 +185,7 @@ public List<List<String>> missingArguments(TestCases testCases, TestCase testCas
         List<List<String>> result = new ArrayList<>();
         for (int i=0; i<missingParameters.size(); i++) {
             Type type = parameters.get(i).getRight();
-            String defaultValue = isMockTesting() ? this.transformer.getNativeFactory().nullLiteral(): this.transformer.getDefaultValue(type, null);
+            String defaultValue = isMockTesting() ? this.transformer.getDefaultValue(type, null) : this.transformer.getNativeFactory().nullLiteral();
             List<String> triplet = new ArrayList<>();
             triplet.add(missingArgs.get(i).getLeft());
             triplet.add(missingArgs.get(i).getRight());

diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java
@@ -34,20 +34,20 @@ protected String getExpectedPath() {
     @Test
     public void testCL3() throws Exception {
         // DMN 1.1
-//        doSingleModelTest("1.1","0004-lending", "0004-lending-test-01");
-//        doSingleModelTest("1.1","0005-literal-invocation", "0005-literal-invocation-test-01");
-//        doSingleModelTest("1.1","0006-join", "0006-join-test-01");
-//        doSingleModelTest("1.1","0013-sort", "0013-sort-test-01");
-//        doSingleModelTest("1.1","0014-loan-comparison", "0014-loan-comparison-test-01");
-//        doSingleModelTest("1.1","0016-some-every", "0016-some-every-test-01");
-//        doSingleModelTest("1.1","0017-tableTests", "0017-tableTests-test-01");
-//        doSingleModelTest("1.1","0020-vacation-days", "0020-vacation-days-test-01");
-//        doSingleModelTest("1.1","0021-singleton-list", "0021-singleton-list-test-01");
-//        doSingleModelTest("1.1","0030-user-defined-functions", "0030-user-defined-functions-test-01");
-//        doSingleModelTest("1.1","0031-user-defined-functions", "0031-user-defined-functions-test-01");
+        doSingleModelTest("1.1","0004-lending", "0004-lending-test-01");
+        doSingleModelTest("1.1","0005-literal-invocation", "0005-literal-invocation-test-01");
+        doSingleModelTest("1.1","0006-join", "0006-join-test-01");
+        doSingleModelTest("1.1","0013-sort", "0013-sort-test-01");
+        doSingleModelTest("1.1","0014-loan-comparison", "0014-loan-comparison-test-01");
+        doSingleModelTest("1.1","0016-some-every", "0016-some-every-test-01");
+        doSingleModelTest("1.1","0017-tableTests", "0017-tableTests-test-01");
+        doSingleModelTest("1.1","0020-vacation-days", "0020-vacation-days-test-01");
+        doSingleModelTest("1.1","0021-singleton-list", "0021-singleton-list-test-01");
+        doSingleModelTest("1.1","0030-user-defined-functions", "0030-user-defined-functions-test-01");
+        doSingleModelTest("1.1","0031-user-defined-functions", "0031-user-defined-functions-test-01");
 
         // DMN 1.2
-//        doSingleModelTest("1.2","0076-feel-external-java", "0076-feel-external-java-test-01");
+        doSingleModelTest("1.2","0076-feel-external-java", "0076-feel-external-java-test-01");
 
         // DMN 1.3
         doSingleModelTest("1.3", "0085-decision-services", "0085-decision-services-test-01", new Pair<>("caching", "true"));