[Lxml-checkins] r47821 - lxml/trunk/src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Wed Oct 24 14:36:02 2007
New Revision: 47821

Modified:
   lxml/trunk/src/lxml/tests/test_objectify.py
Log:
test cleanup, string formatting must also work for DataElements

Modified: lxml/trunk/src/lxml/tests/test_objectify.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_objectify.py	(original)
+++ lxml/trunk/src/lxml/tests/test_objectify.py	Wed Oct 24 14:36:02 2007
@@ -598,6 +598,36 @@
         s = "toast"
         self.assertEquals("test" + s, root.s + s)
         self.assertEquals(s + "test", s + root.s)
+            
+    def test_type_str_mod(self):
+        s = "%d %f %s %r"
+        el = objectify.DataElement(s)
+        values = (1, 7.0, "abcd", None)
+        self.assertEquals(s % values, el % values)
+
+        s = "%d"
+        el = objectify.DataElement(s)
+        val = 5
+        self.assertEquals(s % val, el % val)
+
+        s = "%d %s"
+        el = objectify.DataElement(s)
+        val = 5
+        self.assertRaises(TypeError, el.__mod__, val)
+
+        s = ""
+        el = objectify.DataElement(s)
+        val = 5
+        self.assertRaises(TypeError, el.__mod__, val)
+            
+    def test_type_str_mod_data_elements(self):
+        s = "%d %f %s %r"
+        el = objectify.DataElement(s)
+        values = (objectify.DataElement(1),
+                  objectify.DataElement(7.0),
+                  objectify.DataElement("abcd"),
+                  objectify.DataElement(None))
+        self.assertEquals(s % values, el % values)
 
     def test_data_element_str(self):
         value = objectify.DataElement("test")
@@ -1007,27 +1037,6 @@
                          (none, type(none), comparison) )
             self.assert_(comparison > none, "%s should be > %s (%s)" %
                          (comparison, none, type(none)) )
-            
-    def test_type_str_mod(self):
-        s = "%d %f %s %r"
-        el = objectify.DataElement(s)
-        values = (1, 7.0, "abcd", None)
-        self.assertEquals(s % values, el % values)
-
-        s = "%d"
-        el = objectify.DataElement(s)
-        val = 5
-        self.assertEquals(s % val, el % val)
-
-        s = "%d %s"
-        el = objectify.DataElement(s)
-        val = 5
-        self.assertRaises(TypeError, el.__mod__, val)
-
-        s = ""
-        el = objectify.DataElement(s)
-        val = 5
-        self.assertRaises(TypeError, el.__mod__, val)
 
     def test_dataelement_xsi(self):
         el = objectify.DataElement(1, _xsi="string")