use assert[Not]In where appropriate

This commit is contained in:
Ezio Melotti 2010-01-23 23:04:36 +00:00
parent 8cd0a66a0f
commit aa98058cc4
86 changed files with 622 additions and 599 deletions

View file

@ -316,30 +316,30 @@ class UnicodeTest(
def test_contains(self):
# Testing Unicode contains method
self.assertTrue('a' in u'abdb')
self.assertTrue('a' in u'bdab')
self.assertTrue('a' in u'bdaba')
self.assertTrue('a' in u'bdba')
self.assertTrue('a' in u'bdba')
self.assertTrue(u'a' in u'bdba')
self.assertTrue(u'a' not in u'bdb')
self.assertTrue(u'a' not in 'bdb')
self.assertTrue(u'a' in 'bdba')
self.assertTrue(u'a' in ('a',1,None))
self.assertTrue(u'a' in (1,None,'a'))
self.assertTrue(u'a' in (1,None,u'a'))
self.assertTrue('a' in ('a',1,None))
self.assertTrue('a' in (1,None,'a'))
self.assertTrue('a' in (1,None,u'a'))
self.assertTrue('a' not in ('x',1,u'y'))
self.assertTrue('a' not in ('x',1,None))
self.assertTrue(u'abcd' not in u'abcxxxx')
self.assertTrue(u'ab' in u'abcd')
self.assertTrue('ab' in u'abc')
self.assertTrue(u'ab' in 'abc')
self.assertTrue(u'ab' in (1,None,u'ab'))
self.assertTrue(u'' in u'abc')
self.assertTrue('' in u'abc')
self.assertIn('a', u'abdb')
self.assertIn('a', u'bdab')
self.assertIn('a', u'bdaba')
self.assertIn('a', u'bdba')
self.assertIn('a', u'bdba')
self.assertIn(u'a', u'bdba')
self.assertNotIn(u'a', u'bdb')
self.assertNotIn(u'a', 'bdb')
self.assertIn(u'a', 'bdba')
self.assertIn(u'a', ('a',1,None))
self.assertIn(u'a', (1,None,'a'))
self.assertIn(u'a', (1,None,u'a'))
self.assertIn('a', ('a',1,None))
self.assertIn('a', (1,None,'a'))
self.assertIn('a', (1,None,u'a'))
self.assertNotIn('a', ('x',1,u'y'))
self.assertNotIn('a', ('x',1,None))
self.assertNotIn(u'abcd', u'abcxxxx')
self.assertIn(u'ab', u'abcd')
self.assertIn('ab', u'abc')
self.assertIn(u'ab', 'abc')
self.assertIn(u'ab', (1,None,u'ab'))
self.assertIn(u'', u'abc')
self.assertIn('', u'abc')
# If the following fails either
# the contains operator does not propagate UnicodeErrors or
@ -347,33 +347,33 @@ class UnicodeTest(
self.assertRaises(UnicodeDecodeError, 'g\xe2teau'.__contains__, u'\xe2')
self.assertRaises(UnicodeDecodeError, u'g\xe2teau'.__contains__, '\xe2')
self.assertTrue(u'' in '')
self.assertTrue('' in u'')
self.assertTrue(u'' in u'')
self.assertTrue(u'' in 'abc')
self.assertTrue('' in u'abc')
self.assertTrue(u'' in u'abc')
self.assertTrue(u'\0' not in 'abc')
self.assertTrue('\0' not in u'abc')
self.assertTrue(u'\0' not in u'abc')
self.assertTrue(u'\0' in '\0abc')
self.assertTrue('\0' in u'\0abc')
self.assertTrue(u'\0' in u'\0abc')
self.assertTrue(u'\0' in 'abc\0')
self.assertTrue('\0' in u'abc\0')
self.assertTrue(u'\0' in u'abc\0')
self.assertTrue(u'a' in '\0abc')
self.assertTrue('a' in u'\0abc')
self.assertTrue(u'a' in u'\0abc')
self.assertTrue(u'asdf' in 'asdf')
self.assertTrue('asdf' in u'asdf')
self.assertTrue(u'asdf' in u'asdf')
self.assertTrue(u'asdf' not in 'asd')
self.assertTrue('asdf' not in u'asd')
self.assertTrue(u'asdf' not in u'asd')
self.assertTrue(u'asdf' not in '')
self.assertTrue('asdf' not in u'')
self.assertTrue(u'asdf' not in u'')
self.assertIn(u'', '')
self.assertIn('', u'')
self.assertIn(u'', u'')
self.assertIn(u'', 'abc')
self.assertIn('', u'abc')
self.assertIn(u'', u'abc')
self.assertNotIn(u'\0', 'abc')
self.assertNotIn('\0', u'abc')
self.assertNotIn(u'\0', u'abc')
self.assertIn(u'\0', '\0abc')
self.assertIn('\0', u'\0abc')
self.assertIn(u'\0', u'\0abc')
self.assertIn(u'\0', 'abc\0')
self.assertIn('\0', u'abc\0')
self.assertIn(u'\0', u'abc\0')
self.assertIn(u'a', '\0abc')
self.assertIn('a', u'\0abc')
self.assertIn(u'a', u'\0abc')
self.assertIn(u'asdf', 'asdf')
self.assertIn('asdf', u'asdf')
self.assertIn(u'asdf', u'asdf')
self.assertNotIn(u'asdf', 'asd')
self.assertNotIn('asdf', u'asd')
self.assertNotIn(u'asdf', u'asd')
self.assertNotIn(u'asdf', '')
self.assertNotIn('asdf', u'')
self.assertNotIn(u'asdf', u'')
self.assertRaises(TypeError, u"abc".__contains__)
self.assertRaises(TypeError, u"abc".__contains__, object())