Merge pull request common-workflow-language#285 from common-workflow-…

…language/checksum-secondary Add checksums to secondaryFiles and files in Directory objects.
qiukunlong · Aug 4, 2016 · 5baf924 · 5baf924
2 parents 1c02570 + 1835540
commit 5baf924
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -45,7 +45,7 @@
     }
   job: v1.0/cat-job.json
   tool: v1.0/template-tool.cwl
-  doc: Test CreateFileRequirement ExpressionEngineRequirement.engineConfig feature
+  doc: Test InitialWorkDirRequirement ExpressionEngineRequirement.engineConfig feature
 
 - job: v1.0/cat-job.json
   output:
@@ -327,29 +327,39 @@
             {
                 "location": "input.txt.idx1",
                 "class": "File",
+                "checksum": "sha1$553f3a09003a9f69623f03bec13c0b078d706023",
+                "size": 1500
             },
             {
                 "location": "input.idx2",
                 "class": "File",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "size": 0
             },
             {
                 "location": "input.txt.idx3",
                 "class": "File",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "size": 0
             },
             {
                 "location": "input.txt.idx4",
                 "class": "File",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "size": 0
             },
             {
                 "location": "input.txt.idx5",
                 "class": "File",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "size": 0
             }
         ],
         "size": 1111
     }
   tool: "v1.0/search.cwl#main"
   doc: |
-    Test CreateFileRequirement linking input files and capturing secondaryFiles
+    Test InitialWorkDirRequirement linking input files and capturing secondaryFiles
     on input and output.
 
 - job: v1.0/rename-job.json
@@ -361,7 +371,7 @@
       size: 1111
   tool: v1.0/rename.cwl
   doc: |
-    Test CreateFileRequirement with expression in filename.
+    Test InitialWorkDirRequirement with expression in filename.
 
 - job: v1.0/wc-job.json
   output:
@@ -733,11 +743,15 @@
         "listing": [
             {
               "class": "File",
-              "location": "hello.txt"
+              "location": "hello.txt",
+                "checksum": "sha1$47a013e660d408619d894b20806b1d5086aab03b",
+                "size": 13
             },
             {
               "class": "File",
-              "location": "goodbye.txt"
+              "location": "goodbye.txt",
+                "checksum": "sha1$dd0a4c4c49ba43004d6611771972b6cf969c1c01",
+                "size": 24
             }
         ],
     }