Improve xsd:normalizedString. Add whitespace strip and collapse for xsd:token

1 files changed, 8 insertions, 5 deletions

diff --git a/test/test_normalizedString.py b/test/test_normalizedString.py
index 5920775c..759df09a 100644
--- a/test/test_normalizedString.py
+++ b/test/test_normalizedString.py
@@ -1,22 +1,25 @@
+import unittest
+
 from rdflib import Literal
 from rdflib.namespace import XSD
-import unittest
 
 
-class test_normalisedString(unittest.TestCase):
+class NormalizedStringTest(unittest.TestCase):
+
     def test1(self):
         lit2 = Literal("\two\nw", datatype=XSD.normalizedString)
         lit = Literal("\two\nw", datatype=XSD.string)
-        self.assertEqual(lit == lit2, False)
+        self.assertFalse(str(lit) == str(lit2))
 
     def test2(self):
         lit = Literal("\tBeing a Doctor Is\n\ta Full-Time Job\r", datatype=XSD.normalizedString)
         st = Literal(" Being a Doctor Is  a Full-Time Job ", datatype=XSD.string)
-        self.assertFalse(Literal.eq(st,lit))
+        self.assertFalse(Literal.eq(st, lit))
+        self.assertEqual(str(lit), str(st))
 
     def test3(self):
         lit = Literal("hey\nthere", datatype=XSD.normalizedString).n3()
-        self.assertTrue(lit=="\"hey there\"^^<http://www.w3.org/2001/XMLSchema#normalizedString>")
+        self.assertTrue(lit == "\"hey there\"^^<http://www.w3.org/2001/XMLSchema#normalizedString>")
 
     def test4(self):
         lit = Literal("hey\nthere\ta tab\rcarriage return", datatype=XSD.normalizedString)