From 557b3361254f4503a34602d4ad8bd35fce33de8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 16 Jun 2019 15:09:16 +0200 Subject: [PATCH] Remove superfluous semicolon in the INFO macro Closes #1456 --- docs/release-notes.md | 4 +++- include/internal/catch_capture.hpp | 2 +- .../IntrospectiveTests/GeneratorsImpl.tests.cpp | 14 +++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index c49ddefaac..46e48047d4 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -33,8 +33,10 @@ ## 3.0.0 (in progress) ### 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 diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index ba842c3efd..e47cc46455 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -129,7 +129,7 @@ /////////////////////////////////////////////////////////////////////////////// #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 ) \ diff --git a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp index 9cbe89310f..d9cbc5acfe 100644 --- a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp @@ -181,9 +181,9 @@ TEST_CASE("Generators internals", "[generators][internals]") { const auto step = .1; auto gen = range(rangeStart, rangeEnd, step); - auto expected = rangeStart; + auto expected = rangeStart; while( (rangeEnd - expected) > step ) { - INFO( "Current expected value is " << expected ) + INFO( "Current expected value is " << expected ); REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.next()); @@ -198,9 +198,9 @@ TEST_CASE("Generators internals", "[generators][internals]") { const auto step = .3; auto gen = range(rangeStart, rangeEnd, step); - auto expected = rangeStart; + auto expected = rangeStart; while( (rangeEnd - expected) > step ) { - INFO( "Current expected value is " << expected ) + INFO( "Current expected value is " << expected ); REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.next()); @@ -214,16 +214,16 @@ TEST_CASE("Generators internals", "[generators][internals]") { const auto step = .3; auto gen = range(rangeStart, rangeEnd, step); - auto expected = rangeStart; + auto expected = rangeStart; while( (rangeEnd - expected) > step ) { - INFO( "Current expected value is " << expected ) + INFO( "Current expected value is " << expected ); REQUIRE(gen.get() == Approx(expected)); REQUIRE(gen.next()); expected += step; } REQUIRE_FALSE(gen.next()); - } + } } } SECTION("Negative manual step") {