From 01851a1ac2aa12c6219d13575d3a576f04615cc1 Mon Sep 17 00:00:00 2001 From: Charles Tapley Hoyt Date: Tue, 14 Nov 2023 10:55:27 +0100 Subject: [PATCH] Fix tests --- src/curies/discovery.py | 10 +++++----- tests/test_discovery.py | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/curies/discovery.py b/src/curies/discovery.py index bed50da1..632af9ed 100644 --- a/src/curies/discovery.py +++ b/src/curies/discovery.py @@ -105,12 +105,12 @@ def _ensure_graph( ) -> "rdflib.Graph": import rdflib - if isinstance(graph, rdflib.Graph): - return graph + if not isinstance(graph, rdflib.Graph): + _temp_graph = rdflib.Graph() + _temp_graph.parse(source=graph, format=format) + graph = _temp_graph - rv = rdflib.Graph() - rv.parse(source=graph, format=format) - return rv + return graph def _yield_uris(*, graph: "rdflib.Graph") -> Iterable[str]: diff --git a/tests/test_discovery.py b/tests/test_discovery.py index 2ed51b41..fc7441ca 100644 --- a/tests/test_discovery.py +++ b/tests/test_discovery.py @@ -30,7 +30,7 @@ def test_simple(self): uris = [f"http://ran.dom/{i:03}" for i in range(30)] uris.append("http://purl.obolibrary.org/obo/GO_0001234") - converter = discover(self.converter, uris, cutoff=3) + converter = discover(uris, cutoff=3, converter=self.converter) self.assertEqual([Record(prefix="ns1", uri_prefix="http://ran.dom/")], converter.records) self.assertEqual("ns1:001", converter.compress("http://ran.dom/001")) self.assertIsNone( @@ -38,7 +38,7 @@ def test_simple(self): msg="discovered converter should not inherit reference converter's definitions", ) - converter = discover(self.converter, uris, cutoff=50) + converter = discover(uris, cutoff=50, converter=self.converter) self.assertEqual([], converter.records) self.assertIsNone( converter.compress("http://ran.dom/001"), @@ -64,7 +64,7 @@ def test_rdflib(self): ) ) - converter = discover_from_rdf(self.converter, graph) + converter = discover_from_rdf(graph, converter=self.converter) self.assertEqual([Record(prefix="ns1", uri_prefix="http://ran.dom/")], converter.records) self.assertEqual("ns1:001", converter.compress("http://ran.dom/001")) self.assertIsNone( @@ -76,7 +76,6 @@ def test_rdflib(self): def test_remote(self): """Test parsing AEON.""" converter = discover_from_rdf( - converter=Converter([]), graph="https://raw.githubusercontent.com/tibonto/aeon/main/aeon.owl", format="xml", )