[Python-checkins] CVS: python/dist/src/Lib/test test_unicode.py,NONE,1.1 test_string.py,1.5,1.6

Guido van Rossum guido@cnri.reston.va.us
Fri, 10 Mar 2000 18:23:23 -0500 (EST)


Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/home/guido/hp/mal/py-patched/Lib/test

Modified Files:
	test_string.py 
Added Files:
	test_unicode.py 
Log Message:
Marc-Andre Lemburg: test script for Unicode implementation.


Index: test_string.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_string.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_string.py	1999/06/15 16:49:11	1.5
--- test_string.py	2000/03/10 23:23:20	1.6
***************
*** 12,21 ****
          print 'string.%s%s =? %s... ' % (name, (input,) + args, output),
      try:
          try:
-             f = getattr(string, name)
-             value = apply(f, (input,) + args)
-         except AttributeError:
              f = getattr(input, name)
              value = apply(f, args)
      except:
           value = sys.exc_type
--- 12,22 ----
          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
***************
*** 49,52 ****
--- 50,97 ----
  test('upper', 'HELLO', 'HELLO')
  
+ test('title', ' hello ', ' Hello ')
+ test('title', 'hello ', 'Hello ')
+ test('title', "fOrMaT thIs aS titLe String", 'Format This As Title String')
+ test('title', "fOrMaT,thIs-aS*titLe;String", 'Format,This-As*Title;String')
+ test('title', "getInt", 'Getint')
+ 
+ test('expandtabs', 'abc\rab\tdef\ng\thi', 'abc\rab      def\ng       hi')
+ test('expandtabs', 'abc\rab\tdef\ng\thi', 'abc\rab      def\ng       hi', 8)
+ test('expandtabs', 'abc\rab\tdef\ng\thi', 'abc\rab  def\ng   hi', 4)
+ test('expandtabs', 'abc\r\nab\tdef\ng\thi', 'abc\r\nab  def\ng   hi', 4)
+ 
+ test('islower', 'a', 1)
+ test('islower', 'A', 0)
+ test('islower', '\n', 0)
+ test('islower', 'abc', 1)
+ test('islower', 'aBc', 0)
+ test('islower', 'abc\n', 1)
+ 
+ test('isupper', 'a', 0)
+ test('isupper', 'A', 1)
+ test('isupper', '\n', 0)
+ test('isupper', 'ABC', 1)
+ test('isupper', 'AbC', 0)
+ test('isupper', 'ABC\n', 1)
+ 
+ test('istitle', 'a', 0)
+ test('istitle', 'A', 1)
+ test('istitle', '\n', 0)
+ test('istitle', 'A Titlecased Line', 1)
+ test('istitle', 'A\nTitlecased Line', 1)
+ test('istitle', 'A Titlecased, Line', 1)
+ test('istitle', 'Not a capitalized String', 0)
+ test('istitle', 'Not\ta Titlecase String', 0)
+ test('istitle', 'Not--a Titlecase String', 0)
+ 
+ test('splitlines', "abc\ndef\n\rghi", ['abc', 'def', '', 'ghi'])
+ test('splitlines', "abc\ndef\n\r\nghi", ['abc', 'def', '', 'ghi'])
+ test('splitlines', "abc\ndef\r\nghi", ['abc', 'def', 'ghi'])
+ test('splitlines', "abc\ndef\r\nghi\n", ['abc', 'def', 'ghi'])
+ test('splitlines', "abc\ndef\r\nghi\n\r", ['abc', 'def', 'ghi', ''])
+ test('splitlines', "\nabc\ndef\r\nghi\n\r", ['', 'abc', 'def', 'ghi', ''])
+ test('splitlines', "\nabc\ndef\r\nghi\n\r", ['', 'abc\012def\015\012ghi\012\015'], 1)
+ test('splitlines', "\nabc\ndef\r\nghi\n\r", ['', 'abc', 'def\015\012ghi\012\015'], 2)
+ 
  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'
  
***************
*** 62,67 ****
  test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 3)
  test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 4)
! test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 0)
  test('split', 'a  b  c  d', ['a', 'b', 'c  d'], None, 2)
  
  # join now works with any sequence type
--- 107,113 ----
  test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 3)
  test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 4)
! test('split', 'a b c d', ['a b c d'], None, 0)
  test('split', 'a  b  c  d', ['a', 'b', 'c  d'], None, 2)
+ test('split', 'a b c d ', ['a', 'b', 'c', 'd'])
  
  # join now works with any sequence type
***************
*** 76,86 ****
  test('join', 7, TypeError)
  
- class BadStr:
-     def __str__(self): raise RuntimeError
- 
  class BadSeq(Sequence):
!     def __init__(self): self.seq = [7, 'hello', BadStr()]
  
! test('join', BadSeq(), RuntimeError)
  
  # try a few long ones
--- 122,129 ----
  test('join', 7, TypeError)
  
  class BadSeq(Sequence):
!     def __init__(self): self.seq = [7, 'hello', 123L]
  
! test('join', BadSeq(), TypeError)
  
  # try a few long ones
***************
*** 104,108 ****
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 3)
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 4)
! test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 0)
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@')
  test('replace', 'one!two!three!', 'one!two!three!', 'x', '@')
--- 147,151 ----
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 3)
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@', 4)
! test('replace', 'one!two!three!', 'one!two!three!', '!', '@', 0)
  test('replace', 'one!two!three!', 'one@two@three@', '!', '@')
  test('replace', 'one!two!three!', 'one!two!three!', 'x', '@')