Mercurial > p > roundup > code
comparison test/test_actions.py @ 2066:71efaf27eddc
Use assertRaises...
...instead of introducing _nocheck machinery into assertRaisesMessage.
| author | Johannes Gijsbers <jlgijsbers@users.sourceforge.net> |
|---|---|
| date | Tue, 02 Mar 2004 12:23:16 +0000 |
| parents | d6bcdae0b085 |
| children | 666402433998 |
comparison
equal
deleted
inserted
replaced
| 2065:2996e168d359 | 2066:71efaf27eddc |
|---|---|
| 36 self.form = FieldStorage() | 36 self.form = FieldStorage() |
| 37 self.client = MockNull() | 37 self.client = MockNull() |
| 38 self.client.form = self.form | 38 self.client.form = self.form |
| 39 | 39 |
| 40 class ShowActionTestCase(ActionTestCase): | 40 class ShowActionTestCase(ActionTestCase): |
| 41 _nocheck = "don't compare exception values (the exception is enough)" | |
| 42 def assertRaisesMessage(self, exception, callable, message, *args, | 41 def assertRaisesMessage(self, exception, callable, message, *args, |
| 43 **kwargs): | 42 **kwargs): |
| 43 """An extension of assertRaises, which also checks the exception | |
| 44 message. We need this because we rely on exception messages when | |
| 45 redirecting. | |
| 46 """ | |
| 44 try: | 47 try: |
| 45 callable(*args, **kwargs) | 48 callable(*args, **kwargs) |
| 46 except exception, msg: | 49 except exception, msg: |
| 47 if message is self._nocheck: | |
| 48 return | |
| 49 self.assertEqual(str(msg), message) | 50 self.assertEqual(str(msg), message) |
| 50 else: | 51 else: |
| 51 if hasattr(excClass,'__name__'): | 52 if hasattr(excClass,'__name__'): |
| 52 excName = excClass.__name__ | 53 excName = excClass.__name__ |
| 53 else: | 54 else: |
| 59 | 60 |
| 60 action = ShowAction(self.client) | 61 action = ShowAction(self.client) |
| 61 self.assertRaises(ValueError, action.handle) | 62 self.assertRaises(ValueError, action.handle) |
| 62 | 63 |
| 63 self.form.value.append(MiniFieldStorage('@type', 'issue')) | 64 self.form.value.append(MiniFieldStorage('@type', 'issue')) |
| 64 self.assertRaisesMessage(SeriousError, action.handle, self._nocheck) | 65 self.assertRaises(SeriousError, action.handle) |
| 65 | 66 |
| 66 self.form.value.append(MiniFieldStorage('@number', '1')) | 67 self.form.value.append(MiniFieldStorage('@number', '1')) |
| 67 self.assertRaisesMessage(Redirect, action.handle, 'BASE/issue1') | 68 self.assertRaisesMessage(Redirect, action.handle, 'BASE/issue1') |
| 68 | 69 |
| 69 def testShowActionNoType(self): | 70 def testShowActionNoType(self): |