mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 77968 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77968 | ezio.melotti | 2010-02-04 22:06:38 +0200 (Thu, 04 Feb 2010) | 1 line

  Use correct assert* methods in the examples.
........
This commit is contained in:
Ezio Melotti 2010-02-04 20:22:44 +00:00
parent 2d95c3a7d8
commit f85bba5431
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Doc/library/unittest.rst
View file

@ -114,12 +114,12 @@ Here is a short script to test three functions from the :mod:`random` module::
def testchoice(self): def testchoice(self):
element = random.choice(self.seq) element = random.choice(self.seq)
self.assert_(element in self.seq) self.assertTrue(element in self.seq)
def testsample(self): def testsample(self):
self.assertRaises(ValueError, random.sample, self.seq, 20) self.assertRaises(ValueError, random.sample, self.seq, 20)
for element in random.sample(self.seq, 5): for element in random.sample(self.seq, 5):
self.assert_(element in self.seq) self.assertTrue(element in self.seq)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()
@ -234,13 +234,13 @@ we run the test::
class DefaultWidgetSizeTestCase(SimpleWidgetTestCase): class DefaultWidgetSizeTestCase(SimpleWidgetTestCase):
def runTest(self): def runTest(self):
self.failUnless(self.widget.size() == (50,50), self.assertEqual(self.widget.size(), (50,50),
'incorrect default size') 'incorrect default size')
class WidgetResizeTestCase(SimpleWidgetTestCase): class WidgetResizeTestCase(SimpleWidgetTestCase):
def runTest(self): def runTest(self):
self.widget.resize(100,150) self.widget.resize(100,150)
self.failUnless(self.widget.size() == (100,150), self.assertEqual(self.widget.size(), (100,150),
'wrong size after resize') 'wrong size after resize')
If the :meth:`setUp` method raises an exception while the test is running, the If the :meth:`setUp` method raises an exception while the test is running, the
@ -282,12 +282,12 @@ mechanism::
self.widget = None self.widget = None
def testDefaultSize(self): def testDefaultSize(self):
self.failUnless(self.widget.size() == (50,50), self.assertEqual(self.widget.size(), (50,50),
'incorrect default size') 'incorrect default size')
def testResize(self): def testResize(self):
self.widget.resize(100,150) self.widget.resize(100,150)
self.failUnless(self.widget.size() == (100,150), self.assertEqual(self.widget.size(), (100,150),
'wrong size after resize') 'wrong size after resize')
Here we have not provided a :meth:`runTest` method, but have instead provided Here we have not provided a :meth:`runTest` method, but have instead provided