From 58496960926a56149c10d64e01b6df7d048eed0e Mon Sep 17 00:00:00 2001 From: Matthias Baumgartner Date: Sun, 18 Dec 2022 14:11:27 +0100 Subject: triple store Open interface --- test/graph/test_graph.py | 10 +++++----- test/graph/test_nodes.py | 4 ++-- test/triple_store/test_sparql.py | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'test') diff --git a/test/graph/test_graph.py b/test/graph/test_graph.py index 0b16527..f8e107d 100644 --- a/test/graph/test_graph.py +++ b/test/graph/test_graph.py @@ -23,7 +23,7 @@ from bsfs.graph.graph import Graph class TestGraph(unittest.TestCase): def setUp(self): self.user = URI('http://example.com/me') - self.backend = SparqlStore.Open(None) + self.backend = SparqlStore.Open() self.backend.schema = schema.Schema.from_string(''' prefix rdfs: prefix bsfs: @@ -37,9 +37,9 @@ class TestGraph(unittest.TestCase): 'Graph(backend=SparqlStore(uri=None), user=http://example.com/me)') # str respects backend class Foo(SparqlStore): pass - self.assertEqual(str(Graph(Foo.Open(None), self.user)), + self.assertEqual(str(Graph(Foo.Open(), self.user)), 'Graph(Foo(uri=None), http://example.com/me)') - self.assertEqual(repr(Graph(Foo.Open(None), self.user)), + self.assertEqual(repr(Graph(Foo.Open(), self.user)), 'Graph(backend=Foo(uri=None), user=http://example.com/me)') # str respect user self.assertEqual(str(Graph(self.backend, URI('http://example.com/you'))), @@ -62,8 +62,8 @@ class TestGraph(unittest.TestCase): self.assertEqual(graph, Graph(self.backend, self.user)) self.assertEqual(hash(graph), hash(Graph(self.backend, self.user))) # equality respects backend - self.assertNotEqual(graph, Graph(SparqlStore.Open(None), self.user)) - self.assertNotEqual(hash(graph), hash(Graph(SparqlStore.Open(None), self.user))) + self.assertNotEqual(graph, Graph(SparqlStore.Open(), self.user)) + self.assertNotEqual(hash(graph), hash(Graph(SparqlStore.Open(), self.user))) # equality respects user self.assertNotEqual(graph, Graph(self.backend, URI('http://example.com/you'))) self.assertNotEqual(hash(graph), hash(Graph(self.backend, URI('http://example.com/you')))) diff --git a/test/graph/test_nodes.py b/test/graph/test_nodes.py index 71fbb10..43e7f6f 100644 --- a/test/graph/test_nodes.py +++ b/test/graph/test_nodes.py @@ -107,7 +107,7 @@ class TestNodes(unittest.TestCase): self.assertEqual(repr(nodes), f'Nodes({self.backend}, {self.user}, {self.ent_type}, {{\'http://example.com/me/entity#foo\'}})') # repr respects backend class Foo(SparqlStore): pass - backend = Foo.Open(None) + backend = Foo.Open() backend.schema = self.backend.schema nodes = Nodes(backend, self.user, self.ent_type, self.ent_ids) self.assertEqual(repr(nodes), f'Nodes({backend}, {self.user}, {self.ent_type}, {self.ent_ids})') @@ -125,7 +125,7 @@ class TestNodes(unittest.TestCase): self.assertEqual(Nodes(self.backend, self.user, self.ent_type, self.ent_ids), nodes) self.assertEqual(hash(nodes), hash(Nodes(self.backend, self.user, self.ent_type, self.ent_ids))) # equality respects backend - backend = SparqlStore.Open(None) + backend = SparqlStore.Open() backend.schema = self.backend.schema self.assertNotEqual(nodes, Nodes(backend, self.user, self.ent_type, self.ent_ids)) self.assertNotEqual(hash(nodes), hash(Nodes(backend, self.user, self.ent_type, self.ent_ids))) diff --git a/test/triple_store/test_sparql.py b/test/triple_store/test_sparql.py index ecf3a07..c4925c4 100644 --- a/test/triple_store/test_sparql.py +++ b/test/triple_store/test_sparql.py @@ -61,22 +61,22 @@ class TestSparqlStore(unittest.TestCase): ''') def test_essentials(self): - store = SparqlStore(None) + store = SparqlStore.Open() # equality self.assertEqual(store, store) self.assertEqual(hash(store), hash(store)) - self.assertNotEqual(store, SparqlStore(None)) - self.assertNotEqual(hash(store), hash(SparqlStore(None))) + self.assertNotEqual(store, SparqlStore.Open()) + self.assertNotEqual(hash(store), hash(SparqlStore.Open())) # string conversion self.assertEqual(str(store), 'SparqlStore(uri=None)') self.assertEqual(repr(store), 'SparqlStore(uri=None)') # open - self.assertIsInstance(SparqlStore.Open(None), SparqlStore) + self.assertIsInstance(SparqlStore.Open(), SparqlStore) def test__has_type(self): # setup store - store = SparqlStore(None) + store = SparqlStore.Open() store.schema = _schema.Schema.from_string(''' prefix rdfs: prefix xsd: @@ -129,7 +129,7 @@ class TestSparqlStore(unittest.TestCase): def test_schema(self): # setup - store = SparqlStore(None) + store = SparqlStore.Open() curr = self.schema p_comment = curr.predicate(ns.bse.comment) p_filesize = curr.predicate(ns.bse.filesize) @@ -380,7 +380,7 @@ class TestSparqlStore(unittest.TestCase): def test_transaction(self): # store setup - store = SparqlStore(None) + store = SparqlStore.Open() store.schema = self.schema p_tag = store.schema.predicate(ns.bse.tag) p_filesize = store.schema.predicate(ns.bse.filesize) @@ -458,7 +458,7 @@ class TestSparqlStore(unittest.TestCase): def test_exists(self): # store setup - store = SparqlStore(None) + store = SparqlStore.Open() store.schema = self.schema # prepare node types ent_type = store.schema.node(ns.bsfs.Entity) @@ -497,7 +497,7 @@ class TestSparqlStore(unittest.TestCase): def test_create(self): # setup - store = SparqlStore(None) + store = SparqlStore.Open() store.schema = self.schema # node type must be valid @@ -551,7 +551,7 @@ class TestSparqlStore(unittest.TestCase): def test_set(self): # store setup - store = SparqlStore(None) + store = SparqlStore.Open() store.schema = self.schema # prepare node types ent_type = store.schema.node(ns.bsfs.Entity) -- cgit v1.2.3