node naming policy

1 files changed, 11 insertions, 11 deletions

diff --git a/test/lib/test_bsie.py b/test/lib/test_bsie.py
index 38e6f59..ae23c4b 100644
--- a/test/lib/test_bsie.py
+++ b/test/lib/test_bsie.py
@@ -11,7 +11,7 @@ import unittest
 # bsie imports
 from bsie.extractor import ExtractorBuilder
 from bsie.extractor.base import SCHEMA_PREAMBLE
-from bsie.lib import PipelineBuilder
+from bsie.lib import PipelineBuilder, DefaultNamingPolicy
 from bsie.reader import ReaderBuilder
 from bsie.utils import bsfs, node, ns
 
@@ -40,13 +40,13 @@ class TestBSIE(unittest.TestCase):
                 )},
             ])
         # build pipeline
-        self.prefix = bsfs.Namespace('http://example.com/local/')
-        pbuild = PipelineBuilder(self.prefix, rbuild, ebuild)
+        self.naming_policy = DefaultNamingPolicy(host='http://example.com/local', user='')
+        pbuild = PipelineBuilder(rbuild, ebuild)
         self.pipeline = pbuild.build()
 
     def test_construction(self):
-        # pipeline only
-        lib = BSIE(self.pipeline)
+        # only pipeline and naming policy
+        lib = BSIE(self.pipeline, self.naming_policy)
         self.assertSetEqual(set(lib.principals), {
             ns.bse.filename,
             ns.bse.filesize,
@@ -70,7 +70,7 @@ class TestBSIE(unittest.TestCase):
             '''))
 
         # specify collect
-        lib = BSIE(self.pipeline, collect={
+        lib = BSIE(self.pipeline, self.naming_policy, collect={
             ns.bse.filesize,
             ns.bse.author,
             ns.bse.inexistent,
@@ -91,7 +91,7 @@ class TestBSIE(unittest.TestCase):
                 bsfs:unique "true"^^xsd:boolean .
             '''))
         # empty collect is disregarded
-        lib = BSIE(self.pipeline, collect={})
+        lib = BSIE(self.pipeline, self.naming_policy, collect={})
         self.assertSetEqual(set(lib.principals), {
             ns.bse.filename,
             ns.bse.filesize,
@@ -116,7 +116,7 @@ class TestBSIE(unittest.TestCase):
             '''))
 
         # specify discard
-        lib = BSIE(self.pipeline, discard={
+        lib = BSIE(self.pipeline, self.naming_policy, discard={
             ns.bse.filesize,
             ns.bse.filename,
             ns.bse.inexistent,
@@ -132,7 +132,7 @@ class TestBSIE(unittest.TestCase):
             '''))
 
         # specify collect and discard
-        lib = BSIE(self.pipeline,
+        lib = BSIE(self.pipeline, self.naming_policy,
             collect={ns.bse.filesize, ns.bse.author, ns.bse.foo, ns.bse.bar},
             discard={ns.bse.author, ns.bse.foo, ns.bse.foobar},
             )
@@ -150,14 +150,14 @@ class TestBSIE(unittest.TestCase):
 
     def test_from_file(self):
         # setup
-        lib = BSIE(self.pipeline)
+        lib = BSIE(self.pipeline, self.naming_policy)
         self.assertSetEqual(set(lib.principals), {
             ns.bse.filesize,
             ns.bse.filename,
             ns.bse.author,
             })
         content_hash = 'a948904f2f0f479b8f8197694b30184b0d2ed1c1cd2a1ec0fb85d299a192a447'
-        subject = node.Node(ns.bsfs.File, (self.prefix + 'file#')[content_hash])
+        subject = node.Node(ns.bsfs.File, uri=f'http://example.com/local/file#{content_hash}')
         testfile = os.path.join(os.path.dirname(__file__), 'testfile.t')
 
         # from_file extracts all available triples