diff options
| author | Martin Hořeňovský | 2019-11-04 21:35:57 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-11-14 10:52:34 +0100 |
| commit | 302e2c0b06f131199b97ad33bdebacc359782ff0 (patch) | |
| tree | 26e80b38b48739573de4225e789096ec83c79357 /projects | |
| parent | 019b0a0fe0398a5b73937b9a1901b3dfaecac386 (diff) | |
| download | catch3-302e2c0b06f131199b97ad33bdebacc359782ff0.tar.gz | |
Do not copy around TestCaseInfo
Now a `TEST_CASE` macro should create a single TestCaseInfo and then
it should never be copied around. This, together with latter changes,
should significantly decrease the number of allocations made before
`main` is even entered.
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/SelfTest/Baselines/compact.sw.approved.txt | 242 | ||||
| -rw-r--r-- | projects/SelfTest/Baselines/console.sw.approved.txt | 242 | ||||
| -rw-r--r-- | projects/SelfTest/Baselines/xml.sw.approved.txt | 242 | ||||
| -rw-r--r-- | projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp | 253 | ||||
| -rw-r--r-- | projects/SelfTest/IntrospectiveTests/Tag.tests.cpp | 4 |
5 files changed, 493 insertions, 490 deletions
diff --git a/projects/SelfTest/Baselines/compact.sw.approved.txt b/projects/SelfTest/Baselines/compact.sw.approved.txt index 06e17964..d7dfb5cc 100644 --- a/projects/SelfTest/Baselines/compact.sw.approved.txt +++ b/projects/SelfTest/Baselines/compact.sw.approved.txt @@ -883,150 +883,150 @@ RandomNumberGeneration.tests.cpp:<line number>: passed: rng() == 0x<hex digits> Message.tests.cpp:<line number>: failed: explicitly with 1 message: 'Message from section one' Message.tests.cpp:<line number>: failed: explicitly with 1 message: 'Message from section two' CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches(tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "*a" ).matches( tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "*a" ).matches( *tcA ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "a*" ).matches( tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "a*" ).matches( *tcA ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "*a*" ).matches( tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: parseTestSpec( "*a*" ).matches( *tcA ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == false for: false == false CmdLine.tests.cpp:<line number>: passed: spec.hasFilters() == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcA ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcB ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcC ) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: spec.matches( tcD ) == true for: true == true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark" ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( "aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( "aardvark" ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark" ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( " aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( "aardvark " ) ) for: true -CmdLine.tests.cpp:<line number>: passed: spec.matches( fakeTestCase( "aardvark" ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcA ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcB ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcC ) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: spec.matches( *tcD ) == true for: true == true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark" ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( "aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( "aardvark" ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark" ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( " aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( "aardvark " ) ) for: true +CmdLine.tests.cpp:<line number>: passed: spec.matches( *fakeTestCase( "aardvark" ) ) for: true Condition.tests.cpp:<line number>: passed: p == 0 for: 0 == 0 Condition.tests.cpp:<line number>: passed: p == pNULL for: 0 == 0 Condition.tests.cpp:<line number>: passed: p != 0 for: 0x<hex digits> != 0 @@ -1051,16 +1051,16 @@ CmdLine.tests.cpp:<line number>: passed: config.reporterName == "console" for: " CmdLine.tests.cpp:<line number>: passed: !(cfg.hasTestFilters()) for: !false CmdLine.tests.cpp:<line number>: passed: result for: {?} CmdLine.tests.cpp:<line number>: passed: cfg.hasTestFilters() for: true -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("notIncluded")) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("test1")) for: true +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("notIncluded")) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("test1")) for: true CmdLine.tests.cpp:<line number>: passed: result for: {?} CmdLine.tests.cpp:<line number>: passed: cfg.hasTestFilters() for: true -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("test1")) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) for: true +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("test1")) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("alwaysIncluded")) for: true CmdLine.tests.cpp:<line number>: passed: result for: {?} CmdLine.tests.cpp:<line number>: passed: cfg.hasTestFilters() for: true -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("test1")) == false for: false == false -CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) for: true +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("test1")) == false for: false == false +CmdLine.tests.cpp:<line number>: passed: cfg.testSpec().matches(*fakeTestCase("alwaysIncluded")) for: true CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "-r", "console"}) for: {?} CmdLine.tests.cpp:<line number>: passed: config.reporterName == "console" for: "console" == "console" CmdLine.tests.cpp:<line number>: passed: cli.parse({"test", "-r", "xml"}) for: {?} @@ -1662,7 +1662,7 @@ StringManip.tests.cpp:<line number>: passed: Catch::replaceInPlace(s, "'", "|'") StringManip.tests.cpp:<line number>: passed: s == "didn|'t" for: "didn|'t" == "didn|'t" Misc.tests.cpp:<line number>: failed: false with 1 message: '3' Message.tests.cpp:<line number>: failed: false with 2 messages: 'hi' and 'i := 7' -Tag.tests.cpp:<line number>: passed: testcase.tags, Catch::VectorContains(std::string("magic-tag")) && Catch::VectorContains(std::string(".")) for: { ".", "magic-tag" } ( Contains: "magic-tag" and Contains: "." ) +Tag.tests.cpp:<line number>: passed: testcase->tags, Catch::VectorContains(std::string("magic-tag")) && Catch::VectorContains(std::string(".")) for: { ".", "magic-tag" } ( Contains: "magic-tag" and Contains: "." ) StringManip.tests.cpp:<line number>: passed: splitStringRef("", ','), Equals(std::vector<StringRef>()) for: { } Equals: { } StringManip.tests.cpp:<line number>: passed: splitStringRef("abc", ','), Equals(std::vector<StringRef>{"abc"}) for: { abc } Equals: { abc } StringManip.tests.cpp:<line number>: passed: splitStringRef("abc,def", ','), Equals(std::vector<StringRef>{"abc", "def"}) for: { abc, def } Equals: { abc, def } diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 42d7bcf5..9ed692cf 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -6418,12 +6418,12 @@ with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6440,12 +6440,12 @@ with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches(tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6462,12 +6462,12 @@ with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6484,12 +6484,12 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == true ) + CHECK( spec.matches( *tcB ) == true ) with expansion: true == true @@ -6506,12 +6506,12 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == true ) + CHECK( spec.matches( *tcB ) == true ) with expansion: true == true @@ -6528,17 +6528,17 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == true ) + CHECK( spec.matches( *tcB ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == false ) + CHECK( spec.matches( *tcC ) == false ) with expansion: false == false @@ -6555,27 +6555,27 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == true ) + CHECK( spec.matches( *tcC ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcD ) == false ) + CHECK( spec.matches( *tcD ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( parseTestSpec( "*a" ).matches( tcA ) == true ) + CHECK( parseTestSpec( "*a" ).matches( *tcA ) == true ) with expansion: true == true @@ -6592,27 +6592,27 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == true ) + CHECK( spec.matches( *tcC ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcD ) == false ) + CHECK( spec.matches( *tcD ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( parseTestSpec( "a*" ).matches( tcA ) == true ) + CHECK( parseTestSpec( "a*" ).matches( *tcA ) == true ) with expansion: true == true @@ -6629,27 +6629,27 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == true ) + CHECK( spec.matches( *tcC ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcD ) == true ) + CHECK( spec.matches( *tcD ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( parseTestSpec( "*a*" ).matches( tcA ) == true ) + CHECK( parseTestSpec( "*a*" ).matches( *tcA ) == true ) with expansion: true == true @@ -6666,12 +6666,12 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == true ) + CHECK( spec.matches( *tcA ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6688,12 +6688,12 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == true ) + CHECK( spec.matches( *tcA ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6710,12 +6710,12 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == true ) + CHECK( spec.matches( *tcA ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false @@ -6732,22 +6732,22 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == false ) + CHECK( spec.matches( *tcB ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == true ) + CHECK( spec.matches( *tcC ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcD ) == true ) + CHECK( spec.matches( *tcD ) == true ) with expansion: true == true @@ -6764,22 +6764,22 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == true ) + CHECK( spec.matches( *tcA ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == true ) + CHECK( spec.matches( *tcB ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == true ) + CHECK( spec.matches( *tcC ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcD ) == true ) + CHECK( spec.matches( *tcD ) == true ) with expansion: true == true @@ -6796,17 +6796,17 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) == false ) + CHECK( spec.matches( *tcA ) == false ) with expansion: false == false CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcB ) == true ) + CHECK( spec.matches( *tcB ) == true ) with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcC ) == false ) + CHECK( spec.matches( *tcC ) == false ) with expansion: false == false @@ -6823,17 +6823,17 @@ with expansion: true == true CmdLine.tests.cpp:<line number>: PASSED: - CHECK( spec.matches( tcA ) |