[Python-checkins] CVS: python/dist/src/Lib/test test_contains.py,1.2,1.3

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/projects/python/develop/guido/src/Lib/test

Modified Files:
	test_contains.py 
Log Message:
Marc-Andre Lemburg:

* More test cases for test_contains.py.


Index: test_contains.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_contains.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_contains.py	2000/03/07 15:52:01	1.2
--- test_contains.py	2000/04/10 13:52:13	1.3
***************
*** 18,22 ****
  def check(ok, *args):
      if not ok:
!         raise TestFailed, join(map(str, args), " ")
  
  a = base_set(1)
--- 18,22 ----
  def check(ok, *args):
      if not ok:
!         raise TestFailed, " ".join(map(str, args))
  
  a = base_set(1)
***************
*** 61,64 ****
--- 61,121 ----
  	None in 'abc'
  	check(0, "None in 'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ # Test char in Unicode
+ 
+ check('c' in u'abc', "'c' not in u'abc'")
+ check('d' not in u'abc', "'d' in u'abc'")
+ 
+ try:
+ 	'' in u'abc'
+ 	check(0, "'' in u'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ try:
+ 	'ab' in u'abc'
+ 	check(0, "'ab' in u'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ try:
+ 	None in u'abc'
+ 	check(0, "None in u'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ # Test Unicode char in Unicode
+ 
+ check(u'c' in u'abc', "u'c' not in u'abc'")
+ check(u'd' not in u'abc', "u'd' in u'abc'")
+ 
+ try:
+ 	u'' in u'abc'
+ 	check(0, "u'' in u'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ try:
+ 	u'ab' in u'abc'
+ 	check(0, "u'ab' in u'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ # Test Unicode char in string
+ 
+ check(u'c' in 'abc', "u'c' not in 'abc'")
+ check(u'd' not in 'abc', "u'd' in 'abc'")
+ 
+ try:
+ 	u'' in 'abc'
+ 	check(0, "u'' in 'abc' did not raise error")
+ except TypeError:
+ 	pass
+ 
+ try:
+ 	u'ab' in 'abc'
+ 	check(0, "u'ab' in 'abc' did not raise error")
  except TypeError:
  	pass