namespace refactoring and cleanup

3 files changed, 14 insertions, 14 deletions

diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py
index db55852..77ee02b 100644
--- a/test/extractor/generic/test_constant.py
+++ b/test/extractor/generic/test_constant.py
@@ -15,11 +15,11 @@ class TestConstant(unittest.TestCase):
     def test_extract(self):
         schema = '''
             bse:author rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:comment rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "false"^^xsd:boolean .
             '''
@@ -28,10 +28,10 @@ class TestConstant(unittest.TestCase):
             (ns.bse.comment, 'the quick brown fox jumps over the lazy dog.'),
             ]
         ext = Constant(schema, tuples)
-        node = _node.Node(ns.bsfs.Entity, '') # Blank node
+        node = _node.Node(ns.bsn.Entity, '') # Blank node
         p_author = ext.schema.predicate(ns.bse.author)
         p_comment = ext.schema.predicate(ns.bse.comment)
-        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsfs.Entity)
+        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsn.Entity)
         string = ext.schema.literal(ns.bsfs.Literal).child(ns.xsd.string)
         # baseline
         self.assertSetEqual(set(ext.extract(node, None, (p_author, p_comment))),
@@ -50,11 +50,11 @@ class TestConstant(unittest.TestCase):
         # schema compliance
         schema = '''
             bse:author rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "true"^^xsd:boolean .
             bse:comment rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "false"^^xsd:boolean .
             '''
@@ -75,13 +75,13 @@ class TestConstant(unittest.TestCase):
     def test_eq(self):
         schema_a = '''
             bse:author rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "true"^^xsd:boolean .
             '''
         schema_b = '''
             bse:comment rdfs:subClassOf bsfs:Predicate ;
-                rdfs:domain bsfs:Entity ;
+                rdfs:domain bsn:Entity ;
                 rdfs:range xsd:string ;
                 bsfs:unique "false"^^xsd:boolean .
             '''
diff --git a/test/extractor/generic/test_path.py b/test/extractor/generic/test_path.py
index d40a28c..0beb37e 100644
--- a/test/extractor/generic/test_path.py
+++ b/test/extractor/generic/test_path.py
@@ -26,17 +26,17 @@ class TestPath(unittest.TestCase):
         self.assertEqual(Path().schema,
             bsfs.schema.from_string(base.SCHEMA_PREAMBLE + '''
                 bse:filename rdfs:subClassOf bsfs:Predicate ;
-                    rdfs:domain bsfs:File ;
+                    rdfs:domain bsn:Entity ;
                     rdfs:range xsd:string ;
                     bsfs:unique "true"^^xsd:boolean .
                 '''))
 
     def test_extract(self):
         ext = Path()
-        node = _node.Node(ns.bsfs.File, '') # Blank node
+        node = _node.Node(ns.bsn.Entity, '') # Blank node
         content = '/tmp/foo/bar'
         p_filename = ext.schema.predicate(ns.bse.filename)
-        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsfs.Entity)
+        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsn.Entity)
         string = ext.schema.literal(ns.bsfs.Literal).child(ns.xsd.string)
 
         # baseline
diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py
index 8868546..0e83e24 100644
--- a/test/extractor/generic/test_stat.py
+++ b/test/extractor/generic/test_stat.py
@@ -27,17 +27,17 @@ class TestStat(unittest.TestCase):
         self.assertEqual(Stat().schema,
             bsfs.schema.from_string(base.SCHEMA_PREAMBLE + '''
                 bse:filesize rdfs:subClassOf bsfs:Predicate ;
-                    rdfs:domain bsfs:File ;
+                    rdfs:domain bsn:Entity ;
                     rdfs:range xsd:integer ;
                     bsfs:unique "true"^^xsd:boolean .
                 '''))
 
     def test_extract(self):
         ext = Stat()
-        node = _node.Node(ns.bsfs.File, '') # Blank node
+        node = _node.Node(ns.bsn.Entity, '') # Blank node
         content = os.stat(__file__)
         p_filesize = ext.schema.predicate(ns.bse.filesize)
-        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsfs.Entity)
+        entity = ext.schema.node(ns.bsfs.Node).child(ns.bsn.Entity)
         string = ext.schema.literal(ns.bsfs.Literal).child(ns.xsd.string)
 
         # baseline