catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Fix forwarding in SingleValueGenerator and generator creation
- Commit
6c9a255dc2973e97b2d6a155d36f47e145382d32- Author
- Joe Burzinski ·
- Committer
- Martin Hořeňovský
- Parents
9a8963133fb7
Changes
include/internal/catch_generators.hpp | 15 +++++++------- .../IntrospectiveTests/GeneratorsImpl.tests.cpp | 23 ++++++++++++++++++---- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/include/internal/catch_generators.hpp b/include/internal/catch_generators.hpp index c9ef7799..d0fbe8bf 100644 --- a/include/internal/catch_generators.hpp +++ b/include/internal/catch_generators.hpp @@ -57,7 +57,6 @@ namespace Generators { class SingleValueGenerator final : public IGenerator<T> { T m_value; public: - SingleValueGenerator(T const& value) : m_value( value ) {} SingleValueGenerator(T&& value) : m_value(std::move(value)) {} T const& get() const override { @@ -120,21 +119,21 @@ namespace Generators { m_generators.emplace_back(std::move(generator)); } void populate(T&& val) { - m_generators.emplace_back(value(std::move(val))); + m_generators.emplace_back(value(std::forward<T>(val))); } template<typename U> void populate(U&& val) { - populate(T(std::move(val))); + populate(T(std::forward<U>(val))); } template<typename U, typename... Gs> - void populate(U&& valueOrGenerator, Gs... moreGenerators) { + void populate(U&& valueOrGenerator, Gs &&... moreGenerators) { populate(std::forward<U>(valueOrGenerator)); populate(std::forward<Gs>(moreGenerators)...); } public: template <typename... Gs> - Generators(Gs... moreGenerators) { + Generators(Gs &&... moreGenerators) { m_generators.reserve(sizeof...(Gs)); populate(std::forward<Gs>(moreGenerators)...); } @@ -166,7 +165,7 @@ namespace Generators { struct as {}; template<typename T, typename... Gs> - auto makeGenerators( GeneratorWrapper<T>&& generator, Gs... moreGenerators ) -> Generators<T> { + auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> { return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...); } template<typename T> @@ -174,11 +173,11 @@ namespace Generators { return Generators<T>(std::move(generator)); } template<typename T, typename... Gs> - auto makeGenerators( T&& val, Gs... moreGenerators ) -> Generators<T> { + auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> { return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... ); } template<typename T, typename U, typename... Gs> - auto makeGenerators( as<T>, U&& val, Gs... moreGenerators ) -> Generators<T> { + auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> { return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... ); } diff --git a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp index 9cbe8931..549f3559 100644 --- a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp @@ -181,7 +181,7 @@ 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 ) REQUIRE(gen.get() == Approx(expected)); @@ -198,7 +198,7 @@ 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 ) REQUIRE(gen.get() == Approx(expected)); @@ -214,7 +214,7 @@ 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 ) REQUIRE(gen.get() == Approx(expected)); @@ -223,7 +223,7 @@ TEST_CASE("Generators internals", "[generators][internals]") { expected += step; } REQUIRE_FALSE(gen.next()); - } + } } } SECTION("Negative manual step") { @@ -311,6 +311,21 @@ TEST_CASE("GENERATE capture macros", "[generators][internals][approvals]") { REQUIRE(value == value2); } +TEST_CASE("#1809 - GENERATE_COPY and SingleValueGenerator does not compile", "[generators][compilation][approvals]") { + // Verify Issue #1809 fix, only needs to compile. + auto a = GENERATE_COPY(1, 2); + (void)a; + auto b = GENERATE_COPY(as<long>{}, 1, 2); + (void)b; + int i = 1; + int j = 2; + auto c = GENERATE_COPY(i, j); + (void)c; + auto d = GENERATE_COPY(as<long>{}, i, j); + (void)d; + SUCCEED(); +} + TEST_CASE("Multiple random generators in one test case output different values", "[generators][internals][approvals]") { SECTION("Integer") { auto random1 = Catch::Generators::random(0, 1000);