Merge branch 'mb/features' into develop

1 files changed, 20 insertions, 4 deletions

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),