[Python-checkins] python/dist/src/Lib/test test_unicode.py, 1.89, 1.90

[perky at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5223/Lib/test

Modified Files:
	test_unicode.py 
Log Message:
Reuse width/iswide tests from strings_test. (Suggested by Walter Dörwald)


Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** test_unicode.py	4 Jun 2004 03:19:17 -0000	1.89
--- test_unicode.py	4 Jun 2004 04:24:54 -0000	1.90
***************
*** 12,16 ****
  class UnicodeTest(
      string_tests.CommonTest,
!     string_tests.MixinStrUnicodeUserStringTest
      ):
      type2test = unicode
--- 12,17 ----
  class UnicodeTest(
      string_tests.CommonTest,
!     string_tests.MixinStrUnicodeUserStringTest,
!     string_tests.MixinUnicodeUserStringTest
      ):
      type2test = unicode
***************
*** 292,315 ****
          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
--- 293,296 ----