aboutsummaryrefslogtreecommitdiffstats
path: root/test/schema/test_schema.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/schema/test_schema.py')
-rw-r--r--test/schema/test_schema.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/test/schema/test_schema.py b/test/schema/test_schema.py
index ca21f87..c19c226 100644
--- a/test/schema/test_schema.py
+++ b/test/schema/test_schema.py
@@ -35,7 +35,8 @@ class TestSchema(unittest.TestCase):
bsfs:Unused 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 .
xsd:boolean rdfs:subClassOf bsfs:Literal .
bse:tag rdfs:subClassOf bsfs:Predicate ;
@@ -56,18 +57,18 @@ class TestSchema(unittest.TestCase):
'''
# nodes
self.n_root = types.ROOT_NODE
- self.n_ent = types.Node(ns.bsfs.Entity, types.Node(ns.bsfs.Node, None))
- self.n_img = types.Node(ns.bsfs.Image, types.Node(ns.bsfs.Entity, types.Node(ns.bsfs.Node, None)))
- self.n_tag = types.Node(ns.bsfs.Tag, types.Node(ns.bsfs.Node, None))
- self.n_unused = types.Node(ns.bsfs.Unused, types.Node(ns.bsfs.Node, None))
+ self.n_ent = self.n_root.child(ns.bsfs.Entity)
+ self.n_img = self.n_ent.child(ns.bsfs.Image)
+ self.n_tag = self.n_root.child(ns.bsfs.Tag)
+ self.n_unused = self.n_root.child(ns.bsfs.Unused)
self.nodes = [self.n_root, self.n_ent, self.n_img, self.n_tag, self.n_unused]
# literals
self.l_root = types.ROOT_LITERAL
self.l_number = types.ROOT_NUMBER
- self.l_string = types.Literal(ns.xsd.string, types.Literal(ns.bsfs.Literal, None))
- self.l_integer = types.Literal(ns.xsd.integer, self.l_number)
- self.l_unused = types.Literal(ns.xsd.boolean, types.Literal(ns.bsfs.Literal, None))
+ self.l_string = self.l_root.child(ns.xsd.string)
+ self.l_integer = self.l_root.child(ns.xsd.integer)
+ self.l_unused = self.l_root.child(ns.xsd.boolean)
self.literals = [self.l_root, self.l_number, self.l_string, self.l_integer, self.l_unused]
# predicates