diff options
| author | Jozef Grajciar | 2021-05-10 21:42:47 +0200 |
|---|---|---|
| committer | GitHub | 2021-05-10 21:42:47 +0200 |
| commit | eb911aa995d806a5989cc026df7e8b69c470c4c8 (patch) | |
| tree | 44eb7fbc99a31af22c9aab72f66fd4c6b2da1f97 /tests | |
| parent | 313071e8fee34bc96c98f0fa3c4065f39ed63236 (diff) | |
| download | catch3-eb911aa995d806a5989cc026df7e8b69c470c4c8.tar.gz | |
Suppress failure of CHECKED_IF and CHECKED_ELSE (#2187)
Resolves #1390
Co-authored-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/SelfTest/Baselines/automake.sw.approved.txt | 3 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/compact.sw.approved.txt | 16 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/console.std.approved.txt | 30 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/console.sw.approved.txt | 52 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/junit.sw.approved.txt | 29 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/sonarqube.sw.approved.txt | 27 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/tap.sw.approved.txt | 26 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/teamcity.sw.approved.txt | 10 | ||||
| -rw-r--r-- | tests/SelfTest/Baselines/xml.sw.approved.txt | 67 | ||||
| -rw-r--r-- | tests/SelfTest/UsageTests/Misc.tests.cpp | 33 |
10 files changed, 236 insertions, 57 deletions
diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt index 983d9764..c4ad5b1e 100644 --- a/tests/SelfTest/Baselines/automake.sw.approved.txt +++ b/tests/SelfTest/Baselines/automake.sw.approved.txt @@ -231,6 +231,9 @@ Message from section two :test-result: PASS Test case with one argument :test-result: PASS Test enum bit values :test-result: PASS Test with special, characters "in name +:test-result: PASS Testing checked-if +:test-result: XFAIL Testing checked-if 2 +:test-result: XFAIL Testing checked-if 3 :test-result: FAIL The NO_FAIL macro reports a failure but does not fail the test :test-result: PASS The default listing implementation write to provided stream :test-result: FAIL This test 'should' fail but doesn't diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt index e757222d..92488f5f 100644 --- a/tests/SelfTest/Baselines/compact.sw.approved.txt +++ b/tests/SelfTest/Baselines/compact.sw.approved.txt @@ -1714,6 +1714,16 @@ Misc.tests.cpp:<line number>: passed: v.capacity() >= V for: 15 >= 15 VariadicMacros.tests.cpp:<line number>: passed: with 1 message: 'no assertions' Tricky.tests.cpp:<line number>: passed: 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472 CmdLine.tests.cpp:<line number>: passed: +Misc.tests.cpp:<line number>: passed: true +Misc.tests.cpp:<line number>: passed: +Misc.tests.cpp:<line number>: failed - but was ok: false +Misc.tests.cpp:<line number>: passed: true +Misc.tests.cpp:<line number>: failed - but was ok: false +Misc.tests.cpp:<line number>: passed: +Misc.tests.cpp:<line number>: passed: true +Misc.tests.cpp:<line number>: failed: explicitly +Misc.tests.cpp:<line number>: failed - but was ok: false +Misc.tests.cpp:<line number>: failed: explicitly Message.tests.cpp:<line number>: failed - but was ok: 1 == 2 Reporters.tests.cpp:<line number>: passed: listingString, Contains("[fakeTag]"s) for: "All available tags: 1 [fakeTag] @@ -1996,11 +2006,11 @@ InternalBenchmark.tests.cpp:<line number>: passed: called == 1 for: 1 == 1 Tricky.tests.cpp:<line number>: passed: obj.prop != 0 for: 0x<hex digits> != 0 Misc.tests.cpp:<line number>: passed: flag for: true Misc.tests.cpp:<line number>: passed: testCheckedElse( true ) for: true -Misc.tests.cpp:<line number>: failed: flag for: false +Misc.tests.cpp:<line number>: failed - but was ok: flag for: false Misc.tests.cpp:<line number>: failed: testCheckedElse( false ) for: false Misc.tests.cpp:<line number>: passed: flag for: true Misc.tests.cpp:<line number>: passed: testCheckedIf( true ) for: true -Misc.tests.cpp:<line number>: failed: flag for: false +Misc.tests.cpp:<line number>: failed - but was ok: flag for: false Misc.tests.cpp:<line number>: failed: testCheckedIf( false ) for: false InternalBenchmark.tests.cpp:<line number>: passed: o.samples_seen == static_cast<int>(x.size()) for: 6 == 6 InternalBenchmark.tests.cpp:<line number>: passed: o.low_severe == los for: 0 == 0 @@ -2342,5 +2352,5 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0 InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0 Misc.tests.cpp:<line number>: passed: Misc.tests.cpp:<line number>: passed: -Failed 86 test cases, failed 148 assertions. +Failed 86 test cases, failed 146 assertions. diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt index f91f4b80..d9e8f2b8 100644 --- a/tests/SelfTest/Baselines/console.std.approved.txt +++ b/tests/SelfTest/Baselines/console.std.approved.txt @@ -923,6 +923,22 @@ with expansion: " ------------------------------------------------------------------------------- +Testing checked-if 2 +------------------------------------------------------------------------------- +Misc.tests.cpp:<line number> +............................................................................... + +Misc.tests.cpp:<line number>: FAILED: + +------------------------------------------------------------------------------- +Testing checked-if 3 +------------------------------------------------------------------------------- +Misc.tests.cpp:<line number> +............................................................................... + +Misc.tests.cpp:<line number>: FAILED: + +------------------------------------------------------------------------------- Thrown string literals are translated ------------------------------------------------------------------------------- Exception.tests.cpp:<line number> @@ -1136,11 +1152,6 @@ Misc.tests.cpp:<line number> ............................................................................... Misc.tests.cpp:<line number>: FAILED: - CHECKED_ELSE( flag ) -with expansion: - false - -Misc.tests.cpp:<line number>: FAILED: REQUIRE( testCheckedElse( false ) ) with expansion: false @@ -1152,11 +1163,6 @@ Misc.tests.cpp:<line number> ............................................................................... Misc.tests.cpp:<line number>: FAILED: - CHECKED_IF( flag ) -with expansion: - false - -Misc.tests.cpp:<line number>: FAILED: REQUIRE( testCheckedIf( false ) ) with expansion: false @@ -1380,6 +1386,6 @@ due to unexpected exception with message: Why would you throw a std::string? =============================================================================== -test cases: 356 | 282 passed | 70 failed | 4 failed as expected -assertions: 2077 | 1925 passed | 131 failed | 21 failed as expected +test cases: 359 | 283 passed | 70 failed | 6 failed as expected +assertions: 2082 | 1930 passed | 129 failed | 23 failed as expected diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt index 5f77647a..7e53a539 100644 --- a/tests/SelfTest/Baselines/console.sw.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.approved.txt @@ -12299,6 +12299,50 @@ CmdLine.tests.cpp:<line number> CmdLine.tests.cpp:<line number>: PASSED: ------------------------------------------------------------------------------- +Testing checked-if +------------------------------------------------------------------------------- +Misc.tests.cpp:<line number> +............................................................................... + +Misc.tests.cpp:<line number>: PASSED: + CHECKED_IF( true ) + +Misc.tests.cpp:<line number>: PASSED: + +Misc.tests.cpp:<line number>: FAILED - but was ok: + CHECKED_IF( false ) + +Misc.tests.cpp:<line number>: PASSED: + CHECKED_ELSE( true ) + +Misc.tests.cpp:<line number>: FAILED - but was ok: + CHECKED_ELSE( false ) + +Misc.tests.cpp:<line number>: PASSED: + +------------------------------------------------------------------------------- +Testing checked-if 2 +------------------------------------------------------------------------------- +Misc.tests.cpp:<line number> +............................................................................... + +Misc.tests.cpp:<line number>: PASSED: + CHECKED_IF( true ) + +Misc.tests.cpp:<line number>: FAILED: + +------------------------------------------------------------------------------- +Testing checked-if 3 +------------------------------------------------------------------------------- +Misc.tests.cpp:<line number> +............................................................................... + +Misc.tests.cpp:<line number>: FAILED - but was ok: + CHECKED_ELSE( false ) + +Misc.tests.cpp:<line number>: FAILED: + +------------------------------------------------------------------------------- The NO_FAIL macro reports a failure but does not fail the test ------------------------------------------------------------------------------- Message.tests.cpp:<line number> @@ -14176,7 +14220,7 @@ checkedElse, failing Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: FAILED: +Misc.tests.cpp:<line number>: FAILED - but was ok: CHECKED_ELSE( flag ) with expansion: false @@ -14208,7 +14252,7 @@ checkedIf, failing Misc.tests.cpp:<line number> ............................................................................... -Misc.tests.cpp:<line number>: FAILED: +Misc.tests.cpp:<line number>: FAILED - but was ok: CHECKED_IF( flag ) with expansion: false @@ -16722,6 +16766,6 @@ Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>: PASSED: =============================================================================== -test cases: 356 | 266 passed | 86 failed | 4 failed as expected -assertions: 2094 | 1925 passed | 148 failed | 21 failed as expected +test cases: 359 | 267 passed | 86 failed | 6 failed as expected +assertions: 2099 | 1930 passed | 146 failed | 23 failed as expected diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt index 12a1456f..d90b1645 100644 --- a/tests/SelfTest/Baselines/junit.sw.approved.txt +++ b/tests/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="17" failures="132" tests="2095" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> + <testsuite name="<exe-name>" errors="17" failures="130" tests="2100" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}"> <properties> <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/> <property name="random-seed" value="1"/> @@ -1276,6 +1276,19 @@ Misc.tests.cpp:<line number> <testcase classname="<exe-name>.global" name="Test case with one argument" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Test enum bit values" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="Test with special, characters "in name" time="{duration}" status="run"/> + <testcase classname="<exe-name>.global" name="Testing checked-if" time="{duration}" status="run"/> + <testcase classname="<exe-name>.global" name="Testing checked-if 2" time="{duration}" status="run"> + <failure type="FAIL"> +FAILED: +Misc.tests.cpp:<line number> + </failure> + </testcase> + <testcase classname="<exe-name>.global" name="Testing checked-if 3" time="{duration}" status="run"> + <failure type="FAIL"> +FAILED: +Misc.tests.cpp:<line number> + </failure> + </testcase> <testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing tags" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="The default listing implementation write to provided stream/Listing reporters" time="{duration}" status="run"/> @@ -1505,13 +1518,6 @@ Exception.tests.cpp:<line number> <testcase classname="<exe-name>.global" name="boolean member" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="checkedElse" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="checkedElse, failing" time="{duration}" status="run"> - <failure message="flag" type="CHECKED_ELSE"> -FAILED: - CHECKED_ELSE( flag ) -with expansion: - false -Misc.tests.cpp:<line number> - </failure> <failure message="testCheckedElse( false )" type="REQUIRE"> FAILED: REQUIRE( testCheckedElse( false ) ) @@ -1522,13 +1528,6 @@ Misc.tests.cpp:<line number> </testcase> <testcase classname="<exe-name>.global" name="checkedIf" time="{duration}" status="run"/> <testcase classname="<exe-name>.global" name="checkedIf, failing" time="{duration}" status="run"> - <failure message="flag" type="CHECKED_IF"> -FAILED: - CHECKED_IF( flag ) -with expansion: - false -Misc.tests.cpp:<line number> - </failure> <failure message="testCheckedIf( false )" type="REQUIRE"> FAILED: REQUIRE( testCheckedIf( false ) ) diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt index 1f0cc5da..b900a55c 100644 --- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt +++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt @@ -1583,17 +1583,23 @@ Misc.tests.cpp:<line number> <testCase name="TemplateTestSig: vectors can be sized and resized - std::string,15/resizing smaller changes size but not capacity/We can use the 'swap trick' to reset the capacity" duration="{duration}"/> <testCase name="TemplateTestSig: vectors can be sized and resized - std::string,15/reserving bigger changes capacity but not size" duration="{duration}"/> <testCase name="TemplateTestSig: vectors can be sized and resized - std::string,15/reserving smaller does not change size or capacity" duration="{duration}"/> + <testCase name="Testing checked-if" duration="{duration}"/> + <testCase name="Testing checked-if 2" duration="{duration}"> + <skipped message="FAIL()"> +FAILED: +Misc.tests.cpp:<line number> + </skipped> + </testCase> + <testCase name="Testing checked-if 3" duration="{duration}"> + <skipped message="FAIL()"> +FAILED: +Misc.tests.cpp:<line number> + </skipped> + </testCase> <testCase name="This test 'should' fail but doesn't" duration="{duration}"/> <testCase name="atomic if" duration="{duration}"/> <testCase name="checkedElse" duration="{duration}"/> <testCase name="checkedElse, failing" duration="{duration}"> - <failure message="CHECKED_ELSE(flag)"> -FAILED: - CHECKED_ELSE( flag ) -with expansion: - false -Misc.tests.cpp:<line number> - </failure> <failure message="REQUIRE(testCheckedElse( false ))"> FAILED: REQUIRE( testCheckedElse( false ) ) @@ -1604,13 +1610,6 @@ Misc.tests.cpp:<line number> </testCase> <testCase name="checkedIf" duration="{duration}"/> <testCase name="checkedIf, failing" duration="{duration}"> - <failure message="CHECKED_IF(flag)"> -FAILED: - CHECKED_IF( flag ) -with expansion: - false -Misc.tests.cpp:<line number> - </failure> <failure message="REQUIRE(testCheckedIf( false ))"> FAILED: REQUIRE( testCheckedIf( false ) ) diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt index 8bb648f5..a6e63f6d 100644 --- a/tests/SelfTest/Baselines/tap.sw.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.approved.txt @@ -3073,6 +3073,26 @@ ok {test-number} - with 1 message: 'no assertions' ok {test-number} - 0x<hex digits> == bit30and31 for: 3221225472 (0x<hex digits>) == 3221225472 # Test with special, characters "in name ok {test-number} - +# Testing checked-if +ok {test-number} - true +# Testing checked-if +ok {test-number} - +# Testing checked-if +ok {test-number} - false # TODO +# Testing checked-if +ok {test-number} - true +# Testing checked-if +ok {test-number} - false # TODO +# Testing checked-if +ok {test-number} - +# Testing checked-if 2 +ok {test-number} - true +# Testing checked-if 2 +not ok {test-number} - explicitly +# Testing checked-if 3 +ok {test-number} - false # TODO +# Testing checked-if 3 +not ok {test-number} - explicitly # The NO_FAIL macro reports a failure but does not fail the test ok {test-number} - 1 == 2 # TODO # The default listing implementation write to provided stream @@ -3570,7 +3590,7 @@ ok {test-number} - flag for: true # checkedElse ok {test-number} - testCheckedElse( true ) for: true # checkedElse, failing -not ok {test-number} - flag for: false +ok {test-number} - flag for: false # TODO # checkedElse, failing not ok {test-number} - testCheckedElse( false ) for: false # checkedIf @@ -3578,7 +3598,7 @@ ok {test-number} - flag for: true # checkedIf ok {test-number} - testCheckedIf( true ) for: true # checkedIf, failing -not ok {test-number} - flag for: false +ok {test-number} - flag for: false # TODO # checkedIf, failing not ok {test-number} - testCheckedIf( false ) for: false # classify_outliers @@ -4180,5 +4200,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0 ok {test-number} - # xmlentitycheck ok {test-number} - -1..2094 +1..2099 diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt index e64c984f..2c1a8c5c 100644 --- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt +++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt @@ -563,6 +563,14 @@ Misc.tests.cpp:<line number>|nexpression failed|n CHECK( s1 == s2 )|nwith expan ##teamcity[testFinished name='Test enum bit values' duration="{duration}"] ##teamcity[testStarted name='Test with special, characters "in name'] ##teamcity[testFinished name='Test with special, characters "in name' duration="{duration}"] +##teamcity[testStarted name='Testing checked-if'] +##teamcity[testFinished name='Testing checked-if' duration="{duration}"] +##teamcity[testStarted name='Testing checked-if 2'] +Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n'] +##teamcity[testFinished name='Testing checked-if 2' duration="{duration}"] +##teamcity[testStarted name='Testing checked-if 3'] +Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n'] +##teamcity[testFinished name='Testing checked-if 3' duration="{duration}"] ##teamcity[testStarted name='The NO_FAIL macro reports a failure but does not fail the test'] ##teamcity[testFinished name='The NO_FAIL macro reports a failure but does not fail the test' duration="{duration}"] ##teamcity[testStarted name='The default listing implementation write to provided stream'] @@ -661,13 +669,11 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n "unexpe ##teamcity[testStarted name='checkedElse'] ##teamcity[testFinished name='checkedElse' duration="{duration}"] ##teamcity[testStarted name='checkedElse, failing'] -Misc.tests.cpp:<line number>|nexpression failed|n CHECKED_ELSE( flag )|nwith expansion:|n false|n'] Misc.tests.cpp:<line number>|nexpression failed|n REQUIRE( testCheckedElse( false ) )|nwith expansion:|n false|n'] ##teamcity[testFinished name='checkedElse, failing' duration="{duration}"] ##teamcity[testStarted name='checkedIf'] ##teamcity[testFinished name='checkedIf' duration="{duration}"] ##teamcity[testStarted name='checkedIf, failing'] -Misc.tests.cpp:<line number>|nexpression failed|n CHECKED_IF( flag )|nwith expansion:|n false|n'] Misc.tests.cpp:<line number>|nexpression failed|n REQUIRE( testCheckedIf( false ) )|nwith expansion:|n false|n'] ##teamcity[testFinished name='checkedIf, failing' duration="{duration}"] ##teamcity[testStarted name='classify_outliers'] diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt index a624d5bd..4aecb91e 100644 --- a/tests/SelfTest/Baselines/xml.sw.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.approved.txt @@ -14425,6 +14425,65 @@ Message from section two <TestCase name="Test with special, characters "in name" tags="[cli][regression]" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" > <OverallResult success="true"/> </TestCase> + <TestCase name="Testing checked-if" tags="[checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Expression success="true" type="CHECKED_IF" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + true + </Original> + <Expanded> + true + </Expanded> + </Expression> + <Expression success="false" type="CHECKED_IF" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + false + </Original> + <Expanded> + false + </Expanded> + </Expression> + <Expression success="true" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + true + </Original> + <Expanded> + true + </Expanded> + </Expression> + <Expression success="false" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + false + </Original> + <Expanded> + false + </Expanded> + </Expression> + <OverallResult success="true"/> + </TestCase> + <TestCase name="Testing checked-if 2" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Expression success="true" type="CHECKED_IF" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + true + </Original> + <Expanded> + true + </Expanded> + </Expression> + <Failure filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" /> + <OverallResult success="true"/> + </TestCase> + <TestCase name="Testing checked-if 3" tags="[!shouldfail][checked-if]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Expression success="false" type="CHECKED_ELSE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" > + <Original> + false + </Original> + <Expanded> + false + </Expanded> + </Expression> + <Failure filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" /> + <OverallResult success="true"/> + </TestCase> <TestCase name="The NO_FAIL macro reports a failure but does not fail the test" tags="[messages]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" > <Expression success="false" type="CHECK_NOFAIL" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" > <Original> @@ -19667,9 +19726,9 @@ loose text artifact </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="1925" failures="149" expectedFailures="21"/> - <OverallResultsCases successes="266" failures="86" expectedFailures="4"/> + <OverallResults successes="1930" failures="147" expectedFailures="23"/> + <OverallResultsCases successes="267" failures="86" expectedFailures="6"/> </Group> - <OverallResults successes="1925" failures="148" expectedFailures="21"/> - <OverallResultsCases successes="266" failures="86" expectedFailures="4"/> + <OverallResults successes="1930" failures="146" expectedFailures="23"/> + <OverallResultsCases successes="267" failures="86" expectedFailures="6"/> </Catch> diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp index 277723a8..5dfef6b1 100644 --- a/tests/SelfTest/UsageTests/Misc.tests.cpp +++ b/tests/SelfTest/UsageTests/Misc.tests.cpp @@ -182,6 +182,39 @@ TEST_CASE( "checkedElse, failing", "[failing][.]" ) { REQUIRE( testCheckedElse( false ) ); } +TEST_CASE("Testing checked-if", "[checked-if]") { + CHECKED_IF(true) { + SUCCEED(); + } + CHECKED_IF(false) { + FAIL(); + } + CHECKED_ELSE(true) { + FAIL(); + } + CHECKED_ELSE(false) { + SUCCEED(); + } +} + +TEST_CASE("Testing checked-if 2", "[checked-if][!shouldfail]") { + CHECKED_IF(true) { + FAIL(); + } + // If the checked if is not entered, this passes and the test + // fails, because of the [!shouldfail] tag. + SUCCEED(); +} + +TEST_CASE("Testing checked-if 3", "[checked-if][!shouldfail]") { + CHECKED_ELSE(false) { + FAIL(); + } + // If the checked false is not entered, this passes and the test + // fails, because of the [!shouldfail] tag. + SUCCEED(); +} + TEST_CASE( "xmlentitycheck" ) { SECTION( "embedded xml: <test>it should be possible to embed xml characters, such as <, \" or &, or even whole <xml>documents</xml> within an attribute</test>" ) { SUCCEED(); // We need this here to stop it failing due to no tests |