Resolving issue CxxTest#53

Changing try/catch logic within TS_ASSERT_THROWS to properly catch std::exception without generating compiler warnings.
smikes · Mar 16, 2013 · 4a92571 · 4a92571
1 parent 6ddbbd1
commit 4a92571
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cxxtest/TestSuite.h b/cxxtest/TestSuite.h
@@ -452,8 +452,7 @@ void doAssertSameFiles(const char* file, int line,
 // TS_ASSERT_THROWS_ASSERT
 #   define ___TS_ASSERT_THROWS_ASSERT(f,l,e,t,a,m) { \
             bool _ts_threw_expected = false, _ts_threw_else = false; \
-            _TS_TRY { e; } \
-            _TS_CATCH_TYPE( (t), { a; _ts_threw_expected = true; } ) \
+            _TS_TRY { try{ e; } _TS_CATCH_TYPE( (t), { a; _ts_threw_expected = true; } ) } \
             _TS_CATCH_ABORT( { throw; } ) \
             _TS_CATCH_STD( ex, { _ts_threw_expected = true; CxxTest::doFailAssertThrows((f), (l), #e, #t, true, (m), ex.what() ); } ) \
             _TS_LAST_CATCH( { _ts_threw_else = true; } ) \

diff --git a/sample/ExceptionTest.h b/sample/ExceptionTest.h
@@ -22,6 +22,8 @@ class ExceptionTest : public CxxTest::TestSuite {
         TS_ASSERT_EQUALS(throwThis(3), 333);
         // You can assert that a function throws nothing
         TS_ASSERT_THROWS_NOTHING(throwThis(-1));
+        // This assert fails, since throwThis() throws (Number)
+        TS_ASSERT_THROWS(throwThis(3), std::exception&);
         // If you want to catch the exceptions yourself, use the ETS_ marcos
         try {
             ETS_ASSERT_EQUALS(throwThis(3), 333);

diff --git a/test/error.out b/test/error.out
@@ -14,7 +14,8 @@ ExceptionTest.h:18: Error: Expected (throwThis(5)) to throw (const char *) but i
 ExceptionTest.h:20: Error: Expected (goodFunction(1)) to throw (...) but it didn't throw
 ExceptionTest.h:22: Error: Test failed: Unhandled exception
 ExceptionTest.h:24: Error: Expected (throwThis(-1)) not to throw, but it did
-ExceptionTest.h:29: Error: Test failed: throwThis(3) failed
+ExceptionTest.h:26: Error: Expected (throwThis(3)) to throw (std::exception&) but it threw something else
+ExceptionTest.h:31: Error: Test failed: throwThis(3) failed
 In FixtureTest::test_strcpy:
 FixtureTest.h:28: Error: Expected (_buffer[1] == 'E'), found ('e' != 'E')
 In MessageTest::testValues:

diff --git a/test/paren.out b/test/paren.out
@@ -14,7 +14,8 @@ ExceptionTest.h(18): Error: Expected (throwThis(5)) to throw (const char *) but
 ExceptionTest.h(20): Error: Expected (goodFunction(1)) to throw (...) but it didn't throw
 ExceptionTest.h(22): Error: Test failed: Unhandled exception
 ExceptionTest.h(24): Error: Expected (throwThis(-1)) not to throw, but it did
-ExceptionTest.h(29): Error: Test failed: throwThis(3) failed
+ExceptionTest.h(26): Error: Expected (throwThis(3)) to throw (std::exception&) but it threw something else
+ExceptionTest.h(31): Error: Test failed: throwThis(3) failed
 In FixtureTest::test_strcpy:
 FixtureTest.h(28): Error: Expected (_buffer[1] == 'E'), found ('e' != 'E')
 In MessageTest::testValues: