Issue #19594: Use specific asserts in unittest tests.

diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index d171451f2cf60217c2d42198f78a76ec664e9ebf..b8cb0c76b7cf486b1ad1a6365d1513fdb4042e3c 100644 (file)
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -307,7 +307,7 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
             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 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
 
             failureException = RuntimeError
 
-        self.assertTrue(Foo('test').failureException is RuntimeError)
+        self.assertIs(Foo('test').failureException, RuntimeError)
 
 
         Foo('test').run(result)
@@ -348,7 +348,7 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
 
             failureException = RuntimeError
 
-        self.assertTrue(Foo('test').failureException is RuntimeError)
+        self.assertIs(Foo('test').failureException, RuntimeError)
 
 
         Foo('test').run(result)
@@ -660,7 +660,7 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
             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 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
             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 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
             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 --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py
index f1f8ecd978c523beaf53c031c75be9228f169b1f..fcd2e07624500291557db951b1e64abd7012eb64 100644 (file)
--- a/Lib/unittest/test/test_loader.py
+++ b/Lib/unittest/test/test_loader.py
@@ -1305,4 +1305,4 @@ class Test_TestLoader(unittest.TestCase):
     # "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 --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py
index 1c58e61bb2bb96be0eaceb48d8bd3a977e8622a0..7d40725cf2c6d318dc3f0d992b12b3f4fe08de16 100644 (file)
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@ -176,7 +176,7 @@ class Test_TestResult(unittest.TestCase):
         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 @@ class Test_TestResult(unittest.TestCase):
         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 --git a/Lib/unittest/test/testmock/testhelpers.py b/Lib/unittest/test/testmock/testhelpers.py
index 8bfb29391d95f504d8f7e96ac40cb1356e1d4f28..a362a2f784855e5ab00ae28c3ab79d8c35a3bef6 100644 (file)
--- a/Lib/unittest/test/testmock/testhelpers.py
+++ b/Lib/unittest/test/testmock/testhelpers.py
@@ -177,7 +177,7 @@ class CallTest(unittest.TestCase):
         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 @@ class SpecSignatureTest(unittest.TestCase):
         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 @@ class TestCallList(unittest.TestCase):
         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 --git a/Lib/unittest/test/testmock/testmagicmethods.py b/Lib/unittest/test/testmock/testmagicmethods.py
index 2bcf08801e4085c4df04aaeeb44f567158489244..5ff158dd12a30ad8bec91a323d4cfab204bfee5b 100644 (file)
--- a/Lib/unittest/test/testmock/testmagicmethods.py
+++ b/Lib/unittest/test/testmock/testmagicmethods.py
@@ -37,12 +37,12 @@ class TestMockingMagicMethods(unittest.TestCase):
             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 @@ class TestMockingMagicMethods(unittest.TestCase):
         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 --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 3d0776c16fbca1f13202c5b674305ff9f4dcd7dc..cef5405fe9568ac94170b6291ac73409c44afe9b 100644 (file)
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -52,7 +52,7 @@ class MockTest(unittest.TestCase):
                           "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 @@ class MockTest(unittest.TestCase):
             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 --git a/Lib/unittest/test/testmock/testsentinel.py b/Lib/unittest/test/testmock/testsentinel.py
index bfda68ece39220b025e5251dbdd9a7b82c551358..3fb5acbc25318f4d5632ecc6b5a9710294a54cb4 100644 (file)
--- a/Lib/unittest/test/testmock/testsentinel.py
+++ b/Lib/unittest/test/testmock/testsentinel.py
@@ -17,7 +17,7 @@ class SentinelTest(unittest.TestCase):
 
 
     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