Remove superfluous semicolon in the INFO macro

Closes #1456
This commit is contained in:
Martin Hořeňovský 2019-06-16 15:09:16 +02:00
parent 141761745a
commit 557b336125
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 11 additions and 9 deletions

View File

@ -33,8 +33,10 @@
## 3.0.0 (in progress) ## 3.0.0 (in progress)
### Breaking changes ### Breaking changes
* `ANON_TEST_CASE` has been removed, use `TEST_CASE` with no arguments instead. * `ANON_TEST_CASE` has been removed, use `TEST_CASE` with no arguments instead (#1220)
### Fixes
* The `INFO` macro no longer contains superfluous semicolon (#1456)
## 2.10.2 ## 2.10.2

View File

@ -129,7 +129,7 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_INFO( macroName, log ) \ #define INTERNAL_CATCH_INFO( macroName, log ) \
Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log ); Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \ #define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \

View File

@ -181,9 +181,9 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .1; const auto step = .1;
auto gen = range(rangeStart, rangeEnd, step); auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart; auto expected = rangeStart;
while( (rangeEnd - expected) > step ) { while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected ) INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next()); REQUIRE(gen.next());
@ -198,9 +198,9 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .3; const auto step = .3;
auto gen = range(rangeStart, rangeEnd, step); auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart; auto expected = rangeStart;
while( (rangeEnd - expected) > step ) { while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected ) INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next()); REQUIRE(gen.next());
@ -214,16 +214,16 @@ TEST_CASE("Generators internals", "[generators][internals]") {
const auto step = .3; const auto step = .3;
auto gen = range(rangeStart, rangeEnd, step); auto gen = range(rangeStart, rangeEnd, step);
auto expected = rangeStart; auto expected = rangeStart;
while( (rangeEnd - expected) > step ) { while( (rangeEnd - expected) > step ) {
INFO( "Current expected value is " << expected ) INFO( "Current expected value is " << expected );
REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.get() == Approx(expected));
REQUIRE(gen.next()); REQUIRE(gen.next());
expected += step; expected += step;
} }
REQUIRE_FALSE(gen.next()); REQUIRE_FALSE(gen.next());
} }
} }
} }
SECTION("Negative manual step") { SECTION("Negative manual step") {