From a94098f9400c9b67b5d281dc90bdc51569a7a79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Herv=C3=A9?= Date: Wed, 19 Nov 2008 16:16:49 +0100 Subject: Return exception in failUnlessRaises, test it. --- test.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'test.py') diff --git a/test.py b/test.py index e98acb8..d48bc11 100755 --- a/test.py +++ b/test.py @@ -767,6 +767,40 @@ class MockerTestCaseTest(TestCase): except AssertionError: self.fail("AssertionError shouldn't be raised") + def test_fail_unless_raises_succeeds(self): + class MyException(Exception): + pass + def f(*args): + raise MyException(*args) + error = self.test.failUnlessRaises(MyException, f, 1, "foo") + self.assertEquals(error.args, (1, "foo")) + + def test_fail_unless_raises_error(self): + def f(*args): + return args + try: + self.test.failUnlessRaises(ValueError, f, 1, "foo") + except AssertionError, e: + self.assertEquals( + str(e), + "ValueError not raised ((1, 'foo') returned)") + else: + self.fail("AssertionError not raised") + + def test_fail_unless_raises_other_exception(self): + class MyException1(Exception): + pass + class MyException2(Exception): + pass + def f(*args): + raise MyException2(*args) + try: + self.test.failUnlessRaises(MyException1, f, 1, "foo") + except MyException2: + pass + else: + self.fail("MyException2 not raised") + def test_aliases(self): get_method = MockerTestCase.__dict__.get @@ -803,6 +837,9 @@ class MockerTestCaseTest(TestCase): self.assertEquals(get_method("assertMethodsMatch"), get_method("failUnlessMethodsMatch")) + self.assertEquals(get_method("assertRaises"), + get_method("failUnlessRaises")) + def test_twisted_trial_aliases(self): get_method = MockerTestCase.__dict__.get -- cgit v1.2.1