Merge branch 'mb/features' into develop

4 files changed, 46 insertions, 20 deletions

diff --git a/test/graph/ac/test_null.py b/test/graph/ac/test_null.py
index c863943..e35852d 100644
--- a/test/graph/ac/test_null.py
+++ b/test/graph/ac/test_null.py
@@ -8,7 +8,7 @@ Author: Matthias Baumgartner, 2022
 import unittest
 
 # bsie imports
-from bsfs import schema as _schema
+from bsfs import schema as bsc
 from bsfs.namespace import ns
 from bsfs.query import ast
 from bsfs.triple_store import SparqlStore
@@ -23,7 +23,7 @@ from bsfs.graph.ac.null import NullAC
 class TestNullAC(unittest.TestCase):
     def setUp(self):
         self.backend = SparqlStore()
-        self.backend.schema = _schema.Schema.from_string('''
+        self.backend.schema = bsc.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 
@@ -34,7 +34,8 @@ class TestNullAC(unittest.TestCase):
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             bsfs:Tag rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
 
             # predicates mandated by Nodes
             bsm:t_created rdfs:subClassOf bsfs:Predicate ;
diff --git a/test/graph/test_graph.py b/test/graph/test_graph.py
index 8503d5b..f97783b 100644
--- a/test/graph/test_graph.py
+++ b/test/graph/test_graph.py
@@ -25,7 +25,7 @@ class TestGraph(unittest.TestCase):
     def setUp(self):
         self.user = URI('http://example.com/me')
         self.backend = SparqlStore.Open()
-        self.backend.schema = schema.Schema.from_string('''
+        self.backend.schema = schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix bsfs: <http://bsfs.ai/schema/>
             bsfs:Entity rdfs:subClassOf bsfs:Node .
@@ -118,14 +118,15 @@ class TestGraph(unittest.TestCase):
                     schema.Node(ns.bsfs.Node, None)))}), append=False)
 
         # can migrate to compatible schema
-        target_1 = schema.Schema.from_string('''
+        target_1 = schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
             prefix bsfs: <http://bsfs.ai/schema/>
             prefix bse: <http://bsfs.ai/schema/Entity#>
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
 
             bse:filename rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
@@ -142,12 +143,13 @@ class TestGraph(unittest.TestCase):
         # new schema is applied
         self.assertLess(target_1, graph.schema)
         # graph appends its predicates
-        self.assertEqual(graph.schema, target_1 + schema.Schema.from_string('''
+        self.assertEqual(graph.schema, target_1 + schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
             prefix bsfs: <http://bsfs.ai/schema/>
             prefix bsm: <http://bsfs.ai/schema/Meta#>
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
             bsm:t_created rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Node ;
                 rdfs:range xsd:integer ;
@@ -155,14 +157,15 @@ class TestGraph(unittest.TestCase):
             '''))
 
         # can overwrite the current schema
-        target_2 = schema.Schema.from_string('''
+        target_2 = schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
             prefix bsfs: <http://bsfs.ai/schema/>
             prefix bse: <http://bsfs.ai/schema/Entity#>
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
 
             bse:filename rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
@@ -181,12 +184,13 @@ class TestGraph(unittest.TestCase):
         # new schema is applied
         self.assertLess(target_2, graph.schema)
         # graph appends its predicates
-        self.assertEqual(graph.schema, target_2 + schema.Schema.from_string('''
+        self.assertEqual(graph.schema, target_2 + schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
             prefix bsfs: <http://bsfs.ai/schema/>
             prefix bsm: <http://bsfs.ai/schema/Meta#>
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
             bsm:t_created rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Node ;
                 rdfs:range xsd:integer ;
@@ -196,7 +200,7 @@ class TestGraph(unittest.TestCase):
     def test_get(self):
         # setup
         graph = Graph(self.backend, self.user)
-        graph.migrate(schema.Schema.from_string('''
+        graph.migrate(schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
             prefix bsfs: <http://bsfs.ai/schema/>
diff --git a/test/graph/test_nodes.py b/test/graph/test_nodes.py
index 11ae46d..2870f35 100644
--- a/test/graph/test_nodes.py
+++ b/test/graph/test_nodes.py
@@ -24,7 +24,7 @@ class TestNodes(unittest.TestCase):
     def setUp(self):
         # initialize backend
         self.backend = SparqlStore()
-        self.backend.schema = _schema.Schema.from_string('''
+        self.backend.schema = _schema.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 
@@ -37,7 +37,8 @@ class TestNodes(unittest.TestCase):
             bsfs:Tag rdfs:subClassOf bsfs:Node .
             bsfs:User rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
 
             # predicates mandated by Nodes
             bsm:t_created rdfs:subClassOf bsfs:Predicate ;
@@ -78,7 +79,11 @@ class TestNodes(unittest.TestCase):
             (rdflib.URIRef(ns.bsfs.Tag), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Node)),
             (rdflib.URIRef(ns.bsfs.User), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Node)),
             (rdflib.URIRef(ns.xsd.string), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
-            (rdflib.URIRef(ns.xsd.integer), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.bsfs.Array), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.bsfs.Feature), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Array)),
+            (rdflib.URIRef(ns.bsfs.Number), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.bsfs.Time), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Literal)),
+            (rdflib.URIRef(ns.xsd.integer), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Number)),
             (rdflib.URIRef(ns.bsm.t_created), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
             (rdflib.URIRef(ns.bse.comment), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
             (rdflib.URIRef(ns.bse.filesize), rdflib.RDFS.subClassOf, rdflib.URIRef(ns.bsfs.Predicate)),
diff --git a/test/graph/test_resolve.py b/test/graph/test_resolve.py
index 5bc99e4..0918b02 100644
--- a/test/graph/test_resolve.py
+++ b/test/graph/test_resolve.py
@@ -31,7 +31,7 @@ class TestFilter(unittest.TestCase):
     """
 
     def test_call(self):
-        schema = bsc.Schema.from_string('''
+        schema = bsc.from_string('''
             prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
             prefix xsd: <http://www.w3.org/2001/XMLSchema#>
 
@@ -41,7 +41,17 @@ class TestFilter(unittest.TestCase):
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             bsfs:Tag rdfs:subClassOf bsfs:Node .
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            bsfs:Array rdfs:subClassOf bsfs:Literal .
+            bsfs:Feature rdfs:subClassOf bsfs:Array .
+            xsd:integer rdfs:subClassOf bsfs:Number .
+
+            bsfs:Colors rdfs:subClassOf bsfs:Feature ;
+                bsfs:dimension "5"^^xsd:integer .
+
+            bse:colors rdfs:subClassOf bsfs:Predicate ;
+                rdfs:domain bsfs:Entity ;
+                rdfs:range bsfs:Colors .
 
             bse:comment rdfs:subClassOf bsfs:Predicate ;
                 rdfs:domain bsfs:Entity ;
@@ -65,7 +75,7 @@ class TestFilter(unittest.TestCase):
             {URI('http://example.com/me/entity#1234'), URI('http://example.com/me/entity#4321')})
         tags = graph.nodes(ns.bsfs.Tag,
             {URI('http://example.com/me/tag#1234'), URI('http://example.com/me/tag#4321')})
-        invalid = nodes.Nodes(None, '', schema.node(ns.bsfs.Node).get_child(ns.bsfs.Invalid),
+        invalid = nodes.Nodes(None, '', schema.node(ns.bsfs.Node).child(ns.bsfs.Invalid),
             {'http://example.com/you/invalid#1234', 'http://example.com/you/invalid#4321'})
         resolver = Filter(schema)
 
@@ -144,12 +154,18 @@ class TestFilter(unittest.TestCase):
         self.assertEqual(resolver(schema.node(ns.bsfs.Entity),
             ast.filter.Has(ns.bse.comment)),
             ast.filter.Has(ns.bse.comment))
+        # for sake of completeness: Distance
+        self.assertEqual(resolver(schema.node(ns.bsfs.Entity),
+            ast.filter.Any(ns.bse.colors, ast.filter.Distance([1,2,3,4,5], 1))),
+            ast.filter.Any(ns.bse.colors, ast.filter.Distance([1,2,3,4,5], 1)))
         # route errors
         self.assertRaises(errors.BackendError, resolver, schema.node(ns.bsfs.Tag),
             ast.filter.Predicate(ns.bse.comment))
         self.assertRaises(errors.BackendError, resolver, schema.node(ns.bsfs.Tag),
             ast.filter.Any(ast.filter.PredicateExpression(), ast.filter.Equals('foo')))
-        self.assertRaises(errors.UnreachableError, resolver._one_of, ast.filter.OneOf(ast.filter.Predicate(ns.bsfs.Predicate)))
+        self.assertRaises(errors.BackendError, resolver._one_of, ast.filter.OneOf(ast.filter.Predicate(ns.bsfs.Predicate)))
+        # for sake of coverage completeness: valid OneOf
+        self.assertIsNotNone(resolver._one_of(ast.filter.OneOf(ast.filter.Predicate(ns.bse.colors))))
 
         # check schema consistency
         self.assertRaises(errors.ConsistencyError, resolver, schema.node(ns.bsfs.Tag),