From: Hye-Shik Chang <hyeshik@gmail.com>
Date: Fri, 4 Jun 2004 04:24:54 +0000 (+0000)
Subject: Reuse width/iswide tests from strings_test. (Suggested by Walter Dörwald)
X-Git-Tag: v2.4a1~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c145449daa8356c6ae4c296ffb24b5214647442;p=python

Reuse width/iswide tests from strings_test. (Suggested by Walter Dörwald)
---

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 4b16f90183..e2db2077cc 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -11,7 +11,8 @@ from test import test_support, string_tests
 
 class UnicodeTest(
     string_tests.CommonTest,
-    string_tests.MixinStrUnicodeUserStringTest
+    string_tests.MixinStrUnicodeUserStringTest,
+    string_tests.MixinUnicodeUserStringTest
     ):
     type2test = unicode
 
@@ -291,26 +292,6 @@ class UnicodeTest(
 
         self.assertRaises(TypeError, u"abc".isnumeric, 42)
 
-    def test_iswide(self):
-        self.checkequalnofix(False, u'', 'iswide')
-        self.checkequalnofix(False, u'\x1f', 'iswide') # Neutral
-        self.checkequalnofix(False, u'\x20', 'iswide') # Narrow
-        self.checkequalnofix(True, u'\u2329', 'iswide') # Wide
-        self.checkequalnofix(False, u'\uff64', 'iswide') # Half
-        self.checkequalnofix(True, u'\u3000', 'iswide') # Full
-        self.checkequalnofix(False, u'\u2460', 'iswide') # Ambiguous
-        self.checkequalnofix(True, u'\ud55c\uae00', 'iswide')
-        self.checkequalnofix(False, u'\ud55c\u2606\uae00', 'iswide')
-
-    def test_width(self):
-        self.assertEqual(u''.width(), 0)
-        self.assertEqual(u'abcd'.width(), 4)
-        self.assertEqual(u'\u0187\u01c9'.width(), 2)
-        self.assertEqual(u'\u2460\u2329'.width(), 3)
-        self.assertEqual(u'\u2329\u2460'.width(), 3)
-        self.assertEqual(u'\ud55c\uae00'.width(), 4)
-        self.assertEqual(u'\ud55c\u2606\uae00'.width(), 5)
-
     def test_contains(self):
         # Testing Unicode contains method
         self.assert_('a' in u'abdb')