more tests :-)

Author: mr-c

testdata/formattest2_v1_0.cwl

@@ -0,0 +1,26 @@
+$namespaces:
+  edam: http://edamontology.org/
+$schemas:
+  - EDAM.owl
+class: CommandLineTool
+cwlVersion: v1.0
+doc: "Reverse each line using the `rev` command"
+hints:
+  DockerRequirement:
+    dockerPull: docker.io/debian:stable-slim
+
+inputs:
+  input:
+    type: File
+    inputBinding: {}
+    format: edam:format_2330
+
+outputs:
+  output:
+    type: File
+    outputBinding:
+      glob: output.txt
+    format: $(inputs.input.format)
+
+baseCommand: rev
+stdout: output.txt

testdata/formattest2_v1_1.cwl

@@ -0,0 +1,26 @@
+$namespaces:
+  edam: http://edamontology.org/
+$schemas:
+  - EDAM.owl
+class: CommandLineTool
+cwlVersion: v1.1
+doc: "Reverse each line using the `rev` command"
+hints:
+  DockerRequirement:
+    dockerPull: docker.io/debian:stable-slim
+
+inputs:
+  input:
+    type: File
+    inputBinding: {}
+    format: edam:format_2330
+
+outputs:
+  output:
+    type: File
+    outputBinding:
+      glob: output.txt
+    format: $(inputs.input.format)
+
+baseCommand: rev
+stdout: output.txt

tests/test_format.py

@@ -133,8 +133,54 @@ def test_check_format_no_ontology() -> None:
     )
 
 
-def test_loading_options_graph_property() -> None:
-    """Test that RDFLib Graph representations of $schema properties are correctly loaded."""
+def test_loading_options_graph_property_v1_0() -> None:
+    """Test that RDFLib Graph representations of $schema properties are correctly loaded, CWL v1.0."""
+    uri = Path(HERE / "../testdata/formattest2_v1_0.cwl").resolve().as_uri()
+    cwl_obj = load_document_by_uri(uri)
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(EDAM)
+
+
+def test_loading_options_graph_property_v1_1() -> None:
+    """Test that RDFLib Graph representations of $schema properties are correctly loaded, CWL v1.1."""
+    uri = Path(HERE / "../testdata/formattest2_v1_1.cwl").resolve().as_uri()
+    cwl_obj = load_document_by_uri(uri)
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(EDAM)
+
+
+def test_loading_options_graph_property_v1_2() -> None:
+    """Test that RDFLib Graph representations of $schema properties are correctly loaded, CWL v1.2."""
     uri = Path(HERE / "../testdata/formattest2.cwl").resolve().as_uri()
     cwl_obj = load_document_by_uri(uri)
     assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(EDAM)
+
+
+def test_loading_options_missing_graph_v1_0() -> None:
+    """Affirm that v1.0 documents without $schema still produce an empty graph property."""
+    uri = Path(HERE / "../testdata/workflow_input_format_expr.cwl").resolve().as_uri()
+    cwl_obj = load_document_by_uri(uri)
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())
+
+
+def test_loading_options_missing_graph_v1_1() -> None:
+    """Affirm that v1.1 documents without $schema still produce an empty graph property."""
+    uri = (
+        Path(HERE / "../testdata/workflow_input_format_expr_v1_1.cwl")
+        .resolve()
+        .as_uri()
+    )
+    cwl_obj = load_document_by_uri(uri)
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())
+
+
+def test_loading_options_missing_graph_v1_2() -> None:
+    """Affirm that v1.2 documents without $schema still produce an empty graph property."""
+    uri = (
+        Path(HERE / "../testdata/workflow_input_format_expr_v1_2.cwl")
+        .resolve()
+        .as_uri()
+    )
+    cwl_obj = load_document_by_uri(uri)
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())
+    assert to_isomorphic(cwl_obj.loadingOptions.graph) == to_isomorphic(Graph())