Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest/CompilationTests.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2017-03-23 21:11:21 +0100
committerMartin Hořeňovský2017-03-23 21:11:21 +0100
commitf23b6b8b855b565ade37802d5c8f55012264d94f (patch)
tree8a1b512e3f840eacbdeccb6d52985ce2ec760808 /projects/SelfTest/CompilationTests.cpp
parent4597b439120e2b8c9dbd370a10fae510132ebce0 (diff)
downloadcatch3-f23b6b8b855b565ade37802d5c8f55012264d94f.tar.gz
Don't sanitize exception type in REQUIRE_THROWS_AS
Effectively a revert of previous commit, fixing #542, where this was added to stop linters complaining about `REQUIRE_THROWS_AS` used like `REQUIRE_THROWS_AS(expr, std::exception);`, which would be slicing the caught exception. Now it is user's responsibility to pass us proper exception type. Closes #833 which wanted to add `typename`, so that the construct works in a template, but that would not work with MSVC and older GCC's, as having `typename` outside of a template is allowed only from C++11 onward.
Diffstat (limited to 'projects/SelfTest/CompilationTests.cpp')
-rw-r--r--projects/SelfTest/CompilationTests.cpp25
1 files changed, 18 insertions, 7 deletions
diff --git a/projects/SelfTest/CompilationTests.cpp b/projects/SelfTest/CompilationTests.cpp
index 635c62c8..4aa969f3 100644
--- a/projects/SelfTest/CompilationTests.cpp
+++ b/projects/SelfTest/CompilationTests.cpp
@@ -23,20 +23,31 @@ TEST_CASE("#809") {
REQUIRE(42 == f);
}
+
// ------------------------------------------------------------------
-// REQUIRE_THROWS_AS was changed to catch exceptions by const&
-// using type traits. This means that this should compile cleanly
+// Changes to REQUIRE_THROWS_AS made it stop working in a template in
+// an unfixable way (as long as C++03 compatibility is being kept).
+// To prevent these from happening in the future, this needs to compile
-// Provides indirection to prevent unreachable-code warnings
void throws_int(bool b) {
if (b) {
throw 1;
}
}
-TEST_CASE("#542") {
- CHECK_THROWS_AS(throws_int(true), int);
- CHECK_THROWS_AS(throws_int(true), int&);
- CHECK_THROWS_AS(throws_int(true), const int);
+template <typename T>
+bool templated_tests(T t) {
+ int a = 3;
+ REQUIRE(a == t);
+ CHECK(a == t);
+ REQUIRE_THROWS(throws_int(true));
CHECK_THROWS_AS(throws_int(true), const int&);
+ REQUIRE_NOTHROW(throws_int(false));
+ REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
+ return true;
}
+
+TEST_CASE("#833") {
+ REQUIRE(templated_tests<int>(3));
+}
+