diff -r 860ed4bc8d32 Doc/library/unittest.mock-examples.rst --- a/Doc/library/unittest.mock-examples.rst Fri Dec 21 11:23:23 2012 +0000 +++ b/Doc/library/unittest.mock-examples.rst Sat Dec 22 10:29:40 2012 +0200 @@ -372,8 +372,8 @@ ... @patch('package.module.ClassName1') ... @patch('package.module.ClassName2') ... def test_something(self, MockClass2, MockClass1): - ... self.assertTrue(package.module.ClassName1 is MockClass1) - ... self.assertTrue(package.module.ClassName2 is MockClass2) + ... self.assertIs(package.module.ClassName1, MockClass1) + ... self.assertIs(package.module.ClassName2, MockClass2) ... >>> MyTest('test_something').test_something() @@ -595,10 +595,10 @@ ... class MyTest(TestCase): ... ... def test_one(self, MockSomeClass): - ... self.assertTrue(mymodule.SomeClass is MockSomeClass) + ... self.assertIs(mymodule.SomeClass, MockSomeClass) ... ... def test_two(self, MockSomeClass): - ... self.assertTrue(mymodule.SomeClass is MockSomeClass) + ... self.assertIs(mymodule.SomeClass, MockSomeClass) ... ... def not_a_test(self): ... return 'something' @@ -617,7 +617,7 @@ ... self.mock_foo = self.patcher.start() ... ... def test_foo(self): - ... self.assertTrue(mymodule.foo is self.mock_foo) + ... self.assertIs(mymodule.foo, self.mock_foo) ... ... def tearDown(self): ... self.patcher.stop() @@ -636,7 +636,7 @@ ... self.mock_foo = patcher.start() ... ... def test_foo(self): - ... self.assertTrue(mymodule.foo is self.mock_foo) + ... self.assertIs(mymodule.foo, self.mock_foo) ... >>> MyTest('test_foo').run() diff -r 860ed4bc8d32 Doc/library/unittest.rst --- a/Doc/library/unittest.rst Fri Dec 21 11:23:23 2012 +0000 +++ b/Doc/library/unittest.rst Sat Dec 22 10:29:40 2012 +0200 @@ -135,13 +135,13 @@ def test_choice(self): element = random.choice(self.seq) - self.assertTrue(element in self.seq) + self.assertIn(element, self.seq) def test_sample(self): with self.assertRaises(ValueError): random.sample(self.seq, 20) for element in random.sample(self.seq, 5): - self.assertTrue(element in self.seq) + self.assertIn(element, self.seq) if __name__ == '__main__': unittest.main() @@ -152,10 +152,11 @@ represent tests. The crux of each test is a call to :meth:`~TestCase.assertEqual` to check for an -expected result; :meth:`~TestCase.assertTrue` to verify a condition; or -:meth:`~TestCase.assertRaises` to verify that an expected exception gets raised. -These methods are used instead of the :keyword:`assert` statement so the test -runner can accumulate all test results and produce a report. +expected result; :meth:`~TestCase.assertIn` to verify that a specified item +contained in a sequence; or :meth:`~TestCase.assertRaises` to verify that an +expected exception gets raised. These methods are used instead of the +:keyword:`assert` statement so the test runner can accumulate all test results +and produce a report. When a :meth:`~TestCase.setUp` method is defined, the test runner will run that method prior to each test. Likewise, if a :meth:`~TestCase.tearDown` method is