diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt index 1f4b562781..6d23d01de2 100644 --- a/tests/SelfTest/Baselines/compact.sw.approved.txt +++ b/tests/SelfTest/Baselines/compact.sw.approved.txt @@ -2020,7 +2020,6 @@ MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { true, true, false, true, true } not contains only true MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { false, false, false, false, false } not contains only true -MatchersRanges.tests.cpp:: passed: needs_adl, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: mocked, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true @@ -2055,7 +2054,6 @@ MatchersRanges.tests.cpp:: passed: data, !AnyTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, AnyTrue() for: { true, true, true, true, true } contains at least one true MatchersRanges.tests.cpp:: passed: data, AnyTrue() for: { false, false, true, false, false } contains at least one true MatchersRanges.tests.cpp:: passed: data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true -MatchersRanges.tests.cpp:: passed: needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true MatchersRanges.tests.cpp:: passed: mocked, AnyTrue() for: { false, false, false, false, true } contains at least one true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true @@ -2090,7 +2088,6 @@ MatchersRanges.tests.cpp:: passed: data, NoneTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, !NoneTrue() for: { true, true, true, true, true } not contains no true MatchersRanges.tests.cpp:: passed: data, !NoneTrue() for: { false, false, true, false, false } not contains no true MatchersRanges.tests.cpp:: passed: data, NoneTrue() for: { false, false, false, false, false } contains no true -MatchersRanges.tests.cpp:: passed: needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true MatchersRanges.tests.cpp:: passed: mocked, NoneTrue() for: { false, false, false, false, false } contains no true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt index 1f739cce28..a3500a352d 100644 --- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt @@ -2013,7 +2013,6 @@ MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { true, true, false, true, true } not contains only true MatchersRanges.tests.cpp:: passed: data, !AllTrue() for: { false, false, false, false, false } not contains only true -MatchersRanges.tests.cpp:: passed: needs_adl, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: mocked, AllTrue() for: { true, true, true, true, true } contains only true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true @@ -2048,7 +2047,6 @@ MatchersRanges.tests.cpp:: passed: data, !AnyTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, AnyTrue() for: { true, true, true, true, true } contains at least one true MatchersRanges.tests.cpp:: passed: data, AnyTrue() for: { false, false, true, false, false } contains at least one true MatchersRanges.tests.cpp:: passed: data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true -MatchersRanges.tests.cpp:: passed: needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true MatchersRanges.tests.cpp:: passed: mocked, AnyTrue() for: { false, false, false, false, true } contains at least one true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true @@ -2083,7 +2081,6 @@ MatchersRanges.tests.cpp:: passed: data, NoneTrue() for: { false, f MatchersRanges.tests.cpp:: passed: data, !NoneTrue() for: { true, true, true, true, true } not contains no true MatchersRanges.tests.cpp:: passed: data, !NoneTrue() for: { false, false, true, false, false } not contains no true MatchersRanges.tests.cpp:: passed: data, NoneTrue() for: { false, false, false, false, false } contains no true -MatchersRanges.tests.cpp:: passed: needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true MatchersRanges.tests.cpp:: passed: mocked, NoneTrue() for: { false, false, false, false, false } contains no true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[0] for: true MatchersRanges.tests.cpp:: passed: mocked.m_derefed[1] for: true diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt index bf6cdc39a7..6962e50826 100644 --- a/tests/SelfTest/Baselines/console.std.approved.txt +++ b/tests/SelfTest/Baselines/console.std.approved.txt @@ -1395,5 +1395,5 @@ due to unexpected exception with message: =============================================================================== test cases: 394 | 318 passed | 69 failed | 7 failed as expected -assertions: 2287 | 2132 passed | 128 failed | 27 failed as expected +assertions: 2284 | 2129 passed | 128 failed | 27 failed as expected diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt index 0364462761..63dd231e89 100644 --- a/tests/SelfTest/Baselines/console.sw.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.approved.txt @@ -14237,18 +14237,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } not contains only true -------------------------------------------------------------------------------- -Usage of AllTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, AllTrue() ) -with expansion: - { true, true, true, true, true } contains only true - ------------------------------------------------------------------------------- Usage of AllTrue range matcher Shortcircuiting @@ -14524,18 +14512,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } not contains at least one true -------------------------------------------------------------------------------- -Usage of AnyTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, AnyTrue() ) -with expansion: - { false, false, true, false, false } contains at least one true - ------------------------------------------------------------------------------- Usage of AnyTrue range matcher Shortcircuiting @@ -14811,18 +14787,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } contains no true -------------------------------------------------------------------------------- -Usage of NoneTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, NoneTrue() ) -with expansion: - { false, false, false, false, false } contains no true - ------------------------------------------------------------------------------- Usage of NoneTrue range matcher Shortcircuiting @@ -18487,5 +18451,5 @@ Misc.tests.cpp:: PASSED: =============================================================================== test cases: 394 | 304 passed | 83 failed | 7 failed as expected -assertions: 2302 | 2132 passed | 143 failed | 27 failed as expected +assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt index 57ab6d11c5..9cba323d9b 100644 --- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt @@ -14230,18 +14230,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } not contains only true -------------------------------------------------------------------------------- -Usage of AllTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, AllTrue() ) -with expansion: - { true, true, true, true, true } contains only true - ------------------------------------------------------------------------------- Usage of AllTrue range matcher Shortcircuiting @@ -14517,18 +14505,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } not contains at least one true -------------------------------------------------------------------------------- -Usage of AnyTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, AnyTrue() ) -with expansion: - { false, false, true, false, false } contains at least one true - ------------------------------------------------------------------------------- Usage of AnyTrue range matcher Shortcircuiting @@ -14804,18 +14780,6 @@ MatchersRanges.tests.cpp:: PASSED: with expansion: { false, false, false, false, false } contains no true -------------------------------------------------------------------------------- -Usage of NoneTrue range matcher - Type requires ADL found begin and end -------------------------------------------------------------------------------- -MatchersRanges.tests.cpp: -............................................................................... - -MatchersRanges.tests.cpp:: PASSED: - REQUIRE_THAT( needs_adl, NoneTrue() ) -with expansion: - { false, false, false, false, false } contains no true - ------------------------------------------------------------------------------- Usage of NoneTrue range matcher Shortcircuiting @@ -18479,5 +18443,5 @@ Misc.tests.cpp:: PASSED: =============================================================================== test cases: 394 | 304 passed | 83 failed | 7 failed as expected -assertions: 2302 | 2132 passed | 143 failed | 27 failed as expected +assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt index df449e346e..f7411501da 100644 --- a/tests/SelfTest/Baselines/junit.sw.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.approved.txt @@ -1,7 +1,7 @@ - + @@ -1419,7 +1419,6 @@ Exception.tests.cpp: - @@ -1433,7 +1432,6 @@ Exception.tests.cpp: - @@ -1447,7 +1445,6 @@ Exception.tests.cpp: - diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt index 62f79e6208..aa0860a3c9 100644 --- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt @@ -1,6 +1,6 @@ - + @@ -1418,7 +1418,6 @@ Exception.tests.cpp: - @@ -1432,7 +1431,6 @@ Exception.tests.cpp: - @@ -1446,7 +1444,6 @@ Exception.tests.cpp: - diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt index e8c981cfa4..a9319a6280 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt @@ -1404,7 +1404,6 @@ Matchers.tests.cpp: - @@ -1418,7 +1417,6 @@ Matchers.tests.cpp: - @@ -1432,7 +1430,6 @@ Matchers.tests.cpp: - diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt index ed29ee1e4c..97b2d98817 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt @@ -1403,7 +1403,6 @@ Matchers.tests.cpp: - @@ -1417,7 +1416,6 @@ Matchers.tests.cpp: - @@ -1431,7 +1429,6 @@ Matchers.tests.cpp: - diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt index c93a0c1df9..2c7adae54d 100644 --- a/tests/SelfTest/Baselines/tap.sw.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.approved.txt @@ -3545,8 +3545,6 @@ ok {test-number} - data, !AllTrue() for: { true, true, false, true, true } not c # Usage of AllTrue range matcher ok {test-number} - data, !AllTrue() for: { false, false, false, false, false } not contains only true # Usage of AllTrue range matcher -ok {test-number} - needs_adl, AllTrue() for: { true, true, true, true, true } contains only true -# Usage of AllTrue range matcher ok {test-number} - mocked, AllTrue() for: { true, true, true, true, true } contains only true # Usage of AllTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -3615,8 +3613,6 @@ ok {test-number} - data, AnyTrue() for: { false, false, true, false, false } con # Usage of AnyTrue range matcher ok {test-number} - data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true # Usage of AnyTrue range matcher -ok {test-number} - needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true -# Usage of AnyTrue range matcher ok {test-number} - mocked, AnyTrue() for: { false, false, false, false, true } contains at least one true # Usage of AnyTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -3685,8 +3681,6 @@ ok {test-number} - data, !NoneTrue() for: { false, false, true, false, false } n # Usage of NoneTrue range matcher ok {test-number} - data, NoneTrue() for: { false, false, false, false, false } contains no true # Usage of NoneTrue range matcher -ok {test-number} - needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true -# Usage of NoneTrue range matcher ok {test-number} - mocked, NoneTrue() for: { false, false, false, false, false } contains no true # Usage of NoneTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -4607,5 +4601,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0 ok {test-number} - # xmlentitycheck ok {test-number} - -1..2302 +1..2299 diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt index f6135a4860..d13b493c90 100644 --- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt @@ -3538,8 +3538,6 @@ ok {test-number} - data, !AllTrue() for: { true, true, false, true, true } not c # Usage of AllTrue range matcher ok {test-number} - data, !AllTrue() for: { false, false, false, false, false } not contains only true # Usage of AllTrue range matcher -ok {test-number} - needs_adl, AllTrue() for: { true, true, true, true, true } contains only true -# Usage of AllTrue range matcher ok {test-number} - mocked, AllTrue() for: { true, true, true, true, true } contains only true # Usage of AllTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -3608,8 +3606,6 @@ ok {test-number} - data, AnyTrue() for: { false, false, true, false, false } con # Usage of AnyTrue range matcher ok {test-number} - data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true # Usage of AnyTrue range matcher -ok {test-number} - needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true -# Usage of AnyTrue range matcher ok {test-number} - mocked, AnyTrue() for: { false, false, false, false, true } contains at least one true # Usage of AnyTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -3678,8 +3674,6 @@ ok {test-number} - data, !NoneTrue() for: { false, false, true, false, false } n # Usage of NoneTrue range matcher ok {test-number} - data, NoneTrue() for: { false, false, false, false, false } contains no true # Usage of NoneTrue range matcher -ok {test-number} - needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true -# Usage of NoneTrue range matcher ok {test-number} - mocked, NoneTrue() for: { false, false, false, false, false } contains no true # Usage of NoneTrue range matcher ok {test-number} - mocked.m_derefed[0] for: true @@ -4599,5 +4593,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0 ok {test-number} - # xmlentitycheck ok {test-number} - -1..2302 +1..2299 diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt index fafc9cfdff..0167e59cf2 100644 --- a/tests/SelfTest/Baselines/xml.sw.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.approved.txt @@ -16708,17 +16708,6 @@ There is no extra whitespace here -
- - - needs_adl, AllTrue() - - - { true, true, true, true, true } contains only true - - - -
@@ -17069,17 +17058,6 @@ There is no extra whitespace here
-
- - - needs_adl, AnyTrue() - - - { false, false, true, false, false } contains at least one true - - - -
@@ -17430,17 +17408,6 @@ There is no extra whitespace here
-
- - - needs_adl, NoneTrue() - - - { false, false, false, false, false } contains no true - - - -
@@ -21735,6 +21702,6 @@ loose text artifact
- + diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt index 727227418a..7a88f7de7f 100644 --- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt @@ -16708,17 +16708,6 @@ There is no extra whitespace here
-
- - - needs_adl, AllTrue() - - - { true, true, true, true, true } contains only true - - - -
@@ -17069,17 +17058,6 @@ There is no extra whitespace here
-
- - - needs_adl, AnyTrue() - - - { false, false, true, false, false } contains at least one true - - - -
@@ -17430,17 +17408,6 @@ There is no extra whitespace here
-
- - - needs_adl, NoneTrue() - - - { false, false, false, false, false } contains no true - - - -
@@ -21734,6 +21701,6 @@ There is no extra whitespace here
- + diff --git a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp index b8f80f1da1..1201581cf1 100644 --- a/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp +++ b/tests/SelfTest/UsageTests/MatchersRanges.tests.cpp @@ -610,12 +610,6 @@ TEST_CASE("Usage of AllTrue range matcher", "[matchers][templated][quantifiers]" } } - SECTION( "Type requires ADL found begin and end" ) { - unrelated::needs_ADL_begin const needs_adl{ - true, true, true, true, true }; - REQUIRE_THAT( needs_adl, AllTrue() ); - } - SECTION( "Shortcircuiting" ) { SECTION( "All are read" ) { with_mocked_iterator_access const mocked{ @@ -682,12 +676,6 @@ TEST_CASE( "Usage of NoneTrue range matcher", "[matchers][templated][quantifiers } } - SECTION( "Type requires ADL found begin and end" ) { - unrelated::needs_ADL_begin const needs_adl{ - false, false, false, false, false }; - REQUIRE_THAT( needs_adl, NoneTrue() ); - } - SECTION( "Shortcircuiting" ) { SECTION( "All are read" ) { with_mocked_iterator_access const mocked{ @@ -754,12 +742,6 @@ TEST_CASE( "Usage of AnyTrue range matcher", "[matchers][templated][quantifiers] } } - SECTION( "Type requires ADL found begin and end" ) { - unrelated::needs_ADL_begin const needs_adl{ - false, false, true, false, false }; - REQUIRE_THAT( needs_adl, AnyTrue() ); - } - SECTION( "Shortcircuiting" ) { SECTION( "All are read" ) { with_mocked_iterator_access const mocked{ @@ -784,6 +766,32 @@ TEST_CASE( "Usage of AnyTrue range matcher", "[matchers][templated][quantifiers] } } +TEST_CASE("All/Any/None True matchers support types with ADL begin", + "[approvals][matchers][quantifiers][templated]") { + using Catch::Matchers::AllTrue; + using Catch::Matchers::NoneTrue; + using Catch::Matchers::AnyTrue; + + + SECTION( "Type requires ADL found begin and end" ) { + unrelated::needs_ADL_begin const needs_adl{ + true, true, true, true, true }; + REQUIRE_THAT( needs_adl, AllTrue() ); + } + + SECTION( "Type requires ADL found begin and end" ) { + unrelated::needs_ADL_begin const needs_adl{ + false, false, false, false, false }; + REQUIRE_THAT( needs_adl, NoneTrue() ); + } + + SECTION( "Type requires ADL found begin and end" ) { + unrelated::needs_ADL_begin const needs_adl{ + false, false, true, false, false }; + REQUIRE_THAT( needs_adl, AnyTrue() ); + } +} + // Range loop iterating over range with different types for begin and end is a // C++17 feature, and GCC refuses to compile such code unless the lang mode is // set to C++17 or later.