Skip to content

Commit 227a981

Browse files
author
Peter Amstutz
committed
Add basename, nameroot, nameext to conformance tests.
1 parent 832b52b commit 227a981

File tree

2 files changed

+67
-7
lines changed

2 files changed

+67
-7
lines changed

draft-3/examples/arguments.cwl

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cwlVersion: cwl:draft-3
22
class: CommandLineTool
3+
label: Example trivial wrapper for Java 7 compiler
34
baseCommand: javac
45
hints:
56
- class: DockerRequirement

draft-4/conformance_test_draft-4.yaml

+66-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@
4141
"checksum": "sha1$63da67422622fbf9251a046d7a34b7ea0fd4fead",
4242
"class": "File",
4343
"path": "foo.txt",
44-
"size": 22
44+
"size": 22,
45+
"basename": "foo.txt",
46+
"nameext": ".txt",
47+
"nameroot": "foo"
4548
}
4649
job: draft-4/cat-job.json
4750
tool: draft-4/template-tool.cwl
@@ -54,6 +57,9 @@
5457
checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
5558
path: output.txt
5659
size: 13
60+
basename: output.txt
61+
nameext: .txt
62+
nameroot: output
5763
tool: draft-4/cat3-tool.cwl
5864
doc: Test command execution in Docker with stdout redirection
5965

@@ -64,6 +70,9 @@
6470
checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
6571
path: output.txt
6672
size: 13
73+
basename: output.txt
74+
nameext: .txt
75+
nameroot: output
6776
tool: draft-4/cat4-tool.cwl
6877
doc: Test command execution in Docker with stdin and stdout redirection
6978

@@ -109,6 +118,9 @@
109118
checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
110119
path: output
111120
size: 15
121+
basename: output
122+
nameext: ""
123+
nameroot: output
112124
tool: draft-4/wc-tool.cwl
113125
doc: Test command execution in with stdin and stdout redirection
114126

@@ -179,6 +191,9 @@
179191
checksum: sha1$b3ec4ed1749c207e52b3a6d08c59f31d83bff519
180192
path: out
181193
size: 15
194+
basename: out
195+
nameext: ""
196+
nameroot: out
182197
tool: draft-4/env-tool1.cwl
183198
doc: Test EnvVarRequirement
184199

@@ -224,6 +239,9 @@
224239
checksum: sha1$b3ec4ed1749c207e52b3a6d08c59f31d83bff519
225240
path: out
226241
size: 15
242+
basename: out
243+
nameext: ""
244+
nameroot: out
227245
tool: draft-4/env-wf1.cwl
228246
doc: Test requirement priority
229247

@@ -234,6 +252,9 @@
234252
checksum: sha1$cdc1e84968261d6a7575b5305945471f8be199b6
235253
path: out
236254
size: 9
255+
basename: out
256+
nameext: ""
257+
nameroot: out
237258
tool: draft-4/env-wf2.cwl
238259
doc: Test requirements override hints
239260

@@ -249,6 +270,9 @@
249270
checksum: sha1$b9214658cc453331b62c2282b772a5c063dbd284
250271
path: output.txt
251272
size: 1111
273+
basename: output.txt
274+
nameext: .txt
275+
nameroot: output
252276
tool: draft-4/revsort.cwl
253277
doc: Test sample workflows from the specification
254278

@@ -259,6 +283,9 @@
259283
checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
260284
path: output.txt
261285
size: 13
286+
basename: output.txt
287+
nameext: .txt
288+
nameroot: output
262289
tool: draft-4/cat5-tool.cwl
263290
doc: Test unknown hints are ignored.
264291

@@ -269,30 +296,51 @@
269296
checksum: sha1$e2dc9daaef945ac15f01c238ed2f1660f60909a0
270297
path: result.txt
271298
size: 142
299+
basename: result.txt
300+
nameext: .txt
301+
nameroot: result
272302
indexedfile: {
273303
"path": "input.txt",
304+
"basename": "input.txt",
305+
"nameext": ".txt",
306+
"nameroot": "input",
274307
"class": "File",
275308
"checksum": "sha1$327fc7aedf4f6b69a42a7c8b808dc5a7aff61376",
276309
"secondaryFiles": [
277310
{
278311
"path": "input.txt.idx1",
279-
"class": "File"
312+
"class": "File",
313+
"basename": "input.txt.idx1",
314+
"nameext": ".idx1",
315+
"nameroot": "input.txt",
280316
},
281317
{
282318
"path": "input.idx2",
283-
"class": "File"
319+
"class": "File",
320+
"basename": "input.idx2",
321+
"nameext": ".idx2",
322+
"nameroot": "input",
284323
},
285324
{
286325
"path": "input.txt.idx3",
287-
"class": "File"
326+
"class": "File",
327+
"basename": "input.txt.idx3",
328+
"nameext": ".idx3",
329+
"nameroot": "input.txt",
288330
},
289331
{
290332
"path": "input.txt.idx4",
291-
"class": "File"
333+
"class": "File",
334+
"basename": "input.txt.idx4",
335+
"nameext": ".idx4",
336+
"nameroot": "input.txt",
292337
},
293338
{
294339
"path": "input.txt.idx5",
295-
"class": "File"
340+
"class": "File",
341+
"basename": "input.txt.idx5",
342+
"nameext": ".idx5",
343+
"nameroot": "input.txt",
296344
}
297345
],
298346
"size": 1111
@@ -309,6 +357,9 @@
309357
checksum: sha1$327fc7aedf4f6b69a42a7c8b808dc5a7aff61376
310358
path: fish.txt
311359
size: 1111
360+
basename: fish.txt
361+
nameext: .txt
362+
nameroot: fish
312363
tool: draft-4/rename.cwl
313364
doc: |
314365
Test CreateFileRequirement with expression in filename.
@@ -327,6 +378,9 @@
327378
size: 12
328379
class: File
329380
checksum: "sha1$f12e6cfe70f3253f70b0dbde17c692e7fb0f1e5e"
381+
basename: output.txt
382+
nameext: .txt
383+
nameroot: output
330384
tool: draft-4/schemadef-tool.cwl
331385
doc: |
332386
Test SchemaDefRequirement definition used in tool parameter
@@ -338,6 +392,9 @@
338392
size: 12
339393
class: File
340394
checksum: "sha1$f12e6cfe70f3253f70b0dbde17c692e7fb0f1e5e"
395+
basename: output.txt
396+
nameext: .txt
397+
nameroot: output
341398
tool: draft-4/schemadef-wf.cwl
342399
doc: |
343400
Test SchemaDefRequirement definition used in workflow parameter
@@ -542,6 +599,9 @@
542599
size: 13
543600
class: "File"
544601
checksum: "sha1$47a013e660d408619d894b20806b1d5086aab03b"
602+
basename: output.txt
603+
nameext: .txt
604+
nameroot: output
545605
doc: |
546606
Test optional output file and optional secondaryFile on output.
547607
@@ -674,7 +734,6 @@
674734
output:
675735
"outdir": {
676736
"class": "Directory",
677-
"hostfs": true,
678737
"listing": [
679738
{
680739
"basename": "hello.txt",

0 commit comments

Comments
 (0)