wip

Author: aucampia

test/test_w3c_spec/test_nquads_w3c_new.py

@@ -2,10 +2,9 @@
 test suite."""
 import logging
 from contextlib import ExitStack
-from pathlib import Path
 from test.data import TEST_DATA_DIR
 from test.utils import BNodeHandling, GraphHelper, ensure_suffix
-from test.utils.iri import URIMapper, file_uri_to_path
+from test.utils.iri import URIMapper
 from test.utils.namespace import RDFT
 from test.utils.rdftest import ManifestEntry, params_from_sources
 from typing import Optional
@@ -30,27 +29,27 @@
 def check_entry(entry: ManifestEntry) -> None:
     assert entry.action is not None
     assert entry.type in VALID_TYPES
-    action_local = MAPPER.to_local(
+    action_path = MAPPER.to_local_path(
         entry.action
     )  # rebase_url(entry.mf_action, REMOTE_BASE_IRI, LOCAL_BASE_DIR.as_uri())
     if logger.isEnabledFor(logging.DEBUG):
-        action_path = file_uri_to_path(action_local, Path)
+        # action_path = file_uri_to_path(action_local, Path)
         logger.debug("action = %s\n%s", action_path, action_path.read_text())
     catcher: Optional[pytest.ExceptionInfo[Exception]] = None
     dataset = Dataset()
 
     with ExitStack() as xstack:
         if entry.type == RDFT.TestNQuadsNegativeSyntax:
             catcher = xstack.enter_context(pytest.raises(Exception))
-        dataset.parse(action_local, publicID=entry.action, format="nquads")
+        dataset.parse(action_path, publicID=entry.action, format="nquads")
     if catcher is not None:
         assert catcher.value is not None
 
     if entry.type == RDFT.TestNQuadsPositiveSyntax:
         graph_data = dataset.serialize(format="nquads")
         result_dataset = Dataset()
         result_dataset.parse(data=graph_data, publicID=entry.action, format="nquads")
-        GraphHelper.assert_datasets_isomorphic(
+        GraphHelper.assert_cgraph_isomorphic(
             dataset, result_dataset, exclude_bnodes=True
         )
         GraphHelper.assert_sets_equals(

test/test_w3c_spec/test_ntriples_w3c_new.py

@@ -2,10 +2,9 @@
 test suite."""
 import logging
 from contextlib import ExitStack
-from pathlib import Path
 from test.data import TEST_DATA_DIR
 from test.utils import BNodeHandling, GraphHelper, ensure_suffix
-from test.utils.iri import URIMapper, file_uri_to_path
+from test.utils.iri import URIMapper
 from test.utils.namespace import RDFT
 from test.utils.rdftest import ManifestEntry, params_from_sources
 from typing import Optional
@@ -29,18 +28,17 @@
 def check_entry(entry: ManifestEntry) -> None:
     assert entry.action is not None
     assert entry.type in VALID_TYPES
-    action_local = MAPPER.to_local(
+    action_path = MAPPER.to_local_path(
         entry.action
     )  # rebase_url(entry.mf_action, REMOTE_BASE_IRI, LOCAL_BASE_DIR.as_uri())
     if logger.isEnabledFor(logging.DEBUG):
-        action_path = file_uri_to_path(action_local, Path)
         logger.debug("action = %s\n%s", action_path, action_path.read_text())
     catcher: Optional[pytest.ExceptionInfo[Exception]] = None
     graph = Graph()
     with ExitStack() as xstack:
         if entry.type == RDFT.TestNTriplesNegativeSyntax:
             catcher = xstack.enter_context(pytest.raises(Exception))
-        graph.parse(action_local, publicID=entry.action, format="ntriples")
+        graph.parse(action_path, publicID=entry.action, format="ntriples")
     if catcher is not None:
         assert catcher.value is not None
 

test/test_w3c_spec/test_rdfxml_w3c_new.py

@@ -1,9 +1,8 @@
 import logging
 from contextlib import ExitStack
-from pathlib import Path
 from test.data import TEST_DATA_DIR
 from test.utils import BNodeHandling, GraphHelper, ensure_suffix
-from test.utils.iri import URIMapper, file_uri_to_path, rebase_url
+from test.utils.iri import URIMapper, rebase_url
 from test.utils.namespace import RDFT
 from test.utils.rdftest import ManifestEntry, params_from_sources
 from typing import Optional
@@ -27,18 +26,17 @@
 def check_entry(entry: ManifestEntry) -> None:
     assert entry.action is not None
     assert entry.type in VALID_TYPES
-    action_local = MAPPER.to_local(
+    action_path = MAPPER.to_local_path(
         entry.action
     )  # rebase_url(entry.mf_action, REMOTE_BASE_IRI, LOCAL_BASE_DIR.as_uri())
     if logger.isEnabledFor(logging.DEBUG):
-        action_path = file_uri_to_path(action_local, Path)
         logger.debug("action = %s\n%s", action_path, action_path.read_text())
     catcher: Optional[pytest.ExceptionInfo[Exception]] = None
     graph = Graph()
     with ExitStack() as xstack:
         if entry.type == RDFT.TestXMLNegativeSyntax:
             catcher = xstack.enter_context(pytest.raises(Exception))
-        graph.parse(action_local, publicID=entry.action, format="xml")
+        graph.parse(action_path, publicID=entry.action, format="xml")
 
     if catcher is not None:
         assert catcher.value is not None

test/test_w3c_spec/test_sparql_w3c_new.py

@@ -24,7 +24,6 @@
 from rdflib.plugins.sparql.algebra import translateQuery, translateUpdate
 from rdflib.plugins.sparql.parser import parseQuery, parseUpdate
 from rdflib.plugins.sparql.results.rdfresults import RDFResultParser
-from rdflib.plugins.sparql.update import evalUpdate
 from rdflib.query import Result
 from rdflib.term import BNode, IdentifiedNode, Identifier, Literal, Node, URIRef
 from rdflib.util import guess_format
@@ -351,7 +350,7 @@ def check_update(entry: SPARQLEntry) -> None:
                 "dataset before = \n%s",
                 dataset.serialize(format="trig"),
             )
-        result = dataset.update(query_text)
+        dataset.update(query_text)
         # update = translateUpdate(parseUpdate(query_text))
         # evalUpdate(dataset, update)
 
@@ -369,7 +368,7 @@ def check_update(entry: SPARQLEntry) -> None:
                 expected_result.serialize(format="trig"),
             )
 
-        GraphHelper.assert_datasets_isomorphic(
+        GraphHelper.assert_cgraph_isomorphic(
             expected_result, dataset, exclude_bnodes=True
         )
         GraphHelper.assert_sets_equals(expected_result, dataset, BNodeHandling.COLLAPSE)

test/test_w3c_spec/test_trig_w3c_new.py

@@ -1,9 +1,8 @@
 import logging
 from contextlib import ExitStack
-from pathlib import Path
 from test.data import TEST_DATA_DIR
 from test.utils import BNodeHandling, GraphHelper, ensure_suffix
-from test.utils.iri import URIMapper, file_uri_to_path, rebase_url
+from test.utils.iri import URIMapper, rebase_url
 from test.utils.namespace import RDFT
 from test.utils.rdftest import ManifestEntry, params_from_sources
 from typing import Optional
@@ -37,16 +36,15 @@
 def check_entry(entry: ManifestEntry) -> None:
     assert entry.action is not None
     assert entry.type in VALID_TYPES
-    action_local = MAPPER.to_local(entry.action)
+    action_path = MAPPER.to_local_path(entry.action)
     if logger.isEnabledFor(logging.DEBUG):
-        action_path = file_uri_to_path(action_local, Path)
         logger.debug("action = %s\n%s", action_path, action_path.read_text())
     catcher: Optional[pytest.ExceptionInfo[Exception]] = None
     dataset = Dataset()
     with ExitStack() as xstack:
         if entry.type in (RDFT.TestTrigNegativeSyntax, RDFT.TestTrigNegativeEval):
             catcher = xstack.enter_context(pytest.raises(Exception))
-        dataset.parse(action_local, publicID=entry.action, format="trig")
+        dataset.parse(action_path, publicID=entry.action, format="trig")
 
     if catcher is not None:
         assert catcher.value is not None
@@ -58,7 +56,7 @@ def check_entry(entry: ManifestEntry) -> None:
         )
         result_dataset = Dataset()
         result_dataset.parse(result_source, publicID=entry.action, format="nquads")
-        GraphHelper.assert_datasets_isomorphic(
+        GraphHelper.assert_cgraph_isomorphic(
             dataset, result_dataset, exclude_bnodes=True
         )
         GraphHelper.assert_sets_equals(

test/test_w3c_spec/test_turtle_w3c_new.py

@@ -1,9 +1,8 @@
 import logging
 from contextlib import ExitStack
-from pathlib import Path
 from test.data import TEST_DATA_DIR
 from test.utils import BNodeHandling, GraphHelper, ensure_suffix
-from test.utils.iri import URIMapper, file_uri_to_path, rebase_url
+from test.utils.iri import URIMapper, rebase_url
 from test.utils.namespace import RDFT
 from test.utils.rdftest import ManifestEntry, params_from_sources
 from typing import Optional
@@ -37,16 +36,15 @@
 def check_entry(entry: ManifestEntry) -> None:
     assert entry.action is not None
     assert entry.type in VALID_TYPES
-    action_local = MAPPER.to_local(entry.action)
+    action_path = MAPPER.to_local_path(entry.action)
     if logger.isEnabledFor(logging.DEBUG):
-        action_path = file_uri_to_path(action_local, Path)
         logger.debug("action = %s\n%s", action_path, action_path.read_text())
     catcher: Optional[pytest.ExceptionInfo[Exception]] = None
     graph = Graph()
     with ExitStack() as xstack:
         if entry.type in (RDFT.TestTurtleNegativeSyntax, RDFT.TestTurtleNegativeEval):
             catcher = xstack.enter_context(pytest.raises(Exception))
-        graph.parse(action_local, publicID=entry.action, format="turtle")
+        graph.parse(action_path, publicID=entry.action, format="turtle")
 
     if catcher is not None:
         assert catcher.value is not None

test/utils/__init__.py

@@ -337,13 +337,7 @@ def assert_isomorphic(
         This asserts that the two graphs are isomorphic, providing a nicely
         formatted error message if they are not.
         """
-        assert not isinstance(
-            lhs, ConjunctiveGraph
-        ), "cannot operate on ConjunctiveGraph"
-        assert not isinstance(
-            rhs, ConjunctiveGraph
-        ), "cannot operate on ConjunctiveGraph"
-
+        # TODO FIXME: This should possibly raise an error when use on ConjunctiveGraph
         def format_report(message: Optional[str] = None) -> str:
             in_both, in_lhs, in_rhs = rdflib.compare.graph_diff(lhs, rhs)
             preamle = "" if message is None else f"{message}\n"
@@ -359,16 +353,16 @@ def format_report(message: Optional[str] = None) -> str:
         assert rdflib.compare.isomorphic(lhs, rhs), format_report(message)
 
     @classmethod
-    def assert_datasets_isomorphic(
+    def assert_cgraph_isomorphic(
         cls,
-        lhs: Dataset,
-        rhs: Dataset,
+        lhs: ConjunctiveGraph,
+        rhs: ConjunctiveGraph,
         exclude_bnodes: bool,
         message: Optional[str] = None,
     ) -> None:
-        def get_contexts(dataset: Dataset) -> Dict[URIRef, Graph]:
+        def get_contexts(cgraph: ConjunctiveGraph) -> Dict[URIRef, Graph]:
             result = {}
-            for context in dataset.contexts():
+            for context in cgraph.contexts():
                 if isinstance(context.identifier, BNode):
                     if exclude_bnodes:
                         continue

test/utils/rdftest.py

@@ -131,6 +131,7 @@ def from_graph(
         # public_id: Optional[str] = None,
     ) -> Generator["Manifest", None, None]:
         for identifier in graph.subjects(RDF.type, MF.Manifest):
+            assert isinstance(identifier, IdentifiedNode)
             manifest = Manifest(
                 uri_mapper,
                 graph,