consolidate v1.1.0-dev1 tests

Author: mr-c

conformance_tests.yaml

@@ -130,17 +130,6 @@
   doc: Test command execution in Docker with stdin and stdout redirection
   tags: [ required ]
 
-- job: tests/wc-job.json
-  output:
-    output:
-      class: File
-      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
-      location: output
-      size: 15
-  tool: tests/wc-tool-shortcut.cwl
-  doc: Test command execution in with stdin and stdout redirection using stdin shortcut
-  tags: [ required ]
-
 - job: tests/empty.json
   tool: tests/null-expression1-tool.cwl
   output:
@@ -529,7 +518,8 @@
   tool: "tests/search.cwl#main"
   doc: |
     Test InitialWorkDirRequirement linking input files and capturing secondaryFiles
-    on input and output.
+    on input and output. Also tests the use of a variety of parameter references
+    and expressions in the secondaryFiles field.
   tags: [ initial_work_dir, inline_javascript ]
 
 - job: tests/rename-job.json
@@ -544,6 +534,17 @@
     Test InitialWorkDirRequirement with expression in filename.
   tags: [ initial_work_dir ]
 
+- job: tests/string-job.json
+  output:
+    out:
+        class: File
+        checksum: sha1$6a47aa22b2a9d13a66a24b3ee5eaed95ce4753cf
+        location: example.conf
+        size: 16
+
+  tool: tests/iwdr-entry.cwl
+  doc: Test if trailing newline is present in file entry in InitialWorkDir
+
 - job: tests/wc-job.json
   output:
     output: 16
@@ -1059,10 +1060,10 @@
 - job: tests/arguments-job.yml
   output:
     classfile:
-        checksum: sha1$e68df795c0686e9aa1a1195536bd900f5f417b18
+        checksum: sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709
         location: Hello.class
         class: File
-        size: 184
+        size: 0
   tool: tests/linkfile.cwl
   doc: Test expression in InitialWorkDir listing
   tags: [ inline_javascript, initial_work_dir ]
@@ -1227,7 +1228,7 @@
   tags: [ required ]
 
 - output:
-    args: [-A,'2',-B,baz,-C,'10','9','8','7','6','5','4','3','2','1']
+    args: [-A,'2',-B,baz,-C,'10','9','8','7','6','5','4','3','2','1',-D]
   job: tests/empty.json
   tool: tests/inline-js.cwl
   doc: Test InlineJavascriptRequirement with multiple expressions in the same tool
@@ -1285,7 +1286,7 @@
       }
   tool: tests/recursive-input-directory.cwl
   doc: Test if a writable input directory is recursivly copied and writable
-  tags: [ inline_javascript, initial_work_dir, shell_command ]
+  tags: [ initial_work_dir, shell_command ]
 
 - output:
     out: "t\n"
@@ -1515,7 +1516,7 @@
   tool: tests/stage-unprovided-file.cwl
   doc: Test that expression engine does not fail to evaluate reference to self
        with unprovided input
-  tags: [ inline_javascript ]
+  tags: [ required ]
 
 - tool: tests/exit-success.cwl
   doc: Test successCodes
@@ -1561,7 +1562,20 @@
   }
   tool: tests/valueFrom-constant.cwl
   doc: Test valueFrom with constant value overriding provided array inputs
-  tags: [ inline_javascript ]
+  tags: [ required ]
+
+# New tests for v1.1.0-dev1
+
+- job: tests/wc-job.json
+  output:
+    output:
+      class: File
+      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
+      location: output
+      size: 15
+  tool: tests/wc-tool-shortcut.cwl
+  doc: Test command execution in with stdin and stdout redirection using stdin shortcut
+  tags: [ required ]
 
 - job: tests/record-secondaryFiles-job.yml
   output: {}