Merge pull request #46 from common-workflow-language/loadListing-tests

tetron · web-flow · commit 042329980a32 · 2019-02-21T15:13:07.000-05:00
Add conformance tests for loadListing/LoadListingRequirement
diff --git a/conformance_tests.yaml b/conformance_tests.yaml
@@ -2349,8 +2349,8 @@
   tags: [ command_line_tool, required ]
 
 - job: tests/empty.json
-  output: 
-    wc_output: 
+  output:
+    wc_output:
         class: File
         checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
         size: 3
@@ -2362,7 +2362,7 @@
 
 - job: tests/cat-job.json
   output:
-    wc_output: 
+    wc_output:
         class: File
         checksum: sha1$e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e
         size: 2
@@ -2373,8 +2373,8 @@
   tags: [ workflow, required ]
 
 - job: tests/wc-job.json
-  output: 
-    wc_output: 
+  output:
+    wc_output:
         class: File
         checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
         size: 3
@@ -2385,8 +2385,8 @@
   tags: [ workflow, subworkflow ]
 
 - job: tests/sum-job.json
-  output: 
-    result: 
+  output:
+    result:
         class: File
         checksum: sha1$ad552e6dc057d1d825bf49df79d6b98eba846ebe
         size: 3
@@ -3116,3 +3116,71 @@
   label: tmpdir_is_not_outdir
   doc: Test that runtime.tmpdir is not runtime.outdir
   tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_none1.cwl
+  label: listing_default_none
+  output:
+    out: true
+  doc: Test that default behavior is 'no_listing' if not specified
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_none2.cwl
+  label: listing_requirement_none
+  output:
+    out: true
+  doc: Test that 'listing' is not present when LoadListingRequirement is 'no_listing'
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_none3.cwl
+  label: listing_loadListing_none
+  output:
+    out: true
+  doc: Test that 'listing' is not present when loadListing on input parameter is 'no_listing'
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_shallow1.cwl
+  label: listing_requirement_shallow
+  output:
+    out: true
+  doc: |
+    Test that 'listing' is present in top directory object but not
+    subdirectory object when LoadListingRequirement is
+    'shallow_listing'
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_shallow2.cwl
+  label: listing_loadListing_shallow
+  output:
+    out: true
+  doc: |
+    Test that 'listing' is present in top directory object but not
+    subdirectory object when loadListing on input parameter loadListing is
+    'shallow_listing'
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_deep1.cwl
+  label: listing_requirement_deep
+  output:
+    out: true
+  doc: |
+    Test that 'listing' is present in top directory object and in
+    subdirectory objects when LoadListingRequirement is
+    'deep_listing'
+  tags: [ command_line_tool ]
+
+- job: tests/listing-job.yml
+  tool: tests/listing_deep2.cwl
+  label: listing_loadListing_deep
+  output:
+    out: true
+  doc: |
+    Test that 'listing' is present in top directory object and in
+    subdirectory objects when input parameter loadListing is
+    'deep_listing'
+  tags: [ command_line_tool ]
diff --git a/tests/listing-job.yml b/tests/listing-job.yml
@@ -0,0 +1,3 @@
+d:
+  class: Directory
+  location: tmp1
diff --git a/tests/listing_deep1.cwl b/tests/listing_deep1.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  LoadListingRequirement:
+    loadListing: deep_listing
+  InlineJavascriptRequirement: {}
+inputs:
+  d: Directory
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: '$(inputs.d.listing.length === 1 && inputs.d.listing[0].listing.length === 1)'
+baseCommand: "true"
diff --git a/tests/listing_deep2.cwl b/tests/listing_deep2.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  d:
+    type: Directory
+    loadListing: deep_listing
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: '$(inputs.d.listing.length === 1 && inputs.d.listing[0].listing.length === 1)'
+baseCommand: "true"
diff --git a/tests/listing_none1.cwl b/tests/listing_none1.cwl
@@ -0,0 +1,13 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  d: Directory
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: $(inputs.d.listing === undefined)
+baseCommand: "true"
diff --git a/tests/listing_none2.cwl b/tests/listing_none2.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  LoadListingRequirement:
+    loadListing: no_listing
+  InlineJavascriptRequirement: {}
+inputs:
+  d: Directory
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: $(inputs.d.listing === undefined)
+baseCommand: "true"
diff --git a/tests/listing_none3.cwl b/tests/listing_none3.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  d:
+    type: Directory
+    loadListing: no_listing
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: $(inputs.d.listing === undefined)
+baseCommand: "true"
diff --git a/tests/listing_shallow1.cwl b/tests/listing_shallow1.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  LoadListingRequirement:
+    loadListing: shallow_listing
+  InlineJavascriptRequirement: {}
+inputs:
+  d: Directory
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: '$(inputs.d.listing.length === 1 && inputs.d.listing[0].listing === undefined)'
+baseCommand: "true"
diff --git a/tests/listing_shallow2.cwl b/tests/listing_shallow2.cwl
@@ -0,0 +1,15 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+requirements:
+  InlineJavascriptRequirement: {}
+inputs:
+  d:
+    type: Directory
+    loadListing: shallow_listing
+outputs:
+  out:
+    type: boolean
+    outputBinding:
+      outputEval: '$(inputs.d.listing.length === 1 && inputs.d.listing[0].listing === undefined)'
+baseCommand: "true"
diff --git a/tests/tmp1/tmp2/tmp3/.gitkeep b/tests/tmp1/tmp2/tmp3/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+d:`
	`2`	`+ class: Directory`
	`3`	`+ location: tmp1`