number literal adaptions

2 files changed, 15 insertions, 12 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
diff --git a/test/schema/test_serialize.py b/test/schema/test_serialize.py
index b9d8599..f46b3a4 100644
--- a/test/schema/test_serialize.py
+++ b/test/schema/test_serialize.py
@@ -180,7 +180,7 @@ class TestFromString(unittest.TestCase):
 
         # a literal can have multiple children
         l_string = types.ROOT_LITERAL.child(ns.xsd.string)
-        l_integer = types.ROOT_LITERAL.child(ns.xsd.integer)
+        l_integer = types.ROOT_NUMBER.child(ns.xsd.integer)
         l_unsigned = l_integer.child(ns.xsd.unsigned)
         l_signed = l_integer.child(ns.xsd.signed)
         self.assertEqual(Schema({}, {}, {l_string, l_integer, l_unsigned, l_signed}), from_string('''
@@ -191,7 +191,8 @@ class TestFromString(unittest.TestCase):
 
             # literals inherit from same parent
             xsd:string rdfs:subClassOf bsfs:Literal .
-            xsd:integer rdfs:subClassOf bsfs:Literal .
+            bsfs:Number rdfs:subClassOf bsfs:Literal .
+            xsd:integer rdfs:subClassOf bsfs:Number .
 
             # literals inherit from same parent
             xsd:unsigned rdfs:subClassOf xsd:integer .
@@ -893,7 +894,7 @@ class TestFromString(unittest.TestCase):
         # literals
         l_string = types.ROOT_LITERAL.child(ns.xsd.string)
         l_array = types.ROOT_LITERAL.child(ns.bsfs.array)
-        l_integer = types.ROOT_LITERAL.child(ns.xsd.integer)
+        l_integer = types.ROOT_NUMBER.child(ns.xsd.integer)
         l_boolean = types.ROOT_LITERAL.child(ns.xsd.boolean)
         # predicates
         p_annotation = types.ROOT_PREDICATE.child(ns.bsfs.Annotation)
@@ -931,7 +932,8 @@ class TestFromString(unittest.TestCase):
             xsd:string rdfs:subClassOf bsfs:Literal ;
                 rdfs:label "A sequence of characters"^^xsd:string .
             bsfs:array 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 .
 
             # abstract predicates