changeset: 87157:f32353baecc3 branch: 3.3 parent: 87154:98adbaccaae3 user: Serhiy Storchaka date: Sun Nov 17 00:12:21 2013 +0200 files: Lib/unittest/test/test_case.py Lib/unittest/test/test_loader.py Lib/unittest/test/test_result.py Lib/unittest/test/testmock/testhelpers.py Lib/unittest/test/testmock/testmagicmethods.py Lib/unittest/test/testmock/testmock.py Lib/unittest/test/testmock/testsentinel.py description: Issue #19594: Use specific asserts in unittest tests. diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/test_case.py --- a/Lib/unittest/test/test_case.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/test_case.py Sun Nov 17 00:12:21 2013 +0200 @@ -307,7 +307,7 @@ def test(self): pass - self.assertTrue(Foo('test').failureException is AssertionError) + self.assertIs(Foo('test').failureException, AssertionError) # "This class attribute gives the exception raised by the test() method. # If a test framework needs to use a specialized exception, possibly to @@ -325,7 +325,7 @@ failureException = RuntimeError - self.assertTrue(Foo('test').failureException is RuntimeError) + self.assertIs(Foo('test').failureException, RuntimeError) Foo('test').run(result) @@ -348,7 +348,7 @@ failureException = RuntimeError - self.assertTrue(Foo('test').failureException is RuntimeError) + self.assertIs(Foo('test').failureException, RuntimeError) Foo('test').run(result) @@ -660,7 +660,7 @@ msg = e.args[0] else: self.fail('assertSequenceEqual did not fail.') - self.assertTrue(len(msg) < len(diff)) + self.assertLess(len(msg), len(diff)) self.assertIn(omitted, msg) self.maxDiff = len(diff) * 2 @@ -670,7 +670,7 @@ msg = e.args[0] else: self.fail('assertSequenceEqual did not fail.') - self.assertTrue(len(msg) > len(diff)) + self.assertGreater(len(msg), len(diff)) self.assertNotIn(omitted, msg) self.maxDiff = None @@ -680,7 +680,7 @@ msg = e.args[0] else: self.fail('assertSequenceEqual did not fail.') - self.assertTrue(len(msg) > len(diff)) + self.assertGreater(len(msg), len(diff)) self.assertNotIn(omitted, msg) def testTruncateMessage(self): diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/test_loader.py --- a/Lib/unittest/test/test_loader.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/test_loader.py Sun Nov 17 00:12:21 2013 +0200 @@ -1305,4 +1305,4 @@ # "The default value is the TestSuite class" def test_suiteClass__default_value(self): loader = unittest.TestLoader() - self.assertTrue(loader.suiteClass is unittest.TestSuite) + self.assertIs(loader.suiteClass, unittest.TestSuite) diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/test_result.py --- a/Lib/unittest/test/test_result.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/test_result.py Sun Nov 17 00:12:21 2013 +0200 @@ -176,7 +176,7 @@ self.assertEqual(result.shouldStop, False) test_case, formatted_exc = result.failures[0] - self.assertTrue(test_case is test) + self.assertIs(test_case, test) self.assertIsInstance(formatted_exc, str) # "addError(test, err)" @@ -224,7 +224,7 @@ self.assertEqual(result.shouldStop, False) test_case, formatted_exc = result.errors[0] - self.assertTrue(test_case is test) + self.assertIs(test_case, test) self.assertIsInstance(formatted_exc, str) def testGetDescriptionWithoutDocstring(self): diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/testmock/testhelpers.py --- a/Lib/unittest/test/testmock/testhelpers.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/testmock/testhelpers.py Sun Nov 17 00:12:21 2013 +0200 @@ -177,7 +177,7 @@ args = _Call(((1, 2, 3), {})) self.assertEqual(args, call(1, 2, 3)) self.assertEqual(call(1, 2, 3), args) - self.assertTrue(call(1, 2, 3) in [args]) + self.assertIn(call(1, 2, 3), [args]) def test_call_ne(self): @@ -793,7 +793,7 @@ mock_property = foo.foo # no spec on properties - self.assertTrue(isinstance(mock_property, MagicMock)) + self.assertIsInstance(mock_property, MagicMock) mock_property(1, 2, 3) mock_property.abc(4, 5, 6) mock_property.assert_called_once_with(1, 2, 3) @@ -826,19 +826,19 @@ mock(b=6) for kall in call(1, 2), call(a=3), call(3, 4), call(b=6): - self.assertTrue(kall in mock.call_args_list) + self.assertIn(kall, mock.call_args_list) calls = [call(a=3), call(3, 4)] - self.assertTrue(calls in mock.call_args_list) + self.assertIn(calls, mock.call_args_list) calls = [call(1, 2), call(a=3)] - self.assertTrue(calls in mock.call_args_list) + self.assertIn(calls, mock.call_args_list) calls = [call(3, 4), call(b=6)] - self.assertTrue(calls in mock.call_args_list) + self.assertIn(calls, mock.call_args_list) calls = [call(3, 4)] - self.assertTrue(calls in mock.call_args_list) + self.assertIn(calls, mock.call_args_list) - self.assertFalse(call('fish') in mock.call_args_list) - self.assertFalse([call('fish')] in mock.call_args_list) + self.assertNotIn(call('fish'), mock.call_args_list) + self.assertNotIn([call('fish')], mock.call_args_list) def test_call_list_str(self): diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/testmock/testmagicmethods.py --- a/Lib/unittest/test/testmock/testmagicmethods.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/testmock/testmagicmethods.py Sun Nov 17 00:12:21 2013 +0200 @@ -37,12 +37,12 @@ return self, 'fish' mock.__getitem__ = f - self.assertFalse(mock.__getitem__ is f) + self.assertIsNot(mock.__getitem__, f) self.assertEqual(mock['foo'], (mock, 'fish')) self.assertEqual(mock.__getitem__('foo'), (mock, 'fish')) mock.__getitem__ = mock - self.assertTrue(mock.__getitem__ is mock) + self.assertIs(mock.__getitem__, mock) def test_magic_methods_isolated_between_mocks(self): @@ -212,8 +212,8 @@ self.assertEqual(len(mock), 6) mock.__contains__ = lambda s, o: o == 3 - self.assertTrue(3 in mock) - self.assertFalse(6 in mock) + self.assertIn(3, mock) + self.assertNotIn(6, mock) mock.__iter__ = lambda s: iter('foobarbaz') self.assertEqual(list(mock), list('foobarbaz')) diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/testmock/testmock.py --- a/Lib/unittest/test/testmock/testmock.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/testmock/testmock.py Sun Nov 17 00:12:21 2013 +0200 @@ -52,7 +52,7 @@ "method_calls not initialised correctly") # Can't use hasattr for this test as it always returns True on a mock - self.assertFalse('_items' in mock.__dict__, + self.assertNotIn('_items', mock.__dict__, "default mock should not have '_items' attribute") self.assertIsNone(mock._mock_parent, @@ -493,19 +493,19 @@ pass mock = Mock(spec=X) - self.assertTrue(isinstance(mock, X)) + self.assertIsInstance(mock, X) mock = Mock(spec=X()) - self.assertTrue(isinstance(mock, X)) + self.assertIsInstance(mock, X) self.assertIs(mock.__class__, X) self.assertEqual(Mock().__class__.__name__, 'Mock') mock = Mock(spec_set=X) - self.assertTrue(isinstance(mock, X)) + self.assertIsInstance(mock, X) mock = Mock(spec_set=X()) - self.assertTrue(isinstance(mock, X)) + self.assertIsInstance(mock, X) def test_setting_attribute_with_spec_set(self): diff -r 98adbaccaae3 -r f32353baecc3 Lib/unittest/test/testmock/testsentinel.py --- a/Lib/unittest/test/testmock/testsentinel.py Sat Nov 16 23:51:26 2013 +0200 +++ b/Lib/unittest/test/testmock/testsentinel.py Sun Nov 17 00:12:21 2013 +0200 @@ -17,7 +17,7 @@ def testDEFAULT(self): - self.assertTrue(DEFAULT is sentinel.DEFAULT) + self.assertIs(DEFAULT, sentinel.DEFAULT) def testBases(self): # If this doesn't raise an AttributeError then help(mock) is broken