Add params test with & without InlineJavascriptRequirement.

Author: Peter Amstutz

draft-3/conformance_test_draft-3.yaml

@@ -364,4 +364,79 @@
     }
   tool: draft-3/params.cwl
   doc: |
-    Test parameter evaluation.
+    Test parameter evaluation, no support for JS expressions
+
+- job: draft-3/empty.json
+  output: {
+    "t1": {
+        "bar": {
+            "b az": 2,
+            "b\"az": null,
+            "b'az": true,
+            "baz": "zab1",
+            "buz": [
+                "a",
+                "b",
+                "c"
+            ]
+        }
+    },
+    "t10": true,
+    "t11": true,
+    "t12": null,
+    "t13": "-zab1",
+    "t14": "-zab1",
+    "t15": "-zab1",
+    "t16": "-zab1",
+    "t17": "zab1 zab1",
+    "t18": "zab1 zab1",
+    "t19": "zab1 zab1",
+    "t2": {
+        "b az": 2,
+        "b\"az": null,
+        "b'az": true,
+        "baz": "zab1",
+        "buz": [
+            "a",
+            "b",
+            "c"
+        ]
+    },
+    "t20": "zab1 zab1",
+    "t21": "2 2",
+    "t22": "true true",
+    "t23": "true true",
+    "t24": "null null",
+    "t25": "b",
+    "t26": "b b",
+    "t3": {
+        "b az": 2,
+        "b\"az": null,
+        "b'az": true,
+        "baz": "zab1",
+        "buz": [
+            "a",
+            "b",
+            "c"
+        ]
+    },
+    "t4": {
+        "b az": 2,
+        "b\"az": null,
+        "b'az": true,
+        "baz": "zab1",
+        "buz": [
+            "a",
+            "b",
+            "c"
+        ]
+    },
+    "t5": "zab1",
+    "t6": "zab1",
+    "t7": "zab1",
+    "t8": "zab1",
+    "t9": 2
+    }
+  tool: draft-3/params2.cwl
+  doc: |
+    Test parameter evaluation, with support for JS expressions

draft-3/draft-3/params.cwl

@@ -11,116 +11,6 @@ inputs:
           "buz": ['a', 'b', 'c']
         }
 
-outputs:
-  - id: t1
-    type: Any
-    outputBinding:
-      outputEval: $(inputs)
-  - id: t2
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar)
-  - id: t3
-    type: Any
-    outputBinding:
-      outputEval: $(inputs['bar'])
-  - id: t4
-    type: Any
-    outputBinding:
-      outputEval: $(inputs["bar"])
-
-  - id: t5
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar.baz)
-  - id: t6
-    type: Any
-    outputBinding:
-      outputEval: $(inputs['bar'].baz)
-  - id: t7
-    type: Any
-    outputBinding:
-      outputEval: $(inputs['bar']["baz"])
-  - id: t8
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['baz'])
-
-  - id: t9
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['b az'])
-  - id: t10
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['b\'az'])
-  - id: t11
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar["b'az"])
-  - id: t12
-    type: "null"
-    outputBinding:
-      outputEval: $(inputs.bar['b"az'])
-
-  - id: t13
-    type: Any
-    outputBinding:
-      outputEval: -$(inputs.bar.baz)
-  - id: t14
-    type: Any
-    outputBinding:
-      outputEval: -$(inputs['bar'].baz)
-  - id: t15
-    type: Any
-    outputBinding:
-      outputEval: -$(inputs['bar']["baz"])
-  - id: t16
-    type: Any
-    outputBinding:
-      outputEval: -$(inputs.bar['baz'])
-
-  - id: t17
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar.baz) $(inputs.bar.baz)
-  - id: t18
-    type: Any
-    outputBinding:
-      outputEval: $(inputs['bar'].baz) $(inputs['bar'].baz)
-  - id: t19
-    type: Any
-    outputBinding:
-      outputEval: $(inputs['bar']["baz"]) $(inputs['bar']["baz"])
-  - id: t20
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['baz']) $(inputs.bar['baz'])
-
-  - id: t21
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['b az']) $(inputs.bar['b az'])
-  - id: t22
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['b\'az']) $(inputs.bar['b\'az'])
-  - id: t23
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar["b'az"]) $(inputs.bar["b'az"])
-  - id: t24
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar['b"az']) $(inputs.bar['b"az'])
-
-  - id: t25
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar.buz[1])
-  - id: t26
-    type: Any
-    outputBinding:
-      outputEval: $(inputs.bar.buz[1]) $(inputs.bar.buz[1])
+outputs: {"@import": params_inc.yml}
 
 baseCommand: "true"

draft-3/draft-3/params2.cwl

@@ -0,0 +1,19 @@
+class: CommandLineTool
+cwlVersion: cwl:draft-3.dev2
+requirements:
+  - class: InlineJavascriptRequirement
+
+inputs:
+  - id: bar
+    type: Any
+    default: {
+          "baz": "zab1",
+          "b az": 2,
+          "b'az": true,
+          'b"az': null,
+          "buz": ['a', 'b', 'c']
+        }
+
+outputs: {"@import": params_inc.yml}
+
+baseCommand: "true"

draft-3/draft-3/params_inc.yml

@@ -0,0 +1,110 @@
+  - id: t1
+    type: Any
+    outputBinding:
+      outputEval: $(inputs)
+  - id: t2
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar)
+  - id: t3
+    type: Any
+    outputBinding:
+      outputEval: $(inputs['bar'])
+  - id: t4
+    type: Any
+    outputBinding:
+      outputEval: $(inputs["bar"])
+
+  - id: t5
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar.baz)
+  - id: t6
+    type: Any
+    outputBinding:
+      outputEval: $(inputs['bar'].baz)
+  - id: t7
+    type: Any
+    outputBinding:
+      outputEval: $(inputs['bar']["baz"])
+  - id: t8
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['baz'])
+
+  - id: t9
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['b az'])
+  - id: t10
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['b\'az'])
+  - id: t11
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar["b'az"])
+  - id: t12
+    type: "null"
+    outputBinding:
+      outputEval: $(inputs.bar['b"az'])
+
+  - id: t13
+    type: Any
+    outputBinding:
+      outputEval: -$(inputs.bar.baz)
+  - id: t14
+    type: Any
+    outputBinding:
+      outputEval: -$(inputs['bar'].baz)
+  - id: t15
+    type: Any
+    outputBinding:
+      outputEval: -$(inputs['bar']["baz"])
+  - id: t16
+    type: Any
+    outputBinding:
+      outputEval: -$(inputs.bar['baz'])
+
+  - id: t17
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar.baz) $(inputs.bar.baz)
+  - id: t18
+    type: Any
+    outputBinding:
+      outputEval: $(inputs['bar'].baz) $(inputs['bar'].baz)
+  - id: t19
+    type: Any
+    outputBinding:
+      outputEval: $(inputs['bar']["baz"]) $(inputs['bar']["baz"])
+  - id: t20
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['baz']) $(inputs.bar['baz'])
+
+  - id: t21
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['b az']) $(inputs.bar['b az'])
+  - id: t22
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['b\'az']) $(inputs.bar['b\'az'])
+  - id: t23
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar["b'az"]) $(inputs.bar["b'az"])
+  - id: t24
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar['b"az']) $(inputs.bar['b"az'])
+
+  - id: t25
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar.buz[1])
+  - id: t26
+    type: Any
+    outputBinding:
+      outputEval: $(inputs.bar.buz[1]) $(inputs.bar.buz[1])