diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-23 23:04:36 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-23 23:04:36 (GMT) |
| commit | aa98058cc44ba20f35c106d20918c6196b737561 (patch) | |
| tree | 317b6f7bf17df98e284d0902ae10a64faf4ccd91 /Lib/test/mapping_tests.py | |
| parent | 8cd0a66a0fd7bb7d69153906942930c2e8c3dd17 (diff) | |
| download | cpython-aa98058cc44ba20f35c106d20918c6196b737561.zip cpython-aa98058cc44ba20f35c106d20918c6196b737561.tar.gz cpython-aa98058cc44ba20f35c106d20918c6196b737561.tar.bz2 | |
use assert[Not]In where appropriate
Diffstat (limited to 'Lib/test/mapping_tests.py')
| -rw-r--r-- | Lib/test/mapping_tests.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py index 7ec4bb1..9e9093f 100644 --- a/Lib/test/mapping_tests.py +++ b/Lib/test/mapping_tests.py @@ -57,10 +57,10 @@ class BasicTestMappingProtocol(unittest.TestCase): #has_key for k in self.reference: self.assertTrue(d.has_key(k)) - self.assertTrue(k in d) + self.assertIn(k, d) for k in self.other: self.assertFalse(d.has_key(k)) - self.assertFalse(k in d) + self.assertNotIn(k, d) #cmp self.assertEqual(cmp(p,p), 0) self.assertEqual(cmp(d,d), 0) @@ -84,7 +84,7 @@ class BasicTestMappingProtocol(unittest.TestCase): knownkey, knownvalue = self.other.iteritems().next() self.assertEqual(d.get(key, knownvalue), value) self.assertEqual(d.get(knownkey, knownvalue), knownvalue) - self.assertFalse(knownkey in d) + self.assertNotIn(knownkey, d) def test_write(self): # Test for write operations on mapping @@ -114,16 +114,16 @@ class BasicTestMappingProtocol(unittest.TestCase): self.assertEqual(d[knownkey], knownvalue) #pop self.assertEqual(d.pop(knownkey), knownvalue) - self.assertFalse(knownkey in d) + self.assertNotIn(knownkey, d) self.assertRaises(KeyError, d.pop, knownkey) default = 909 d[knownkey] = knownvalue self.assertEqual(d.pop(knownkey, default), knownvalue) - self.assertFalse(knownkey in d) + self.assertNotIn(knownkey, d) self.assertEqual(d.pop(knownkey, default), default) #popitem key, value = d.popitem() - self.assertFalse(key in d) + self.assertNotIn(key, d) self.assertEqual(value, self.reference[key]) p=self._empty_mapping() self.assertRaises(KeyError, p.popitem) @@ -141,8 +141,8 @@ class BasicTestMappingProtocol(unittest.TestCase): d = self._empty_mapping() self.assertEqual(d.keys(), []) d = self.reference - self.assertTrue(self.inmapping.keys()[0] in d.keys()) - self.assertTrue(self.other.keys()[0] not in d.keys()) + self.assertIn(self.inmapping.keys()[0], d.keys()) + self.assertNotIn(self.other.keys()[0], d.keys()) self.assertRaises(TypeError, d.keys, None) def test_values(self): @@ -318,9 +318,9 @@ class TestMappingProtocol(BasicTestMappingProtocol): self.assertEqual(d.keys(), []) d = self._full_mapping({'a': 1, 'b': 2}) k = d.keys() - self.assertTrue('a' in k) - self.assertTrue('b' in k) - self.assertTrue('c' not in k) + self.assertIn('a', k) + self.assertIn('b', k) + self.assertNotIn('c', k) def test_values(self): BasicTestMappingProtocol.test_values(self) @@ -345,12 +345,13 @@ class TestMappingProtocol(BasicTestMappingProtocol): def test_contains(self): d = self._empty_mapping() + self.assertNotIn('a', d) self.assertTrue(not ('a' in d)) self.assertTrue('a' not in d) d = self._full_mapping({'a': 1, 'b': 2}) - self.assertTrue('a' in d) - self.assertTrue('b' in d) - self.assertTrue('c' not in d) + self.assertIn('a', d) + self.assertIn('b', d) + self.assertNotIn('c', d) self.assertRaises(TypeError, d.__contains__) |