From 4fead04055be4967d9ea3b24ff61fe37a93108dd Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Sat, 4 Mar 2023 13:31:11 +0100
Subject: namespace refactoring and cleanup

---
 test/query/test_validator.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'test/query')

diff --git a/test/query/test_validator.py b/test/query/test_validator.py
index bbfd2e6..418463e 100644
--- a/test/query/test_validator.py
+++ b/test/query/test_validator.py
@@ -14,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 .
 
@@ -267,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
@@ -287,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 .
-- 
cgit v1.2.3