Port all string tests to PyUnit and share as much tests

between str, unicode, UserString and the string module
as possible. This increases code coverage in stringobject.c
from 83% to 86% and should help keep the string classes
in sync in the future. From SF patch #662807

Lib/test/test_str.py

+import unittest
+from test import test_support, string_tests
+
+
+class StrTest(
+    string_tests.CommonTest,
+    string_tests.MixinStrUnicodeUserStringTest,
+    string_tests.MixinStrUserStringTest
+    ):
+
+    type2test = str
+
+    # We don't need to propagate to str
+    def fixtype(self, obj):
+        return obj
+
+def test_main():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(StrTest))
+    test_support.run_suite(suite)
+
+if __name__ == "__main__":
+    test_main()

Lib/test/test_string.py

-from test.test_support import verbose, TestSkipped
-from test import string_tests
-import string, sys
-
-# XXX: kludge... short circuit if strings don't have methods
-try:
-    ''.join
-except AttributeError:
-    raise TestSkipped
-
-def test(name, input, output, *args):
-    if verbose:
-        print 'string.%s%s =? %s... ' % (name, (input,) + args, output),
-    try:
-        # Prefer string methods over string module functions
-        try:
-            f = getattr(input, name)
-            value = apply(f, args)
-        except AttributeError:
-            f = getattr(string, name)
-            value = apply(f, (input,) + args)
-    except:
-        value = sys.exc_type
-        f = name
-    if value == output:
-        # if the original is returned make sure that
-        # this doesn't happen with subclasses
-        if value is input:
-            class ssub(str):
-                def __repr__(self):
-                    return 'ssub(%r)' % str.__repr__(self)
-            input = ssub(input)
-            try:
-                f = getattr(input, name)
-                value = apply(f, args)
-            except AttributeError:
-                f = getattr(string, name)
-                value = apply(f, (input,) + args)
-            if value is input:
-                if verbose:
-                    print 'no'
-                print '*',f, `input`, `output`, `value`
-                return
-    if value != output:
-        if verbose:
-            print 'no'
-        print f, `input`, `output`, `value`
-    else:
-        if verbose:
-            print 'yes'
-
-string_tests.run_module_tests(test)
-string_tests.run_method_tests(test)
-string_tests.run_contains_tests(test)
-string_tests.run_inplace_tests(str)
-
-string.whitespace
-string.lowercase
-string.uppercase
-
-# Float formatting
-for prec in range(100):
-    formatstring = '%%.%if' % prec
-    value = 0.01
-    for x in range(60):
-        value = value * 3.141592655 / 3.0 * 10.0
-        #print 'Overflow check for x=%i and prec=%i:' % \
-        #      (x, prec),
-        try:
-            result = formatstring % value
-        except OverflowError:
-            # The formatfloat() code in stringobject.c and
-            # unicodeobject.c uses a 120 byte buffer and switches from
-            # 'f' formatting to 'g' at precision 50, so we expect
-            # OverflowErrors for the ranges x < 50 and prec >= 67.
-            if x >= 50 or \
-               prec < 67:
-                print '*** unexpected OverflowError for x=%i and prec=%i' % (x, prec)
-            else:
-                #print 'OverflowError'
-                pass
-        else:
-            #print result
-            pass
+import unittest, string
+from test import test_support, string_tests
+from UserList import UserList
+
+class StringTest(
+    string_tests.CommonTest,
+    string_tests.MixinStrStringUserStringTest
+    ):
+
+    type2test = str
+
+    def checkequal(self, result, object, methodname, *args):
+        realresult = getattr(string, methodname)(object, *args)
+        self.assertEqual(
+            result,
+            realresult
+        )
+
+    def checkraises(self, exc, object, methodname, *args):
+        self.assertRaises(
+            exc,
+            getattr(string, methodname),
+            object,
+            *args
+        )
+
+    def checkcall(self, object, methodname, *args):
+        getattr(string, methodname)(object, *args)
+
+    def test_join(self):
+        # These are the same checks as in string_test.ObjectTest.test_join
+        # but the argument order ist different
+        self.checkequal('a b c d', ['a', 'b', 'c', 'd'], 'join', ' ')
+        self.checkequal('abcd', ('a', 'b', 'c', 'd'), 'join', '')
+        self.checkequal('w x y z', string_tests.Sequence(), 'join', ' ')
+        self.checkequal('abc', ('abc',), 'join', 'a')
+        self.checkequal('z', UserList(['z']), 'join', 'a')
+        if test_support.have_unicode:
+            self.checkequal(unicode('a.b.c'), ['a', 'b', 'c'], 'join', unicode('.'))
+            self.checkequal(unicode('a.b.c'), [unicode('a'), 'b', 'c'], 'join', '.')
+            self.checkequal(unicode('a.b.c'), ['a', unicode('b'), 'c'], 'join', '.')
+            self.checkequal(unicode('a.b.c'), ['a', 'b', unicode('c')], 'join', '.')
+            self.checkraises(TypeError, ['a', unicode('b'), 3], 'join', '.')
+        for i in [5, 25, 125]:
+            self.checkequal(
+                ((('a' * i) + '-') * i)[:-1],
+                ['a' * i] * i, 'join', '-')
+            self.checkequal(
+                ((('a' * i) + '-') * i)[:-1],
+                ('a' * i,) * i, 'join', '-')
+
+        self.checkraises(TypeError, string_tests.BadSeq1(), 'join', ' ')
+        self.checkequal('a b c', string_tests.BadSeq2(), 'join', ' ')
+
+class ModuleTest(unittest.TestCase):
+
+    def test_attrs(self):
+        string.whitespace
+        string.lowercase
+        string.uppercase
+        string.letters
+        string.digits
+        string.hexdigits
+        string.octdigits
+        string.punctuation
+        string.printable
+
+    def test_atoi(self):
+        self.assertEqual(string.atoi(" 1 "), 1)
+        self.assertRaises(ValueError, string.atoi, " 1x")
+        self.assertRaises(ValueError, string.atoi, " x1 ")
+
+    def test_atol(self):
+        self.assertEqual(string.atol("  1  "), 1L)
+        self.assertRaises(ValueError, string.atol, "  1x ")
+        self.assertRaises(ValueError, string.atol, "  x1 ")
+
+    def test_atof(self):
+        self.assertAlmostEqual(string.atof("  1  "), 1.0)
+        self.assertRaises(ValueError, string.atof, "  1x ")
+        self.assertRaises(ValueError, string.atof, "  x1 ")
+
+    def test_maketrans(self):
+        transtable = '\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037 !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`xyzdefghijklmnopqrstuvwxyz{|}~\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377'
+
+        self.assertEqual(string.maketrans('abc', 'xyz'), transtable)
+        self.assertRaises(ValueError, string.maketrans, 'abc', 'xyzq')
+
+    def test_capwords(self):
+        self.assertEqual(string.capwords('abc def ghi'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('abc\tdef\nghi'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('abc\t   def  \nghi'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('ABC DEF GHI'), 'Abc Def Ghi')
+        self.assertEqual(string.capwords('ABC-DEF-GHI', '-'), 'Abc-Def-Ghi')
+        self.assertEqual(string.capwords('ABC-def DEF-ghi GHI'), 'Abc-def Def-ghi Ghi')
+
+def test_main():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(StringTest))
+    suite.addTest(unittest.makeSuite(ModuleTest))
+    test_support.run_suite(suite)
+
+if __name__ == "__main__":
+    test_main()

Lib/test/test_userstring.py

 #!/usr/bin/env python
-import sys
-from test.test_support import verbose
-from test import string_tests
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
-# The test cases were in part derived from 'test_string.py'.
+
+import unittest
+from test import test_support, string_tests
+
 from UserString import UserString
 
+class UserStringTest(
+    string_tests.CommonTest,
+    string_tests.MixinStrUnicodeUserStringTest,
+    string_tests.MixinStrStringUserStringTest,
+    string_tests.MixinStrUserStringTest
+    ):
+
+    type2test = UserString
+
+    # Overwrite the three testing methods, because UserString
+    # can't cope with arguments propagated to UserString
+    # (and we don't test with subclasses)
+    def checkequal(self, result, object, methodname, *args):
+        result = self.fixtype(result)
+        object = self.fixtype(object)
+        # we don't fix the arguments, because UserString can't cope with it
+        realresult = getattr(object, methodname)(*args)
+        self.assertEqual(
+            result,
+            realresult
+        )
+
+    def checkraises(self, exc, object, methodname, *args):
+        object = self.fixtype(object)
+        # we don't fix the arguments, because UserString can't cope with it
+        self.assertRaises(
+            exc,
+            getattr(object, methodname),
+            *args
+        )
+
+    def checkcall(self, object, methodname, *args):
+        object = self.fixtype(object)
+        # we don't fix the arguments, because UserString can't cope with it
+        getattr(object, methodname)(*args)
+
+def test_main():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.makeSuite(UserStringTest))
+    test_support.run_suite(suite)
+
 if __name__ == "__main__":
-    verbose = '-v' in sys.argv
-
-tested_methods = {}
-
-def test(methodname, input, output, *args):
-    global tested_methods
-    tested_methods[methodname] = 1
-    if verbose:
-        print '%r.%s(%s)' % (input, methodname, ", ".join(map(repr, args))),
-    u = UserString(input)
-    objects = [input, u, UserString(u)]
-    res = [""] * 3
-    for i in range(3):
-        object = objects[i]
-        try:
-            f = getattr(object, methodname)
-        except AttributeError:
-            f = None
-            res[i] = AttributeError
-        else:
-            try:
-                res[i] = apply(f, args)
-            except:
-                res[i] = sys.exc_type
-    if res[0] == res[1] == res[2] == output:
-        if verbose:
-            print 'yes'
-    else:
-        if verbose:
-            print 'no'
-        print (methodname, input, output, args, res[0], res[1], res[2])
-
-string_tests.run_method_tests(test)
-string_tests.run_contains_tests(test)
-string_tests.run_inplace_tests(UserString)
+    test_main()