Skip to content

Commit 13ee0b7

Browse files
authored
Merge pull request #49 from common-workflow-lab/packed_tests
add tests for packed versions of the conformance tests
1 parent 92ca121 commit 13ee0b7

File tree

309 files changed

+17316
-2725
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+17316
-2725
lines changed

pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,16 @@
107107
<artifactId>snakeyaml-engine</artifactId>
108108
<version>2.3</version>
109109
</dependency>
110+
<dependency>
111+
<groupId>com.fasterxml.jackson.core</groupId>
112+
<artifactId>jackson-databind</artifactId>
113+
<version>2.10.0.pr1</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.fasterxml.jackson.dataformat</groupId>
117+
<artifactId>jackson-dataformat-yaml</artifactId>
118+
<version>2.9.8</version>
119+
</dependency>
110120
</dependencies>
111121

112122
<profiles>

src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public ArraySchemaImpl(
8686
try {
8787
items =
8888
LoaderInstances
89-
.uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2
89+
.typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2
9090
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
9191
} catch (ValidationException e) {
9292
items = null; // won't be used but prevents compiler from complaining.

src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public CommandInputArraySchemaImpl(
165165
try {
166166
items =
167167
LoaderInstances
168-
.uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2
168+
.typedsl_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2
169169
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
170170
} catch (ValidationException e) {
171171
items = null; // won't be used but prevents compiler from complaining.

src/main/java/org/w3id/cwl/cwl1_2/CommandLineBinding.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ public interface CommandLineBinding extends InputBinding, Savable {
6969
/**
7070
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineBinding/position</I><BR>
7171
* <BLOCKQUOTE>
72-
* The sorting key. Default position is 0. If the inputBinding is
73-
* associated with an input parameter, then the value of `self` in the
74-
* expression will be the value of the input parameter. Input parameter
72+
* The sorting key. Default position is 0. If a [CWL Parameter Reference](#Parameter_references)
73+
* or [CWL Expression](#Expressions_(Optional)) is used and if the
74+
* inputBinding is associated with an input parameter, then the value of
75+
* `self` will be the value of the input parameter. Input parameter
7576
* defaults (as specified by the `InputParameter.default` field) must be
7677
* applied before evaluating the expression. Expressions must return a
7778
* single value of type int or a null.

src/main/java/org/w3id/cwl/cwl1_2/CommandLineBindingImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ public java.util.Optional<Boolean> getLoadContents() {
8484
/**
8585
* Getter for property <I>https://w3id.org/cwl/cwl#CommandLineBinding/position</I><BR>
8686
* <BLOCKQUOTE>
87-
* The sorting key. Default position is 0. If the inputBinding is
88-
* associated with an input parameter, then the value of `self` in the
89-
* expression will be the value of the input parameter. Input parameter
87+
* The sorting key. Default position is 0. If a [CWL Parameter Reference](#Parameter_references)
88+
* or [CWL Expression](#Expressions_(Optional)) is used and if the
89+
* inputBinding is associated with an input parameter, then the value of
90+
* `self` will be the value of the input parameter. Input parameter
9091
* defaults (as specified by the `InputParameter.default` field) must be
9192
* applied before evaluating the expression. Expressions must return a
9293
* single value of type int or a null.

src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public CommandOutputArraySchemaImpl(
153153
try {
154154
items =
155155
LoaderInstances
156-
.uri_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_False_True_2
156+
.typedsl_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_2
157157
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
158158
} catch (ValidationException e) {
159159
items = null; // won't be used but prevents compiler from complaining.

src/main/java/org/w3id/cwl/cwl1_2/File.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Represents a file (or group of files when `secondaryFiles` is provided) that
2626
a number of properties that provide metadata about the file.
2727
2828
The `location` property of a File is a URI that uniquely identifies the
29-
file. Implementations must support the file:// URI scheme and may support
30-
other schemes such as http://. The value of `location` may also be a
29+
file. Implementations must support the `file://` URI scheme and may support
30+
other schemes such as `http://` and `https://`. The value of `location` may also be a
3131
relative reference, in which case it must be resolved relative to the URI
3232
of the document it appears in. Alternately to `location`, implementations
3333
must also accept the `path` property on File, which must be a filesystem
@@ -215,7 +215,7 @@ public interface File extends Savable {
215215
/**
216216
* Getter for property <I>https://w3id.org/cwl/cwl#File/size</I><BR>
217217
* <BLOCKQUOTE>
218-
* Optional file size * </BLOCKQUOTE>
218+
* Optional file size (in bytes) * </BLOCKQUOTE>
219219
*/
220220

221221
Object getSize();
@@ -246,8 +246,8 @@ public interface File extends Savable {
246246
* `<B> owl:equivalentClass <C>` and `<B> owl:subclassOf <A>` then infer
247247
* `<C> owl:subclassOf <A>`.
248248
*
249-
* File format ontologies may be provided in the "$schema" metadata at the
250-
* root of the document. If no ontologies are specified in `$schema`, the
249+
* File format ontologies may be provided in the "$schemas" metadata at the
250+
* root of the document. If no ontologies are specified in `$schemas`, the
251251
* runtime may perform exact file format matches.
252252
* * </BLOCKQUOTE>
253253
*/

src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Represents a file (or group of files when `secondaryFiles` is provided) that
3030
a number of properties that provide metadata about the file.
3131
3232
The `location` property of a File is a URI that uniquely identifies the
33-
file. Implementations must support the file:// URI scheme and may support
34-
other schemes such as http://. The value of `location` may also be a
33+
file. Implementations must support the `file://` URI scheme and may support
34+
other schemes such as `http://` and `https://`. The value of `location` may also be a
3535
relative reference, in which case it must be resolved relative to the URI
3636
of the document it appears in. Alternately to `location`, implementations
3737
must also accept the `path` property on File, which must be a filesystem
@@ -265,7 +265,7 @@ public java.util.Optional<String> getChecksum() {
265265
/**
266266
* Getter for property <I>https://w3id.org/cwl/cwl#File/size</I><BR>
267267
* <BLOCKQUOTE>
268-
* Optional file size * </BLOCKQUOTE>
268+
* Optional file size (in bytes) * </BLOCKQUOTE>
269269
*/
270270

271271
public Object getSize() {
@@ -306,8 +306,8 @@ public java.util.Optional<java.util.List<Object>> getSecondaryFiles() {
306306
* `<B> owl:equivalentClass <C>` and `<B> owl:subclassOf <A>` then infer
307307
* `<C> owl:subclassOf <A>`.
308308
*
309-
* File format ontologies may be provided in the "$schema" metadata at the
310-
* root of the document. If no ontologies are specified in `$schema`, the
309+
* File format ontologies may be provided in the "$schemas" metadata at the
310+
* root of the document. If no ontologies are specified in `$schemas`, the
311311
* runtime may perform exact file format matches.
312312
* * </BLOCKQUOTE>
313313
*/

src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public InputArraySchemaImpl(
153153
try {
154154
items =
155155
LoaderInstances
156-
.uri_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_False_True_2
156+
.typedsl_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_2
157157
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
158158
} catch (ValidationException e) {
159159
items = null; // won't be used but prevents compiler from complaining.

src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public OutputArraySchemaImpl(
153153
try {
154154
items =
155155
LoaderInstances
156-
.uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2
156+
.typedsl_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_2
157157
.loadField(__doc.get("items"), __baseUri, __loadingOptions);
158158
} catch (ValidationException e) {
159159
items = null; // won't be used but prevents compiler from complaining.

0 commit comments

Comments
 (0)