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

@ -566,23 +566,23 @@ class TestCase(unittest.TestCase):
def test_in_and_not_in(self):
for sc5 in IteratingSequenceClass(5), SequenceClass(5):
for i in range(5):
self.assertTrue(i in sc5)
self.assertIn(i, sc5)
for i in "abc", -1, 5, 42.42, (3, 4), [], {1: 1}, 3-12j, sc5:
self.assertTrue(i not in sc5)
self.assertNotIn(i, sc5)
self.assertRaises(TypeError, lambda: 3 in 12)
self.assertRaises(TypeError, lambda: 3 not in map)
d = {"one": 1, "two": 2, "three": 3, 1j: 2j}
for k in d:
self.assertTrue(k in d)
self.assertTrue(k not in d.itervalues())
self.assertIn(k, d)
self.assertNotIn(k, d.itervalues())
for v in d.values():
self.assertTrue(v in d.itervalues())
self.assertTrue(v not in d)
self.assertIn(v, d.itervalues())
self.assertNotIn(v, d)
for k, v in d.iteritems():
self.assertTrue((k, v) in d.iteritems())
self.assertTrue((v, k) not in d.iteritems())
self.assertIn((k, v), d.iteritems())
self.assertNotIn((v, k), d.iteritems())
f = open(TESTFN, "w")
try:
@ -593,9 +593,9 @@ class TestCase(unittest.TestCase):
try:
for chunk in "abc":
f.seek(0, 0)
self.assertTrue(chunk not in f)
self.assertNotIn(chunk, f)
f.seek(0, 0)
self.assertTrue((chunk + "\n") in f)
self.assertIn((chunk + "\n"), f)
finally:
f.close()
try: