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
Approved all the changes following name/ tag parser rework
- Commit
766491a7c431787fdad9fbe7fd8218e6b285db7e- Author
- Phil Nash ·
- Parents
b1e7d161b5fc
Changes
.../SelfTest/Baselines/console.std.approved.txt | 2 +- .../SelfTest/Baselines/console.sw.approved.txt | 2453 ++++++++++++-------- projects/SelfTest/Baselines/junit.sw.approved.txt | 40 +- projects/SelfTest/Baselines/xml.sw.approved.txt | 1641 ++++++++----- 4 files changed, 2482 insertions(+), 1654 deletions(-) diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 693584a1..6f8537ef 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -772,5 +772,5 @@ with expansion: "first" == "second" =============================================================================== -127 test cases - 39 failed (629 assertions - 92 failed) +123 test cases - 39 failed (677 assertions - 92 failed) diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 6e80ffbf..22d22af5 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -3604,19 +3604,13 @@ PASSED: TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters().size() == 1 ) -with expansion: - 1 == 1 - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false ) with expansion: false == false TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) ) with expansion: true @@ -3634,19 +3628,13 @@ PASSED: TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters().size() == 1 ) -with expansion: - 1 == 1 - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false ) with expansion: false == false TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) ) with expansion: true @@ -3664,55 +3652,13 @@ PASSED: TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters().size() == 1 ) -with expansion: - 1 == 1 - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false ) -with expansion: - false == false - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) ) -with expansion: - true - -------------------------------------------------------------------------------- -Process can be configured on command line - test lists - Specify two test cases using -t -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK_NOTHROW( parseIntoConfig( argv, config ) ) - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters().size() == 1 ) -with expansion: - 1 == 1 - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false ) with expansion: false == false TestMain.cpp:<line number>: PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) ) + REQUIRE( cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) ) with expansion: true @@ -3975,939 +3921,500 @@ with expansion: true == true ------------------------------------------------------------------------------- -selftest/test filter +Long strings can be wrapped + plain string + No wrapping ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) ) + CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString ) with expansion: - true + "one two three four" + == + "one two three four" TestMain.cpp:<line number>: PASSED: - CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString ) with expansion: - false == false + "one two three four" + == + "one two three four" + +------------------------------------------------------------------------------- +Long strings can be wrapped + plain string + Wrapped once +------------------------------------------------------------------------------- +TestMain.cpp:<line number> +............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" ) with expansion: - false == false + "one two three + four" + == + "one two three + four" TestMain.cpp:<line number>: PASSED: - CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) ) + CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" ) with expansion: - true + "one two three + four" + == + "one two three + four" TestMain.cpp:<line number>: PASSED: - CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) ) + CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" ) with expansion: - true + "one two three + four" + == + "one two three + four" TestMain.cpp:<line number>: PASSED: - CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" ) with expansion: - false == false + "one two three + four" + == + "one two three + four" + +TestMain.cpp:<line number>: +PASSED: + CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" ) +with expansion: + "one two + three four" + == + "one two + three four" ------------------------------------------------------------------------------- -selftest/test filters +Long strings can be wrapped + plain string + Wrapped twice ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" ) with expansion: - false == false + "one two + three + four" + == + "one two + three + four" TestMain.cpp:<line number>: PASSED: - CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) ) + CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" ) with expansion: - true + "one two + three + four" + == + "one two + three + four" TestMain.cpp:<line number>: PASSED: - CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" ) with expansion: - false == false + "one two + three + four" + == + "one two + three + four" ------------------------------------------------------------------------------- -selftest/filter/prefix wildcard +Long strings can be wrapped + plain string + Wrapped three times ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) ) + CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" ) with expansion: - true + "one + two + three + four" + == + "one + two + three + four" TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" ) with expansion: - false == false + "one + two + three + four" + == + "one + two + three + four" ------------------------------------------------------------------------------- -selftest/filter/wildcard at both ends +Long strings can be wrapped + plain string + Short wrap ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) ) + CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" ) with expansion: - true + "abc- + def" + == + "abc- + def" TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) ) + CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" ) with expansion: - true + "abc- + defg" + == + "abc- + defg" TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) ) + CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" ) with expansion: - true + "abc- + def- + gh" + == + "abc- + def- + gh" + +TestMain.cpp:<line number>: +PASSED: + CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" ) +with expansion: + "one + two + thr- + ee + four" + == + "one + two + thr- + ee + four" TestMain.cpp:<line number>: PASSED: - CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" ) with expansion: - false == false + "one + two + th- + ree + fo- + ur" + == + "one + two + th- + ree + fo- + ur" ------------------------------------------------------------------------------- -selftest/tags - single [one] tag +Long strings can be wrapped + plain string + As container ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.getTestCaseInfo().description == "" ) -with expansion: - "" == "" - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.hasTag( "one" ) ) + REQUIRE( text.size() == 4 ) with expansion: - true + 4 == 4 TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.getTags().size() == 1 ) + CHECK( text[0] == "one" ) with expansion: - 1 == 1 + "one" == "one" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p1 ) == true ) + CHECK( text[1] == "two" ) with expansion: - true == true + "two" == "two" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p2 ) == true ) + CHECK( text[2] == "three" ) with expansion: - true == true + "three" == "three" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p3 ) == false ) + CHECK( text[3] == "four" ) with expansion: - false == false + "four" == "four" -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.matchesTags( p4 ) == false ) -with expansion: - false == false +------------------------------------------------------------------------------- +Long strings can be wrapped + plain string + Indent first line differently +------------------------------------------------------------------------------- +TestMain.cpp:<line number> +............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p5 ) == false ) + CHECK( text.toString() == " one two\n three\n four" ) with expansion: - false == false + " one two + three + four" + == + " one two + three + four" ------------------------------------------------------------------------------- -selftest/tags - single [two] tag +Long strings can be wrapped + With newlines + No wrapping ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.getTestCaseInfo().description == "" ) -with expansion: - "" == "" - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.hasTag( "two" ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.getTags().size() == 1 ) -with expansion: - 1 == 1 - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.matchesTags( p1 ) == false ) -with expansion: - false == false - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.matchesTags( p2 ) == true ) -with expansion: - true == true - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.matchesTags( p3 ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString ) with expansion: - false == false + "one two + three four" + == + "one two + three four" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p4 ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString ) with expansion: - false == false + "one two + three four" + == + "one two + three four" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( p5 ) == false ) + CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString ) with expansion: - false == false + "one two + three four" + == + "one two + three four" ------------------------------------------------------------------------------- -selftest/tags - two tags +Long strings can be wrapped + With newlines + Trailing newline ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( twoTags.getTestCaseInfo().description == "" ) -with expansion: - "" == "" - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.hasTag( "one" ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.hasTag( "two" ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.hasTag( "Two" ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.hasTag( "three" ) == false ) -with expansion: - false == false - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.getTags().size() == 2 ) -with expansion: - 2 == 2 - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.matchesTags( p1 ) == true ) -with expansion: - true == true - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.matchesTags( p2 ) == true ) -with expansion: - true == true - -TestMain.cpp:<line number>: -PASSED: - CHECK( twoTags.matchesTags( p3 ) == true ) + CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" ) with expansion: - true == true + "abcdef + " + == + "abcdef + " TestMain.cpp:<line number>: PASSED: - CHECK( twoTags.matchesTags( p4 ) == true ) + CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" ) with expansion: - true == true + "abcdef" == "abcdef" TestMain.cpp:<line number>: PASSED: - CHECK( twoTags.matchesTags( p5 ) == true ) + CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" ) with expansion: - true == true + "abcdef + " + == + "abcdef + " ------------------------------------------------------------------------------- -selftest/tags - complex +Long strings can be wrapped + With newlines + Wrapped once ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( fakeTestCase( "test", "[one][.]" ).matchesTags( p1 ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK_FALSE( fakeTestCase( "test", "[one][.]" ).matchesTags( p5 ) ) -with expansion: - !false - -TestMain.cpp:<line number>: -PASSED: - CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p4 ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p5 ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( fakeTestCase( "test", "[three]" ).matchesTags( "[three]~[one]" ) ) + CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" ) with expansion: - true + "one two + three + four" + == + "one two + three + four" TestMain.cpp:<line number>: PASSED: - CHECK( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]" ) ) + CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" ) with expansion: - true + "one two + three + four" + == + "one two + three + four" TestMain.cpp:<line number>: PASSED: - CHECK_FALSE( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]~[not_apple]" ) ) + CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" ) with expansion: - !false + "one two + three + four" + == + "one two + three + four" ------------------------------------------------------------------------------- -selftest/tags - one tag with characters either side +Long strings can be wrapped + With newlines + Wrapped twice ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" ) -with expansion: - "1234" == "1234" - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTagWithExtras.hasTag( "one" ) ) + CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" ) with expansion: - true + "one + two + three + four" + == + "one + two + three + four" -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTagWithExtras.hasTag( "two" ) == false ) -with expansion: - false == false +------------------------------------------------------------------------------- +Long strings can be wrapped + With tabs +------------------------------------------------------------------------------- +TestMain.cpp:<line number> +............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTagWithExtras.getTags().size() == 1 ) + CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n four\n five\n six" ) with expansion: - 1 == 1 + "one two three + four + five + six" + == + "one two three + four + five + six" +hello +hello ------------------------------------------------------------------------------- -selftest/tags - start of a tag, but not closed +Strings can be rendered with colour ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTagOpen.getTestCaseInfo().description == "[one" ) -with expansion: - "[one" == "[one" - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTagOpen.hasTag( "one" ) == false ) -with expansion: - false == false -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTagOpen.getTags().size() == 0 ) -with expansion: - 0 == 0 +No assertions in test case 'Strings can be rendered with colour' ------------------------------------------------------------------------------- -selftest/tags - hidden +Text can be formatted using the Text class ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.getTestCaseInfo().description == "" ) -with expansion: - "" == "" - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.hasTag( "." ) ) -with expansion: - true - -TestMain.cpp:<line number>: -PASSED: - CHECK( oneTag.isHidden() ) + CHECK( Text( "hi there" ).toString() == "hi there" ) with expansion: - true + "hi there" == "hi there" TestMain.cpp:<line number>: PASSED: - CHECK( oneTag.matchesTags( "~[.]" ) == false ) + CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" ) with expansion: - false == false + "hi + there" + == + "hi + there" ------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - No wrapping +Long text is truncted ------------------------------------------------------------------------------- TestMain.cpp:<line number> ............................................................................... TestMain.cpp:<line number>: PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString ) -with expansion: - "one two three four" - == - "one two three four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString ) -with expansion: - "one two three four" - == - "one two three four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - Wrapped once -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" ) -with expansion: - "one two three - four" - == - "one two three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" ) -with expansion: - "one two three - four" - == - "one two three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" ) -with expansion: - "one two three - four" - == - "one two three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" ) -with expansion: - "one two three - four" - == - "one two three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" ) -with expansion: - "one two - three four" - == - "one two - three four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - Wrapped twice -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - Wrapped three times -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" ) -with expansion: - "one - two - three - four" - == - "one - two - three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" ) -with expansion: - "one - two - three - four" - == - "one - two - three - four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - Short wrap -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" ) -with expansion: - "abc- - def" - == - "abc- - def" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" ) -with expansion: - "abc- - defg" - == - "abc- - defg" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" ) -with expansion: - "abc- - def- - gh" - == - "abc- - def- - gh" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" ) -with expansion: - "one - two - thr- - ee - four" - == - "one - two - thr- - ee - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" ) -with expansion: - "one - two - th- - ree - fo- - ur" - == - "one - two - th- - ree - fo- - ur" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - As container -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - REQUIRE( text.size() == 4 ) -with expansion: - 4 == 4 - -TestMain.cpp:<line number>: -PASSED: - CHECK( text[0] == "one" ) -with expansion: - "one" == "one" - -TestMain.cpp:<line number>: -PASSED: - CHECK( text[1] == "two" ) -with expansion: - "two" == "two" - -TestMain.cpp:<line number>: -PASSED: - CHECK( text[2] == "three" ) -with expansion: - "three" == "three" - -TestMain.cpp:<line number>: -PASSED: - CHECK( text[3] == "four" ) -with expansion: - "four" == "four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - plain string - Indent first line differently -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( text.toString() == " one two\n three\n four" ) -with expansion: - " one two - three - four" - == - " one two - three - four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - With newlines - No wrapping -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString ) -with expansion: - "one two - three four" - == - "one two - three four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString ) -with expansion: - "one two - three four" - == - "one two - three four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString ) -with expansion: - "one two - three four" - == - "one two - three four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - With newlines - Trailing newline -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" ) -with expansion: - "abcdef - " - == - "abcdef - " - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" ) -with expansion: - "abcdef" == "abcdef" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" ) -with expansion: - "abcdef - " - == - "abcdef - " - -------------------------------------------------------------------------------- -Long strings can be wrapped - With newlines - Wrapped once -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" ) -with expansion: - "one two - three - four" - == - "one two - three - four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - With newlines - Wrapped twice -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" ) -with expansion: - "one - two - three - four" - == - "one - two - three - four" - -------------------------------------------------------------------------------- -Long strings can be wrapped - With tabs -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n four\n five\n six" ) -with expansion: - "one two three - four - five - six" - == - "one two three - four - five - six" - -hello -hello -------------------------------------------------------------------------------- -Strings can be rendered with colour -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - - -No assertions in test case 'Strings can be rendered with colour' - -------------------------------------------------------------------------------- -Text can be formatted using the Text class -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "hi there" ).toString() == "hi there" ) -with expansion: - "hi there" == "hi there" - -TestMain.cpp:<line number>: -PASSED: - CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" ) -with expansion: - "hi - there" - == - "hi - there" - -------------------------------------------------------------------------------- -Long text is truncted -------------------------------------------------------------------------------- -TestMain.cpp:<line number> -............................................................................... - -TestMain.cpp:<line number>: -PASSED: - CHECK_THAT( t.toString() EndsWith( "... message truncated due to excessive size" ) ) + CHECK_THAT( t.toString() EndsWith( "... message truncated due to excessive size" ) ) with expansion: "***************************************************************************- ***- @@ -5912,426 +5419,1310 @@ with expansion: ... message truncated due to excessive size ------------------------------------------------------------------------------- -Parsing a std::pair +Parsing a std::pair +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair ) +with expansion: + std::pair( 1, 2 ) == std::pair( 1, 2 ) + +------------------------------------------------------------------------------- +Where the is more to the expression after the RHS[failing] +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +warning: + Uncomment the code in this test to check that it gives a sensible compiler + error + + +No assertions in test case 'Where the is more to the expression after the RHS[failing]' + +------------------------------------------------------------------------------- +Where the LHS is not a simple value[failing] +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +warning: + Uncomment the code in this test to check that it gives a sensible compiler + error + + +No assertions in test case 'Where the LHS is not a simple value[failing]' + +------------------------------------------------------------------------------- +A failing expression with a non streamable type is still captured[failing] +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: FAILED: + CHECK( &o1 == &o2 ) +with expansion: + 0x<hex digits> == 0x<hex digits> + +TrickyTests.cpp:<line number>: FAILED: + CHECK( o1 == o2 ) +with expansion: + {?} == {?} + +------------------------------------------------------------------------------- +string literals of different sizes can be compared[failing] +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: FAILED: + REQUIRE( std::string( "first" ) == "second" ) +with expansion: + "first" == "second" + +------------------------------------------------------------------------------- +An expression with side-effects should only be evaluated once +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( i++ == 7 ) +with expansion: + 7 == 7 + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( i++ == 8 ) +with expansion: + 8 == 8 + +------------------------------------------------------------------------------- +Operators at different namespace levels not hijacked by Koenig lookup +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( 0x<hex digits> == o ) +with expansion: + 0x<hex digits> == {?} + +------------------------------------------------------------------------------- +Demonstrate that a non-const == is not used +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( t == 1u ) +with expansion: + {?} == 1 + +------------------------------------------------------------------------------- +Test enum bit values +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( 0x<hex digits> == bit30and31 ) +with expansion: + 0x<hex digits> == 3221225472 + +------------------------------------------------------------------------------- +boolean member +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( obj.prop != __null ) +with expansion: + 0x<hex digits> != 0 + +------------------------------------------------------------------------------- +(unimplemented) static bools can be evaluated + compare to true +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( is_true<true>::value == true ) +with expansion: + true == true + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( true == is_true<true>::value ) +with expansion: + true == true + +------------------------------------------------------------------------------- +(unimplemented) static bools can be evaluated + compare to false +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( is_true<false>::value == false ) +with expansion: + false == false + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( false == is_true<false>::value ) +with expansion: + false == false + +------------------------------------------------------------------------------- +(unimplemented) static bools can be evaluated + negation +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( !is_true<false>::value ) +with expansion: + true + +------------------------------------------------------------------------------- +(unimplemented) static bools can be evaluated + double negation +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( !!is_true<true>::value ) +with expansion: + true + +------------------------------------------------------------------------------- +(unimplemented) static bools can be evaluated + direct +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( is_true<true>::value ) +with expansion: + true + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE_FALSE( is_true<false>::value ) +with expansion: + !false + +------------------------------------------------------------------------------- +Objects that evaluated in boolean contexts can be checked +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + CHECK( True ) +with expansion: + true + +TrickyTests.cpp:<line number>: +PASSED: + CHECK( !False ) +with expansion: + true + +TrickyTests.cpp:<line number>: +PASSED: + CHECK_FALSE( False ) +with expansion: + !false + +------------------------------------------------------------------------------- +Assertions then sections +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +Assertions then sections + A section +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +Assertions then sections + A section + Another section +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +Assertions then sections +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +Assertions then sections + A section +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +Assertions then sections + A section + Another other section +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( Catch::isTrue( true ) ) +with expansion: + true + +------------------------------------------------------------------------------- +non streamable - with conv. op +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( s == "7" ) +with expansion: + "7" == "7" + +------------------------------------------------------------------------------- +Comparing function pointers +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( a ) +with expansion: + true + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( a == &foo ) +with expansion: + 0x<hex digits> == 0x<hex digits> + +------------------------------------------------------------------------------- +Comparing member function pointers +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + CHECK( m == &S::f ) +with expansion: + 0x<hex digits> + == + 0x<hex digits> + +------------------------------------------------------------------------------- +pointer to class +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( p == 0 ) +with expansion: + __null == 0 + +------------------------------------------------------------------------------- +null_ptr +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + REQUIRE( ptr.get() == nullptr ) +with expansion: + __null == nullptr + +------------------------------------------------------------------------------- +X/level/0/a +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + +------------------------------------------------------------------------------- +X/level/0/b +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + +------------------------------------------------------------------------------- +X/level/1/a +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + +------------------------------------------------------------------------------- +X/level/1/b +------------------------------------------------------------------------------- +TrickyTests.cpp:<line number> +............................................................................... + +TrickyTests.cpp:<line number>: +PASSED: + +------------------------------------------------------------------------------- +Parse test names and tags + Empty test spec should have no filters +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + Test spec from empty string should have no filters +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches(tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + Test spec from just a comma should have no filters +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + Test spec from name should have one filter +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +------------------------------------------------------------------------------- +Parse test names and tags + Test spec from quoted name should have one filter +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +------------------------------------------------------------------------------- +Parse test names and tags + Test spec from name should have one filter +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + Wildcard at the start +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( parseTestSpec( "*a" ).matches( tcA ) == true ) +with expansion: + true == true + +------------------------------------------------------------------------------- +Parse test names and tags + Wildcard at the end ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair ) + CHECK( spec.hasFilters() == true ) with expansion: - std::pair( 1, 2 ) == std::pair( 1, 2 ) + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( parseTestSpec( "a*" ).matches( tcA ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- -Where the is more to the expression after the RHS[failing] +Parse test names and tags + Wildcard at both ends ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: -warning: - Uncomment the code in this test to check that it gives a sensible compiler - error +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false -No assertions in test case 'Where the is more to the expression after the RHS[failing]' +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- -Where the LHS is not a simple value[failing] +Parse test names and tags + Just wildcard ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: -warning: - Uncomment the code in this test to check that it gives a sensible compiler - error +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == true ) +with expansion: + true == true +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true -No assertions in test case 'Where the LHS is not a simple value[failing]' +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- -A failing expression with a non streamable type is still captured[failing] +Parse test names and tags + Single tag ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: FAILED: - CHECK( &o1 == &o2 ) +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) with expansion: - 0x<hex digits> == 0x<hex digits> + true == true -TrickyTests.cpp:<line number>: FAILED: - CHECK( o1 == o2 ) +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) with expansion: - {?} == {?} + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false ------------------------------------------------------------------------------- -string literals of different sizes can be compared[failing] +Parse test names and tags + Single tag, two matches ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: FAILED: - REQUIRE( std::string( "first" ) == "second" ) +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) with expansion: - "first" == "second" + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- -An expression with side-effects should only be evaluated once +Parse test names and tags + Two tags ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( i++ == 7 ) + CHECK( spec.hasFilters() == true ) with expansion: - 7 == 7 + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( i++ == 8 ) + CHECK( spec.matches( tcA ) == false ) with expansion: - 8 == 8 + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- -Operators at different namespace levels not hijacked by Koenig lookup +Parse test names and tags + Wildcarded name and tag ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + Single tag exclusion +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true + +------------------------------------------------------------------------------- +Parse test names and tags + One tag exclusion and one tag inclusion +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false + +------------------------------------------------------------------------------- +Parse test names and tags + One tag exclusion and one wldcarded name inclusion +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcD ) == true ) +with expansion: + true == true + +------------------------------------------------------------------------------- +Parse test names and tags + One tag exclusion, using exclude:, and one wldcarded name inclusion +------------------------------------------------------------------------------- +CmdLineTests.cpp:<line number> +............................................................................... + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false + +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( 0x<hex digits> == o ) + CHECK( spec.matches( tcD ) == true ) with expansion: - 0x<hex digits> == {?} + true == true ------------------------------------------------------------------------------- -Demonstrate that a non-const == is not used +Parse test names and tags + name exclusion ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( t == 1u ) + CHECK( spec.hasFilters() == true ) with expansion: - {?} == 1 + true == true -------------------------------------------------------------------------------- -Test enum bit values -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == true ) +with expansion: + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( 0x<hex digits> == bit30and31 ) + CHECK( spec.matches( tcB ) == false ) with expansion: - 0x<hex digits> == 3221225472 + false == false -------------------------------------------------------------------------------- -boolean member -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( obj.prop != __null ) + CHECK( spec.matches( tcD ) == true ) with expansion: - 0x<hex digits> != 0 + true == true ------------------------------------------------------------------------------- -(unimplemented) static bools can be evaluated - compare to true +Parse test names and tags + wildcarded name exclusion ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( is_true<true>::value == true ) + CHECK( spec.hasFilters() == true ) with expansion: true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( true == is_true<true>::value ) + CHECK( spec.matches( tcA ) == true ) with expansion: true == true -------------------------------------------------------------------------------- -(unimplemented) static bools can be evaluated - compare to false -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( is_true<false>::value == false ) + CHECK( spec.matches( tcC ) == false ) with expansion: false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( false == is_true<false>::value ) + CHECK( spec.matches( tcD ) == false ) with expansion: false == false ------------------------------------------------------------------------------- -(unimplemented) static bools can be evaluated - negation +Parse test names and tags + wildcarded name exclusion with tag inclusion ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( !is_true<false>::value ) + CHECK( spec.hasFilters() == true ) with expansion: - true - -------------------------------------------------------------------------------- -(unimplemented) static bools can be evaluated - double negation -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( !!is_true<true>::value ) + CHECK( spec.matches( tcA ) == true ) with expansion: - true + true == true -------------------------------------------------------------------------------- -(unimplemented) static bools can be evaluated - direct -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcB ) == true ) +with expansion: + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( is_true<true>::value ) + CHECK( spec.matches( tcC ) == true ) with expansion: - true + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE_FALSE( is_true<false>::value ) + CHECK( spec.matches( tcD ) == false ) with expansion: - !false + false == false ------------------------------------------------------------------------------- -Objects that evaluated in boolean contexts can be checked +Parse test names and tags + wildcarded name exclusion, using exclude:, with tag inclusion ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - CHECK( True ) + CHECK( spec.hasFilters() == true ) with expansion: - true + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - CHECK( !False ) + CHECK( spec.matches( tcA ) == true ) with expansion: - true + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - CHECK_FALSE( False ) + CHECK( spec.matches( tcB ) == true ) with expansion: - !false - -------------------------------------------------------------------------------- -Assertions then sections -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.matches( tcC ) == true ) with expansion: - true - -------------------------------------------------------------------------------- -Assertions then sections - A section -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.matches( tcD ) == false ) with expansion: - true + false == false ------------------------------------------------------------------------------- -Assertions then sections - A section - Another section +Parse test names and tags + two wildcarded names ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.hasFilters() == true ) with expansion: - true - -------------------------------------------------------------------------------- -Assertions then sections -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.matches( tcA ) == false ) with expansion: - true - -------------------------------------------------------------------------------- -Assertions then sections - A section -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.matches( tcB ) == false ) with expansion: - true + false == false -------------------------------------------------------------------------------- -Assertions then sections - A section - Another other section -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == true ) +with expansion: + true == true -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( Catch::isTrue( true ) ) + CHECK( spec.matches( tcD ) == false ) with expansion: - true + false == false ------------------------------------------------------------------------------- -non streamable - with conv. op +Parse test names and tags + empty tag ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( s == "7" ) + CHECK( spec.hasFilters() == false ) with expansion: - "7" == "7" - -------------------------------------------------------------------------------- -Comparing function pointers -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( a ) + CHECK( spec.matches( tcA ) == false ) with expansion: - true + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( a == &foo ) + CHECK( spec.matches( tcB ) == false ) with expansion: - 0x<hex digits> == 0x<hex digits> + false == false -------------------------------------------------------------------------------- -Comparing member function pointers -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - CHECK( m == &S::f ) + CHECK( spec.matches( tcD ) == false ) with expansion: - 0x<hex digits> - == - 0x<hex digits> + false == false ------------------------------------------------------------------------------- -pointer to class +Parse test names and tags + empty quoted name ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( p == 0 ) + CHECK( spec.hasFilters() == false ) with expansion: - __null == 0 + false == false -------------------------------------------------------------------------------- -null_ptr -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: - REQUIRE( ptr.get() == nullptr ) + CHECK( spec.matches( tcB ) == false ) with expansion: - __null == nullptr + false == false -------------------------------------------------------------------------------- -X/level/0/a -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: + CHECK( spec.matches( tcD ) == false ) +with expansion: + false == false ------------------------------------------------------------------------------- -X/level/0/b +Parse test names and tags + quoted string followed by tag exclusion ------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> +CmdLineTests.cpp:<line number> ............................................................................... -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: + CHECK( spec.hasFilters() == true ) +with expansion: + true == true -------------------------------------------------------------------------------- -X/level/1/a -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcA ) == false ) +with expansion: + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: + CHECK( spec.matches( tcB ) == false ) +with expansion: + false == false -------------------------------------------------------------------------------- -X/level/1/b -------------------------------------------------------------------------------- -TrickyTests.cpp:<line number> -............................................................................... +CmdLineTests.cpp:<line number>: +PASSED: + CHECK( spec.matches( tcC ) == false ) +with expansion: + false == false -TrickyTests.cpp:<line number>: +CmdLineTests.cpp:<line number>: PASSED: + CHECK( spec.matches( tcD ) == true ) +with expansion: + true == true ------------------------------------------------------------------------------- Anonymous test case 1 @@ -6680,5 +7071,5 @@ with expansion: true =============================================================================== -127 test cases - 54 failed (648 assertions - 111 failed) +123 test cases - 54 failed (696 assertions - 111 failed) diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 5e7969b8..40ecb7ce 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,5 +1,5 @@ <testsuites> - <testsuite name="~_" errors="12" failures="99" tests="648" hostname="tbd" time="{duration}" timestamp="tbd"> + <testsuite errors="12" failures="99" tests="696" hostname="tbd" time="{duration}" timestamp="tbd"> <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/> <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/> <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/> @@ -450,7 +450,6 @@ MiscTests.cpp:<line number> <testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/> <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/> <testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using ~" time="{duration}"/> - <testcase classname="Process can be configured on command line" name="test lists/Specify two test cases using -t" time="{duration}"/> <testcase classname="Process can be configured on command line" name="reporter/-r/console" time="{duration}"/> <testcase classname="Process can be configured on command line" name="reporter/-r/xml" time="{duration}"/> <testcase classname="Process can be configured on command line" name="reporter/--reporter/junit" time="{duration}"/> @@ -465,17 +464,6 @@ MiscTests.cpp:<line number> <testcase classname="Process can be configured on command line" name="output filename/-o filename" time="{duration}"/> <testcase classname="Process can be configured on command line" name="output filename/--out" time="{duration}"/> <testcase classname="Process can be configured on command line" name="combinations/Single character flags can be combined" time="{duration}"/> - <testcase classname="global" name="selftest/test filter" time="{duration}"/> - <testcase classname="global" name="selftest/test filters" time="{duration}"/> - <testcase classname="global" name="selftest/filter/prefix wildcard" time="{duration}"/> - <testcase classname="global" name="selftest/filter/wildcard at both ends" time="{duration}"/> - <testcase classname="selftest/tags" name="single [one] tag" time="{duration}"/> - <testcase classname="selftest/tags" name="single [two] tag" time="{duration}"/> - <testcase classname="selftest/tags" name="two tags" time="{duration}"/> - <testcase classname="selftest/tags" name="complex" time="{duration}"/> - <testcase classname="selftest/tags" name="one tag with characters either side" time="{duration}"/> - <testcase classname="selftest/tags" name="start of a tag, but not closed" time="{duration}"/> - <testcase classname="selftest/tags" name="hidden" time="{duration}"/> <testcase classname="Long strings can be wrapped" name="plain string/No wrapping" time="{duration}"/> <testcase classname="Long strings can be wrapped" name="plain string/Wrapped once" time="{duration}"/> <testcase classname="Long strings can be wrapped" name="plain string/Wrapped twice" time="{duration}"/> @@ -536,6 +524,32 @@ TrickyTests.cpp:<line number> <testcase classname="global" name="X/level/0/b" time="{duration}"/> <testcase classname="global" name="X/level/1/a" time="{duration}"/> <testcase classname="global" name="X/level/1/b" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Empty test spec should have no filters" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Test spec from empty string should have no filters" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Test spec from just a comma should have no filters" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Test spec from quoted name should have one filter" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Test spec from name should have one filter" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Wildcard at the start" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Wildcard at the end" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Wildcard at both ends" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Just wildcard" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Single tag" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Single tag, two matches" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Two tags" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Wildcarded name and tag" time="{duration}"/> + <testcase classname="Parse test names and tags" name="Single tag exclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="One tag exclusion and one tag inclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="One tag exclusion and one wldcarded name inclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="One tag exclusion, using exclude:, and one wldcarded name inclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="name exclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="wildcarded name exclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="wildcarded name exclusion with tag inclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="wildcarded name exclusion, using exclude:, with tag inclusion" time="{duration}"/> + <testcase classname="Parse test names and tags" name="two wildcarded names" time="{duration}"/> + <testcase classname="Parse test names and tags" name="empty tag" time="{duration}"/> + <testcase classname="Parse test names and tags" name="empty quoted name" time="{duration}"/> + <testcase classname="Parse test names and tags" name="quoted string followed by tag exclusion" time="{duration}"/> <testcase classname="global" name="Anonymous test case 1" time="{duration}"/> <testcase classname="global" name="Test case with one argument" time="{duration}"/> <testcase classname="Variadic macros" name="Section with one argument" time="{duration}"/> diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index b80c7094..1d6579d8 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -1,5 +1,5 @@ <Catch name="CatchSelfTest"> - <Group name="~_"> + <Group> <TestCase name="Some simple comparisons between doubles"> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp" > <Original> @@ -3687,15 +3687,7 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false + cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false </Original> <Expanded> false == false @@ -3703,15 +3695,15 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) + cfg.testSpec().matches( fakeTestCase( "test1" ) ) </Original> <Expanded> true </Expanded> </Expression> - <OverallResults successes="4" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> - <OverallResults successes="4" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> <Section name="test lists"> <Section name="Specify one test case exclusion using exclude:"> @@ -3725,15 +3717,7 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false + cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false </Original> <Expanded> false == false @@ -3741,15 +3725,15 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) + cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) </Original> <Expanded> true </Expanded> </Expression> - <OverallResults successes="4" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> - <OverallResults successes="4" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> <Section name="test lists"> <Section name="Specify one test case exclusion using ~"> @@ -3763,53 +3747,7 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <OverallResults successes="4" failures="0"/> - </Section> - <OverallResults successes="4" failures="0"/> - </Section> - <Section name="test lists"> - <Section name="Specify two test cases using -t"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - parseIntoConfig( argv, config ) - </Original> - <Expanded> - parseIntoConfig( argv, config ) - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false + cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false </Original> <Expanded> false == false @@ -3817,23 +3755,15 @@ </Expression> <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) + cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) </Original> <Expanded> true </Expanded> </Expression> - <OverallResults successes="5" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> - <OverallResults successes="5" failures="0"/> + <OverallResults successes="3" failures="0"/> </Section> <Section name="reporter"> <Section name="-r/console"> @@ -4147,530 +4077,6 @@ </Section> <OverallResult success="true"/> </TestCase> - <TestCase name="selftest/test filter"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchAny.shouldInclude( fakeTestCase( "any" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchNone.shouldInclude( fakeTestCase( "any" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchHidden.shouldInclude( fakeTestCase( "./any" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> - <TestCase name="selftest/test filters"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchHidden.shouldInclude( fakeTestCase( "./something" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - filters.shouldInclude( fakeTestCase( "any" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - filters.shouldInclude( fakeTestCase( "./something" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - filters.shouldInclude( fakeTestCase( "./anything" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> - <TestCase name="selftest/filter/prefix wildcard"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> - <TestCase name="selftest/filter/wildcard at both ends"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResult success="true"/> - </TestCase> - <TestCase name="selftest/tags"> - <Section name="single [one] tag"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.getTestCaseInfo().description == "" - </Original> - <Expanded> - "" == "" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.hasTag( "one" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.getTags().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p1 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p2 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p3 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p4 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p5 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResults successes="8" failures="0"/> - </Section> - <Section name="single [two] tag"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.getTestCaseInfo().description == "" - </Original> - <Expanded> - "" == "" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.hasTag( "two" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.getTags().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p1 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p2 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p3 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p4 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( p5 ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResults successes="8" failures="0"/> - </Section> - <Section name="two tags"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.getTestCaseInfo().description == "" - </Original> - <Expanded> - "" == "" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.hasTag( "one" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.hasTag( "two" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.hasTag( "Two" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.hasTag( "three" ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.getTags().size() == 2 - </Original> - <Expanded> - 2 == 2 - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.matchesTags( p1 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.matchesTags( p2 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.matchesTags( p3 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.matchesTags( p4 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - twoTags.matchesTags( p5 ) == true - </Original> - <Expanded> - true == true - </Expanded> - </Expression> - <OverallResults successes="11" failures="0"/> - </Section> - <Section name="complex"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - fakeTestCase( "test", "[one][.]" ).matchesTags( p1 ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - !fakeTestCase( "test", "[one][.]" ).matchesTags( p5 ) - </Original> - <Expanded> - !false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - fakeTestCase( "test", "[three]" ).matchesTags( p4 ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - fakeTestCase( "test", "[three]" ).matchesTags( p5 ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - fakeTestCase( "test", "[three]" ).matchesTags( "[three]~[one]" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - !fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]~[not_apple]" ) - </Original> - <Expanded> - !false - </Expanded> - </Expression> - <OverallResults successes="7" failures="0"/> - </Section> - <Section name="one tag with characters either side"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagWithExtras.getTestCaseInfo().description == "1234" - </Original> - <Expanded> - "1234" == "1234" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagWithExtras.hasTag( "one" ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagWithExtras.hasTag( "two" ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagWithExtras.getTags().size() == 1 - </Original> - <Expanded> - 1 == 1 - </Expanded> - </Expression> - <OverallResults successes="4" failures="0"/> - </Section> - <Section name="start of a tag, but not closed"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagOpen.getTestCaseInfo().description == "[one" - </Original> - <Expanded> - "[one" == "[one" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagOpen.hasTag( "one" ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTagOpen.getTags().size() == 0 - </Original> - <Expanded> - 0 == 0 - </Expanded> - </Expression> - <OverallResults successes="3" failures="0"/> - </Section> - <Section name="hidden"> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.getTestCaseInfo().description == "" - </Original> - <Expanded> - "" == "" - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.hasTag( "." ) - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.isHidden() - </Original> - <Expanded> - true - </Expanded> - </Expression> - <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" > - <Original> - oneTag.matchesTags( "~[.]" ) == false - </Original> - <Expanded> - false == false - </Expanded> - </Expression> - <OverallResults successes="4" failures="0"/> - </Section> - <OverallResult success="true"/> - </TestCase> <TestCase name="Long strings can be wrapped"> <Section name="plain string"> <Section name="No wrapping"> @@ -6571,6 +5977,1023 @@ there" <TestCase name="X/level/1/b"> <OverallResult success="true"/> </TestCase> + <TestCase name="Parse test names and tags"> + <Section name="Empty test spec should have no filters"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="3" failures="0"/> + </Section> + <Section name="Test spec from empty string should have no filters"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches(tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="3" failures="0"/> + </Section> + <Section name="Test spec from just a comma should have no filters"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="3" failures="0"/> + </Section> + <Section name="Test spec from name should have one filter"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="3" failures="0"/> + </Section> + <Section name="Test spec from quoted name should have one filter"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="3" failures="0"/> + </Section> + <Section name="Test spec from name should have one filter"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="Wildcard at the start"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + parseTestSpec( "*a" ).matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="6" failures="0"/> + </Section> + <Section name="Wildcard at the end"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + parseTestSpec( "a*" ).matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="6" failures="0"/> + </Section> + <Section name="Wildcard at both ends"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + parseTestSpec( "*a*" ).matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="6" failures="0"/> + </Section> + <Section name="Just wildcard"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="Single tag"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="Single tag, two matches"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="Two tags"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="Wildcarded name and tag"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="Single tag exclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="One tag exclusion and one tag inclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="4" failures="0"/> + </Section> + <Section name="One tag exclusion and one wldcarded name inclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="name exclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="wildcarded name exclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="wildcarded name exclusion with tag inclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="wildcarded name exclusion, using exclude:, with tag inclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="two wildcarded names"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="empty tag"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="empty quoted name"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <Section name="quoted string followed by tag exclusion"> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.hasFilters() == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcA ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcB ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcC ) == false + </Original> + <Expanded> + false == false + </Expanded> + </Expression> + <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" > + <Original> + spec.matches( tcD ) == true + </Original> + <Expanded> + true == true + </Expanded> + </Expression> + <OverallResults successes="5" failures="0"/> + </Section> + <OverallResult success="true"/> + </TestCase> <TestCase name="Anonymous test case 1"> <OverallResult success="true"/> </TestCase> @@ -6892,7 +7315,7 @@ there" </Section> <OverallResult success="true"/> </TestCase> - <OverallResults successes="537" failures="111"/> + <OverallResults successes="585" failures="111"/> </Group> - <OverallResults successes="537" failures="111"/> + <OverallResults successes="585" failures="111"/> </Catch>