Conformance tests for default value behavior.

Author: Peter Amstutz

v1.0/conformance_test_v1.0.yaml

@@ -126,7 +126,7 @@
 - job: v1.0/null-expression1-job.json
   tool: v1.0/null-expression1-tool.cwl
   output:
-    output: 2
+    output: 1
   doc: Test explicitly passing null to Any type inputs with default values.
 
 - job: v1.0/null-expression2-job.json
@@ -300,7 +300,17 @@
 - job: v1.0/empty.json
   output: {count_output: 16}
   tool: v1.0/count-lines9-wf.cwl
-  doc: Test default value on input parameter
+  doc: Test default value on step input parameter
+
+- job: v1.0/empty.json
+  output: {count_output: 16}
+  tool: v1.0/count-lines11-wf.cwl
+  doc: Test use default value on step input parameter with null source
+
+- job: v1.0/cat-job.json
+  output: {count_output: 1}
+  tool: v1.0/count-lines11-wf.cwl
+  doc: Test default value on step input parameter overridden by provided source
 
 - job: v1.0/revsort-job.json
   output:

v1.0/v1.0/count-lines11-wf.cwl

@@ -0,0 +1,28 @@
+#!/usr/bin/env cwl-runner
+class: Workflow
+cwlVersion: v1.0
+
+inputs:
+  file1: File?
+
+outputs:
+  count_output:
+    type: int
+    outputSource: step2/output
+
+steps:
+  step1:
+    run: wc-tool.cwl
+    in:
+      file1:
+        source: file1
+        default:
+          class: File
+          location: whale.txt
+    out: [output]
+
+  step2:
+    run: parseInt-tool.cwl
+    in:
+      file1: step1/output
+    out: [output]

v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml

@@ -313,6 +313,16 @@
   tool: v1.1.0-dev1/count-lines9-wf.cwl
   doc: Test default value on input parameter
 
+- job: v1.1.0-dev1/empty.json
+  output: {count_output: 16}
+  tool: v1.1.0-dev1/count-lines11-wf.cwl
+  doc: Test use default value on step input parameter with null source
+
+- job: v1.1.0-dev1/cat-job.json
+  output: {count_output: 1}
+  tool: v1.1.0-dev1/count-lines11-wf.cwl
+  doc: Test default value on step input parameter overridden by provided source
+
 - job: v1.1.0-dev1/revsort-job.json
   output:
     output:

v1.1.0-dev1/v1.1.0-dev1/count-lines11-wf.cwl

@@ -0,0 +1,28 @@
+#!/usr/bin/env cwl-runner
+class: Workflow
+cwlVersion: v1.1.0-dev1
+
+inputs:
+  file1: File?
+
+outputs:
+  count_output:
+    type: int
+    outputSource: step2/output
+
+steps:
+  step1:
+    run: wc-tool.cwl
+    in:
+      file1:
+        source: file1
+        default:
+          class: File
+          location: whale.txt
+    out: [output]
+
+  step2:
+    run: parseInt-tool.cwl
+    in:
+      file1: step1/output
+    out: [output]