3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 11:43:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SelfTest compilation after _THROWS_ assertion change

Browse Source 
That is, changes made in efd79aa0bd
This commit is contained in:
Martin Hořeňovský 2017-07-19 22:21:25 +02:00
parent a14bd08b27
commit d7f754dc49
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/SelfTest/CompilationTests.cpp
View File

@ -41,7 +41,7 @@ bool templated_tests(T t) {
REQUIRE(a == t); REQUIRE(a == t);
CHECK(a == t); CHECK(a == t);
REQUIRE_THROWS(throws_int(true)); REQUIRE_THROWS(throws_int(true));
CHECK_THROWS_AS(throws_int(true), const int&); CHECK_THROWS_AS(throws_int(true), int);
REQUIRE_NOTHROW(throws_int(false)); REQUIRE_NOTHROW(throws_int(false));
REQUIRE_THAT("aaa", Catch::EndsWith("aaa")); REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
return true; return true;

16
projects/SelfTest/MatchersTests.cpp
View File

@ -205,21 +205,21 @@ public:
TEST_CASE( "Exception matchers that succeed", "[matchers][exceptions][!throws]" ) { TEST_CASE( "Exception matchers that succeed", "[matchers][exceptions][!throws]" ) {
CHECK_THROWS_MATCHES(throws(1), SpecialException const&, ExceptionMatcher{ 1 }); CHECK_THROWS_MATCHES(throws(1), SpecialException, ExceptionMatcher{ 1 });
REQUIRE_THROWS_MATCHES(throws(2), SpecialException const&, ExceptionMatcher{ 2 }); REQUIRE_THROWS_MATCHES(throws(2), SpecialException, ExceptionMatcher{ 2 });
} }
TEST_CASE("Exception matchers that fail", "[matchers][exceptions][!throws][.failing]") { TEST_CASE("Exception matchers that fail", "[matchers][exceptions][!throws][.failing]") {
SECTION("No exception") { SECTION("No exception") {
CHECK_THROWS_MATCHES(doesNotThrow(), SpecialException const&, ExceptionMatcher{ 1 }); CHECK_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 });
REQUIRE_THROWS_MATCHES(doesNotThrow(), SpecialException const&, ExceptionMatcher{ 1 }); REQUIRE_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 });
} }
SECTION("Type mismatch") { SECTION("Type mismatch") {
CHECK_THROWS_MATCHES(throwsAsInt(1), SpecialException const&, ExceptionMatcher{ 1 }); CHECK_THROWS_MATCHES(throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 });
REQUIRE_THROWS_MATCHES(throwsAsInt(1), SpecialException const&, ExceptionMatcher{ 1 }); REQUIRE_THROWS_MATCHES(throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 });
} }
SECTION("Contents are wrong") { SECTION("Contents are wrong") {
CHECK_THROWS_MATCHES(throws(3), SpecialException const&, ExceptionMatcher{ 1 }); CHECK_THROWS_MATCHES(throws(3), SpecialException, ExceptionMatcher{ 1 });
REQUIRE_THROWS_MATCHES(throws(4), SpecialException const&, ExceptionMatcher{ 1 }); REQUIRE_THROWS_MATCHES(throws(4), SpecialException, ExceptionMatcher{ 1 });
} }
} }