[Python-checkins] CVS: python/dist/src/Lib/test test_b1.py,1.40,1.41 test_descr.py,1.111,1.112 test_types.py,1.23,1.24

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv22625

Modified Files:
	test_b1.py test_descr.py test_types.py 
Log Message:
Additional coverage tests by Neil Norwitz.
(SF patch #491418, #491420, #491421.)

Index: test_b1.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_b1.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** test_b1.py	2001/09/04 19:14:14	1.40
--- test_b1.py	2001/12/11 04:37:34	1.41
***************
*** 24,27 ****
--- 24,31 ----
  if abs(-1234L) != 1234L: raise TestFailed, 'abs(-1234L)'
  
+ try: abs('a')
+ except TypeError: pass
+ else: raise TestFailed, 'abs("a")'
+ 
  print 'apply'
  def f0(*args):
***************
*** 417,420 ****
--- 421,428 ----
      raise TestFailed("x >> 1 != x/2 when x == -1-sys.maxint")
  
+ try: int('123\0')
+ except ValueError: pass
+ else: raise TestFailed("int('123\0') didn't raise exception")
+ 
  print 'isinstance'
  class C:
***************
*** 504,507 ****
--- 512,519 ----
              except ValueError, e:
                  raise TestFailed, "long(%s) raised ValueError: %s" % (`ss`, e)
+ 
+ try: long('123\0')
+ except ValueError: pass
+ else: raise TestFailed("long('123\0') didn't raise exception")
  
  print 'map'

Index: test_descr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descr.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** test_descr.py	2001/12/06 06:23:25	1.111
--- test_descr.py	2001/12/11 04:37:34	1.112
***************
*** 769,772 ****
--- 769,778 ----
      vereq(T.counter, 1)
  
+     class C(object): pass
+     c = C()
+     try: c()
+     except TypeError: pass
+     else: raise TestError, "calling object w/o call method should raise TypeError"
+ 
  def pymods():
      if verbose: print "Testing Python subclass of module..."
***************
*** 2608,2611 ****
--- 2614,2623 ----
      vereq(log, [1])
  
+     class D(object): pass
+     d = D()
+     try: del d[0]
+     except TypeError: pass
+     else: raise TestFailed, "invalid del() didn't raise TypeError"
+ 
  def hashinherit():
      if verbose: print "Testing hash of mutable subclasses..."
***************
*** 2631,2634 ****
--- 2643,2699 ----
          raise TestFailed, "hash() of list subclass should fail"
  
+ def strops():
+     try: 'a' + 5
+     except TypeError: pass
+     else: raise TestFailed, "'' + 5 doesn't raise TypeError"
+ 
+     try: ''.split('')
+     except ValueError: pass
+     else: raise TestFailed, "''.split('') doesn't raise ValueError"
+ 
+     try: ''.join([0])
+     except TypeError: pass
+     else: raise TestFailed, "''.join([0]) doesn't raise TypeError"
+ 
+     try: ''.rindex('5')
+     except ValueError: pass
+     else: raise TestFailed, "''.rindex('5') doesn't raise ValueError"
+ 
+     try: ''.replace('', '')
+     except ValueError: pass
+     else: raise TestFailed, "''.replace('', '') doesn't raise ValueError"
+ 
+     try: '%(n)s' % None
+     except TypeError: pass
+     else: raise TestFailed, "'%(n)s' % None doesn't raise TypeError"
+ 
+     try: '%(n' % {}
+     except ValueError: pass
+     else: raise TestFailed, "'%(n' % {} '' doesn't raise ValueError"
+ 
+     try: '%*s' % ('abc')
+     except TypeError: pass
+     else: raise TestFailed, "'%*s' % ('abc') doesn't raise TypeError"
+ 
+     try: '%*.*s' % ('abc', 5)
+     except TypeError: pass
+     else: raise TestFailed, "'%*.*s' % ('abc', 5) doesn't raise TypeError"
+ 
+     try: '%s' % (1, 2)
+     except TypeError: pass
+     else: raise TestFailed, "'%s' % (1, 2) doesn't raise TypeError"
+ 
+     try: '%' % None
+     except ValueError: pass
+     else: raise TestFailed, "'%' % None doesn't raise ValueError"
+ 
+     vereq('534253'.isdigit(), 1)
+     vereq('534253x'.isdigit(), 0)
+     vereq('%c' % 5, '\x05')
+     vereq('%c' % '5', '5')
+ 
+ 
+ 
+ 
  def test_main():
      class_docstrings()
***************
*** 2684,2687 ****
--- 2749,2753 ----
      delhook()
      hashinherit()
+     strops()
      if verbose: print "All OK"
  

Index: test_types.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** test_types.py	2001/12/05 00:30:09	1.23
--- test_types.py	2001/12/11 04:37:34	1.24
***************
*** 390,391 ****
--- 390,400 ----
          if a: raise TestFailed, 'a not empty after popitems: %s' % str(a)
          if b: raise TestFailed, 'b not empty after popitems: %s' % str(b)
+ 
+ try: type(1, 2)
+ except TypeError: pass
+ else: raise TestFailed, 'type(), w/2 args expected TypeError'
+ 
+ try: type(1, 2, 3, 4)
+ except TypeError: pass
+ else: raise TestFailed, 'type(), w/4 args expected TypeError'
+