node naming policy

1 files changed, 12 insertions, 16 deletions

diff --git a/test/lib/test_pipeline.py b/test/lib/test_pipeline.py
index 8fecc74..61fddd7 100644
--- a/test/lib/test_pipeline.py
+++ b/test/lib/test_pipeline.py
@@ -48,32 +48,28 @@ class TestPipeline(unittest.TestCase):
             bsie.extractor.generic.constant.Constant(csA, tupA): None,
             bsie.extractor.generic.constant.Constant(csB, tupB): None,
         }
-        self.prefix = bsfs.Namespace('http://example.com/local/')
 
     def test_essentials(self):
-        pipeline = Pipeline(self.prefix, self.ext2rdr)
+        pipeline = Pipeline(self.ext2rdr)
         self.assertEqual(str(pipeline), 'Pipeline')
         self.assertEqual(repr(pipeline), 'Pipeline(...)')
 
     def test_equality(self):
-        pipeline = Pipeline(self.prefix, self.ext2rdr)
+        pipeline = Pipeline(self.ext2rdr)
         # a pipeline is equivalent to itself
         self.assertEqual(pipeline, pipeline)
         self.assertEqual(hash(pipeline), hash(pipeline))
         # identical builds are equivalent
-        self.assertEqual(pipeline, Pipeline(self.prefix, self.ext2rdr))
-        self.assertEqual(hash(pipeline), hash(Pipeline(self.prefix, self.ext2rdr)))
+        self.assertEqual(pipeline, Pipeline(self.ext2rdr))
+        self.assertEqual(hash(pipeline), hash(Pipeline(self.ext2rdr)))
 
-        # equivalence respects prefix
-        self.assertNotEqual(pipeline, Pipeline(bsfs.URI('http://example.com/global/ent#'), self.ext2rdr))
-        self.assertNotEqual(hash(pipeline), hash(Pipeline(bsfs.URI('http://example.com/global/ent#'), self.ext2rdr)))
         # equivalence respects extractors/readers
         ext2rdr = {ext: rdr for idx, (ext, rdr) in enumerate(self.ext2rdr.items()) if idx % 2 == 0}
-        self.assertNotEqual(pipeline, Pipeline(self.prefix, ext2rdr))
-        self.assertNotEqual(hash(pipeline), hash(Pipeline(self.prefix, ext2rdr)))
+        self.assertNotEqual(pipeline, Pipeline(ext2rdr))
+        self.assertNotEqual(hash(pipeline), hash(Pipeline(ext2rdr)))
 
         # equivalence respects schema
-        p2 = Pipeline(self.prefix, self.ext2rdr)
+        p2 = Pipeline(self.ext2rdr)
         p2._schema = bsfs.schema.Schema()
         self.assertNotEqual(pipeline, p2)
         self.assertNotEqual(hash(pipeline), hash(p2))
@@ -90,10 +86,10 @@ class TestPipeline(unittest.TestCase):
 
     def test_call(self):
         # build pipeline
-        pipeline = Pipeline(self.prefix, self.ext2rdr)
+        pipeline = Pipeline(self.ext2rdr)
         # build objects for tests
         content_hash = 'a948904f2f0f479b8f8197694b30184b0d2ed1c1cd2a1ec0fb85d299a192a447'
-        subject = node.Node(ns.bsfs.File, (self.prefix + 'file#')[content_hash])
+        subject = node.Node(ns.bsfs.File, ucid=content_hash)
         testfile = os.path.join(os.path.dirname(__file__), 'testfile.t')
         p_filename = pipeline.schema.predicate(ns.bse.filename)
         p_filesize = pipeline.schema.predicate(ns.bse.filesize)
@@ -138,7 +134,7 @@ class TestPipeline(unittest.TestCase):
             def __call__(self, path):
                 raise errors.ReaderError('reader error')
 
-        pipeline = Pipeline(self.prefix, {bsie.extractor.generic.path.Path(): FaultyReader()})
+        pipeline = Pipeline({bsie.extractor.generic.path.Path(): FaultyReader()})
         with self.assertLogs(logging.getLogger('bsie.lib.pipeline'), logging.ERROR):
             testfile = os.path.join(os.path.dirname(__file__), 'testfile.t')
             p_filename = pipeline.schema.predicate(ns.bse.filename)
@@ -149,7 +145,7 @@ class TestPipeline(unittest.TestCase):
             def extract(self, subject, content, predicates):
                 raise errors.ExtractorError('extractor error')
 
-        pipeline = Pipeline(self.prefix, {FaultyExtractor(): bsie.reader.path.Path()})
+        pipeline = Pipeline({FaultyExtractor(): bsie.reader.path.Path()})
         with self.assertLogs(logging.getLogger('bsie.lib.pipeline'), logging.ERROR):
             testfile = os.path.join(os.path.dirname(__file__), 'testfile.t')
             p_filename = pipeline.schema.predicate(ns.bse.filename)
@@ -157,7 +153,7 @@ class TestPipeline(unittest.TestCase):
 
     def test_predicates(self):
         # build pipeline
-        pipeline = Pipeline(self.prefix, self.ext2rdr)
+        pipeline = Pipeline(self.ext2rdr)
         #
         self.assertSetEqual(set(pipeline.principals), {
             pipeline.schema.predicate(ns.bse.filename),