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
Removed function pointer comparison test from approvals as it has different serilaisation behaviour in MSVC
- Commit
6105282c4f74984eede1f6ab37b2340f4db19f8a- Author
- Phil Nash ·
- Parents
ca7021ae195a
Changes
projects/SelfTest/Baselines/console.std.approved.txt | 4 ++-- projects/SelfTest/Baselines/console.sw.approved.txt | 16 ++-------------- projects/SelfTest/Baselines/console.swa4.approved.txt | 16 ++-------------- projects/SelfTest/Baselines/junit.sw.approved.txt | 3 +-- projects/SelfTest/Baselines/xml.sw.approved.txt | 15 ++------------- projects/SelfTest/TrickyTests.cpp | 3 ++- 6 files changed, 11 insertions(+), 46 deletions(-) diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 042224ac..b18370b6 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -1003,6 +1003,6 @@ with expansion: "{?}" == "1" =============================================================================== -test cases: 178 | 127 passed | 47 failed | 4 failed as expected -assertions: 879 | 762 passed | 96 failed | 21 failed as expected +test cases: 177 | 126 passed | 47 failed | 4 failed as expected +assertions: 878 | 761 passed | 96 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 76a0819d..110e28d8 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -156,18 +156,6 @@ with expansion: with message: dummy := 0 -------------------------------------------------------------------------------- -#925: comparing function pointer to function address failed to compile -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... - -TrickyTests.cpp:<line number>: -PASSED: - REQUIRE( utility::synchronizing_callback != test.testMethod_uponComplete_arg ) -with expansion: - 1 != 0 - ------------------------------------------------------------------------------- #961 -- Dynamically created sections should all be reported Looped section 0 @@ -7446,6 +7434,6 @@ MiscTests.cpp:<line number>: PASSED: =============================================================================== -test cases: 178 | 125 passed | 49 failed | 4 failed as expected -assertions: 878 | 758 passed | 99 failed | 21 failed as expected +test cases: 177 | 124 passed | 49 failed | 4 failed as expected +assertions: 877 | 757 passed | 99 failed | 21 failed as expected diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt index ef9fd05f..06c24e86 100644 --- a/projects/SelfTest/Baselines/console.swa4.approved.txt +++ b/projects/SelfTest/Baselines/console.swa4.approved.txt @@ -156,18 +156,6 @@ with expansion: with message: dummy := 0 -------------------------------------------------------------------------------- -#925: comparing function pointer to function address failed to compile -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... - -TrickyTests.cpp:<line number>: -PASSED: - REQUIRE( utility::synchronizing_callback != test.testMethod_uponComplete_arg ) -with expansion: - 1 != 0 - ------------------------------------------------------------------------------- #961 -- Dynamically created sections should all be reported Looped section 0 @@ -249,6 +237,6 @@ ConditionTests.cpp:<line number>: FAILED: CHECK_FALSE( true ) =============================================================================== -test cases: 10 | 7 passed | 1 failed | 2 failed as expected -assertions: 27 | 20 passed | 4 failed | 3 failed as expected +test cases: 9 | 6 passed | 1 failed | 2 failed as expected +assertions: 26 | 19 passed | 4 failed | 3 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 88abcd9c..9c0c8204 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <testsuitesloose text artifact > - <testsuite name="<exe-name>" errors="15" failures="85" tests="879" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> + <testsuite name="<exe-name>" errors="15" failures="85" tests="878" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/> <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/> <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}"> @@ -27,7 +27,6 @@ MiscTests.cpp:<line number> </failure> </testcase> <testcase classname="<exe-name>.global" name="#872" time="{duration}"/> - <testcase classname="<exe-name>.global" name="#925: comparing function pointer to function address failed to compile" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 0" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 1" time="{duration}"/> <testcase classname="<exe-name>.global" name="#961 -- Dynamically created sections should all be reported/Looped section 2" time="{duration}"/> diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index 5e1312ca..6ab21f15 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -169,17 +169,6 @@ </Expression> <OverallResult success="true"/> </TestCase> - <TestCase name="#925: comparing function pointer to function address failed to compile" filename="projects/<exe-name>/TrickyTests.cpp" > - <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/TrickyTests.cpp" > - <Original> - utility::synchronizing_callback != test.testMethod_uponComplete_arg - </Original> - <Expanded> - 1 != 0 - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> <TestCase name="#961 -- Dynamically created sections should all be reported" tags="[.]" filename="projects/<exe-name>/MiscTests.cpp" > <Section name="Looped section 0" filename="projects/<exe-name>/MiscTests.cpp" > <OverallResults successes="1" failures="0" expectedFailures="0"/> @@ -8223,7 +8212,7 @@ loose text artifact </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="758" failures="100" expectedFailures="21"/> + <OverallResults successes="757" failures="100" expectedFailures="21"/> </Group> - <OverallResults successes="758" failures="99" expectedFailures="21"/> + <OverallResults successes="757" failures="99" expectedFailures="21"/> </Catch> diff --git a/projects/SelfTest/TrickyTests.cpp b/projects/SelfTest/TrickyTests.cpp index 312638f2..c3f8a240 100644 --- a/projects/SelfTest/TrickyTests.cpp +++ b/projects/SelfTest/TrickyTests.cpp @@ -434,7 +434,8 @@ namespace utility { inline static void synchronizing_callback( void * ) { } } -TEST_CASE("#925: comparing function pointer to function address failed to compile") { +TEST_CASE("#925: comparing function pointer to function address failed to compile", "[!nonportable]" ) { + TestClass test; REQUIRE(utility::synchronizing_callback != test.testMethod_uponComplete_arg); }