Merge branch 'develop'HEADv0.23.03releasemain

3 files changed, 32 insertions, 47 deletions

diff --git a/test/extractor/generic/test_constant.py b/test/extractor/generic/test_constant.py
index 9dbaced..77ee02b 100644
--- a/test/extractor/generic/test_constant.py
+++ b/test/extractor/generic/test_constant.py
@@ -1,10 +1,5 @@
-"""
 
-Part of the bsie test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
-# imports
+# standard imports
 import unittest
 
 # bsie imports
@@ -20,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 .
             '''
@@ -33,33 +28,33 @@ 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).get_child(ns.bsfs.Entity)
-        string = ext.schema.literal(ns.bsfs.Literal).get_child(ns.xsd.string)
+        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))),
             {(node, p_author, 'Me, myself, and I'),
              (node, p_comment, 'the quick brown fox jumps over the lazy dog.')})
         # predicates is respected
-        p_foobar = ext.schema.predicate(ns.bsfs.Predicate).get_child(ns.bse.foobar, domain=entity, range=entity)
+        p_foobar = ext.schema.predicate(ns.bsfs.Predicate).child(ns.bse.foobar, domain=entity, range=entity)
         self.assertSetEqual(set(ext.extract(node, None, (p_author, p_foobar))),
             {(node, p_author, 'Me, myself, and I')})
         self.assertSetEqual(set(ext.extract(node, None, (p_comment, p_foobar))),
             {(node, p_comment, 'the quick brown fox jumps over the lazy dog.')})
-        p_barfoo = ext.schema.predicate(ns.bse.author).get_child(ns.bse.comment, domain=entity, range=string)
+        p_barfoo = ext.schema.predicate(ns.bse.author).child(ns.bse.comment, domain=entity, range=string)
         self.assertSetEqual(set(ext.extract(node, None, (p_foobar, p_barfoo))), set())
 
     def test_construct(self):
         # 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 .
             '''
@@ -80,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 820f402..0beb37e 100644
--- a/test/extractor/generic/test_path.py
+++ b/test/extractor/generic/test_path.py
@@ -1,14 +1,9 @@
-"""
 
-Part of the bsie test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
-# imports
+# standard imports
 import unittest
 
 # bsie imports
-from bsie.base import extractor
+from bsie.extractor import base
 from bsie.utils import bsfs, node as _node, ns
 
 # objects to test
@@ -29,31 +24,31 @@ class TestPath(unittest.TestCase):
 
     def test_schema(self):
         self.assertEqual(Path().schema,
-            bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+            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 "false"^^xsd:boolean .
+                    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).get_child(ns.bsfs.Entity)
-        string = ext.schema.literal(ns.bsfs.Literal).get_child(ns.xsd.string)
+        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, content, (p_filename, ))),
             {(node, p_filename, 'bar')})
         # predicates parameter is respected
-        p_foo = ext.schema.predicate(ns.bsfs.Predicate).get_child(ns.bse.foo, domain=entity, range=string) # unsupported predicate
+        p_foo = ext.schema.predicate(ns.bsfs.Predicate).child(ns.bse.foo, domain=entity, range=string) # unsupported predicate
         self.assertSetEqual(set(ext.extract(node, content, (p_filename, p_foo))),
             {(node, p_filename, 'bar')})
         self.assertSetEqual(set(ext.extract(node, content, (p_foo, ))), set())
         # predicates are validated
-        p_bar = p_foo.get_child(ns.bse.filename) # same URI but different hierarchy
+        p_bar = p_foo.child(ns.bse.filename) # same URI but different hierarchy
         self.assertSetEqual(set(ext.extract(node, content, (p_filename, p_bar))),
             {(node, p_filename, 'bar')})
         self.assertSetEqual(set(ext.extract(node, content, (p_bar, ))), set())
diff --git a/test/extractor/generic/test_stat.py b/test/extractor/generic/test_stat.py
index 3441438..0e83e24 100644
--- a/test/extractor/generic/test_stat.py
+++ b/test/extractor/generic/test_stat.py
@@ -1,15 +1,10 @@
-"""
 
-Part of the bsie test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
-# imports
+# standard imports
 import os
 import unittest
 
 # bsie imports
-from bsie.base import extractor
+from bsie.extractor import base
 from bsie.utils import bsfs, node as _node, ns
 
 # objects to test
@@ -30,31 +25,31 @@ class TestStat(unittest.TestCase):
 
     def test_schema(self):
         self.assertEqual(Stat().schema,
-            bsfs.schema.Schema.from_string(extractor.SCHEMA_PREAMBLE + '''
+            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 "false"^^xsd:boolean .
+                    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).get_child(ns.bsfs.Entity)
-        string = ext.schema.literal(ns.bsfs.Literal).get_child(ns.xsd.string)
+        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, content, (p_filesize, ))),
             {(node, p_filesize, content.st_size)})
         # predicates parameter is respected
-        p_foo = ext.schema.predicate(ns.bsfs.Predicate).get_child(ns.bse.foo, domain=entity, range=string) # unsupported predicate
+        p_foo = ext.schema.predicate(ns.bsfs.Predicate).child(ns.bse.foo, domain=entity, range=string) # unsupported predicate
         self.assertSetEqual(set(ext.extract(node, content, (p_filesize, p_foo))),
             {(node, p_filesize, content.st_size)})
         self.assertSetEqual(set(ext.extract(node, content, (p_foo, ))), set())
         # predicates are validated
-        p_bar = p_foo.get_child(ns.bse.filesizse) # same URI but different hierarchy
+        p_bar = p_foo.child(ns.bse.filesizse) # same URI but different hierarchy
         self.assertSetEqual(set(ext.extract(node, content, (p_filesize, p_bar))),
             {(node, p_filesize, content.st_size)})
         self.assertSetEqual(set(ext.extract(node, content, (p_bar, ))), set())