4 files changed, 17 insertions, 34 deletions
diff --git a/test/query/ast_test/test_fetch.py b/test/query/ast_test/test_fetch.py
index 0c48a1f..ccb680e 100644
--- a/test/query/ast_test/test_fetch.py
+++ b/test/query/ast_test/test_fetch.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the tagit test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import unittest
 
diff --git a/test/query/ast_test/test_filter_.py b/test/query/ast_test/test_filter_.py
index 39b98f8..d0d42ea 100644
--- a/test/query/ast_test/test_filter_.py
+++ b/test/query/ast_test/test_filter_.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the tagit test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import unittest
 
@@ -387,7 +382,7 @@ class TestPredicate(unittest.TestCase):
         # member returns predicate
         # predicate must be an URI
         self.assertEqual(Predicate(ns.bse.filesize).predicate, ns.bse.filesize)
-        self.assertEqual(Predicate(URI('hello world')).predicate, URI('hello world'))
+        self.assertEqual(Predicate(URI('hello_world')).predicate, URI('hello_world'))
         self.assertRaises(TypeError, Predicate, 1234)
         self.assertRaises(TypeError, Predicate, FilterExpression())
         self.assertRaises(TypeError, Predicate, FilterExpression())
diff --git a/test/query/test_matcher.py b/test/query/test_matcher.py
index e830cf8..6b975b2 100644
--- a/test/query/test_matcher.py
+++ b/test/query/test_matcher.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the tagit test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import operator
 import unittest
diff --git a/test/query/test_validator.py b/test/query/test_validator.py
index fec3d23..418463e 100644
--- a/test/query/test_validator.py
+++ b/test/query/test_validator.py
@@ -1,9 +1,4 @@
-"""
 
-Part of the tagit test suite.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import unittest
 
@@ -19,26 +14,29 @@ from bsfs.query.validator import Filter, Fetch
 
 ## code ##
 
+ns.bse = ns.bsfs.Entity()
+
 class TestFilter(unittest.TestCase):
     def setUp(self):
         self.schema = _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#>
+            prefix bsfs: <https://schema.bsfs.io/core/>
+            prefix bse: <https://schema.bsfs.io/core/Entity#>
+            prefix bsl: <https://schema.bsfs.io/core/Literal/>
 
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             bsfs:URI rdfs:subClassOf bsfs:Literal .
 
             bsfs:Tag rdfs:subClassOf bsfs:Node .
             xsd:string 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 .
+            bsl:Number rdfs:subClassOf bsfs:Literal .
+            bsl:Array rdfs:subClassOf bsfs:Literal .
+            <https://schema.bsfs.io/core/Literal/Array/Feature> rdfs:subClassOf bsl:Array .
+            xsd:integer rdfs:subClassOf bsl:Number .
 
-            bsfs:Colors rdfs:subClassOf bsfs:Feature ;
+            bsfs:Colors rdfs:subClassOf <https://schema.bsfs.io/core/Literal/Array/Feature> ;
                 bsfs:dimension "5"^^xsd:integer ;
                 bsfs:dtype bsfs:f32 .
 
@@ -75,7 +73,7 @@ class TestFilter(unittest.TestCase):
             ''')
         self.validate = Filter(self.schema)
 
-    def test_call(self):
+    def test_call(self): # tests validate implicitly
         # root_type must be a _schema.Node
         self.assertRaises(TypeError, self.validate, 1234, None)
         self.assertRaises(TypeError, self.validate, '1234', None)
@@ -272,10 +270,10 @@ class TestFilter(unittest.TestCase):
         self.assertRaises(errors.ConsistencyError, self.validate._distance, self.schema.node(ns.bsfs.Node),
             ast.filter.Distance([1,2,3], 1, False))
         # type must be a feature
-        self.assertRaises(errors.ConsistencyError, self.validate._distance, self.schema.literal(ns.bsfs.Array),
+        self.assertRaises(errors.ConsistencyError, self.validate._distance, self.schema.literal(ns.bsl.Array),
             ast.filter.Distance([1,2,3], 1, False))
         # type must be in the schema
-        self.assertRaises(errors.ConsistencyError, self.validate._distance, self.schema.literal(ns.bsfs.Feature).child(ns.bsfs.Invalid),
+        self.assertRaises(errors.ConsistencyError, self.validate._distance, self.schema.literal(ns.bsl.Array.Feature).child(ns.bsfs.Invalid),
             ast.filter.Distance([1,2,3], 1, False))
         # FIXME: reference must be a numpy array
         # reference must have the correct dimension
@@ -292,8 +290,8 @@ class TestFetch(unittest.TestCase):
             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#>
+            prefix bsfs: <https://schema.bsfs.io/core/>
+            prefix bse: <https://schema.bsfs.io/core/Entity#>
 
             bsfs:Entity rdfs:subClassOf bsfs:Node .
             bsfs:Tag rdfs:subClassOf bsfs:Node .
@@ -314,7 +312,7 @@ class TestFetch(unittest.TestCase):
             ''')
         self.validate = Fetch(self.schema)
 
-    def test_call(self):
+    def test_call(self): # tests validate implicitly
         # call accepts correct expressions
         self.assertTrue(self.validate(self.schema.node(ns.bsfs.Entity),
             ast.fetch.Fetch(ns.bse.tag, ast.fetch.Value(ns.bse.label, 'value'))))