[Python-checkins] r77977 - in python/branches/release31-maint: Doc/library/unittest.rst

ezio.melotti python-checkins at python.org
Thu Feb 4 21:29:01 CET 2010


Author: ezio.melotti
Date: Thu Feb  4 21:29:01 2010
New Revision: 77977

Log:
Merged revisions 77976 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77976 | ezio.melotti | 2010-02-04 22:27:41 +0200 (Thu, 04 Feb 2010) | 9 lines
  
  Merged revisions 77968 via svnmerge from 
  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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/unittest.rst

Modified: python/branches/release31-maint/Doc/library/unittest.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/unittest.rst	(original)
+++ python/branches/release31-maint/Doc/library/unittest.rst	Thu Feb  4 21:29:01 2010
@@ -115,12 +115,12 @@
 
        def test_choice(self):
            element = random.choice(self.seq)
-           self.assert_(element in self.seq)
+           self.assertIn(element, self.seq)
 
        def test_sample(self):
            self.assertRaises(ValueError, random.sample, self.seq, 20)
            for element in random.sample(self.seq, 5):
-               self.assert_(element in self.seq)
+               self.assertIn(element, self.seq)
 
    if __name__ == '__main__':
        unittest.main()
@@ -236,14 +236,14 @@
 
    class DefaultWidgetSizeTestCase(SimpleWidgetTestCase):
        def runTest(self):
-           self.assertTrue(self.widget.size() == (50,50),
-                           'incorrect default size')
+           self.assertEqual(self.widget.size(), (50,50),
+                            'incorrect default size')
 
    class WidgetResizeTestCase(SimpleWidgetTestCase):
        def runTest(self):
            self.widget.resize(100,150)
-           self.assertTrue(self.widget.size() == (100,150),
-                           'wrong size after resize')
+           self.assertEqual(self.widget.size(), (100,150),
+                            'wrong size after resize')
 
 If the :meth:`~TestCase.setUp` method raises an exception while the test is
 running, the framework will consider the test to have suffered an error, and the
@@ -284,13 +284,13 @@
            self.widget = None
 
        def testDefaultSize(self):
-           self.assertTrue(self.widget.size() == (50,50),
-                           'incorrect default size')
+           self.assertEqual(self.widget.size(), (50,50),
+                            'incorrect default size')
 
        def testResize(self):
            self.widget.resize(100,150)
-           self.assertTrue(self.widget.size() == (100,150),
-                           'wrong size after resize')
+           self.assertEqual(self.widget.size(), (100,150),
+                            'wrong size after resize')
 
 Here we have not provided a :meth:`~TestCase.runTest` method, but have instead
 provided two different test methods.  Class instances will now each run one of


More information about the Python-checkins mailing list