From 36cee598cfcc4e5005144f0ab2e6e79afe27803e Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 10 Dec 2015 18:16:30 +0000 Subject: [PATCH] Approvals for Matcher change (added comma) --- .../Baselines/console.std.approved.txt | 12 ++--- .../Baselines/console.sw.approved.txt | 54 +++++++++---------- .../SelfTest/Baselines/xml.sw.approved.txt | 54 +++++++++---------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index d8efa182..7faa19d9 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -680,7 +680,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() Contains( "not there" ) ) + CHECK_THAT( testStringForMatching(), Contains( "not there" ) ) with expansion: "this string contains 'abc' as a substring" contains: "not there" @@ -691,7 +691,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() StartsWith( "string" ) ) + CHECK_THAT( testStringForMatching(), StartsWith( "string" ) ) with expansion: "this string contains 'abc' as a substring" starts with: "string" @@ -702,7 +702,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() EndsWith( "this" ) ) + CHECK_THAT( testStringForMatching(), EndsWith( "this" ) ) with expansion: "this string contains 'abc' as a substring" ends with: "this" @@ -713,7 +713,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() Equals( "something else" ) ) + CHECK_THAT( testStringForMatching(), Equals( "something else" ) ) with expansion: "this string contains 'abc' as a substring" equals: "something else" @@ -724,7 +724,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) + CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) with expansion: "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" ) @@ -736,7 +736,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() !Contains( "substring" ) ) + CHECK_THAT( testStringForMatching(), !Contains( "substring" ) ) with expansion: "this string contains 'abc' as a substring" not contains: "substring" diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index ff750ab4..6c84d784 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -1984,25 +1984,25 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - REQUIRE_THAT( testStringForMatching() Contains( "string" ) ) + REQUIRE_THAT( testStringForMatching(), Contains( "string" ) ) with expansion: "this string contains 'abc' as a substring" contains: "string" MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() Contains( "abc" ) ) + CHECK_THAT( testStringForMatching(), Contains( "abc" ) ) with expansion: "this string contains 'abc' as a substring" contains: "abc" MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() StartsWith( "this" ) ) + CHECK_THAT( testStringForMatching(), StartsWith( "this" ) ) with expansion: "this string contains 'abc' as a substring" starts with: "this" MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() EndsWith( "substring" ) ) + CHECK_THAT( testStringForMatching(), EndsWith( "substring" ) ) with expansion: "this string contains 'abc' as a substring" ends with: "substring" @@ -2013,7 +2013,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() Contains( "not there" ) ) + CHECK_THAT( testStringForMatching(), Contains( "not there" ) ) with expansion: "this string contains 'abc' as a substring" contains: "not there" @@ -2024,7 +2024,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() StartsWith( "string" ) ) + CHECK_THAT( testStringForMatching(), StartsWith( "string" ) ) with expansion: "this string contains 'abc' as a substring" starts with: "string" @@ -2035,7 +2035,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() EndsWith( "this" ) ) + CHECK_THAT( testStringForMatching(), EndsWith( "this" ) ) with expansion: "this string contains 'abc' as a substring" ends with: "this" @@ -2046,7 +2046,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() Equals( "something else" ) ) + CHECK_THAT( testStringForMatching(), Equals( "something else" ) ) with expansion: "this string contains 'abc' as a substring" equals: "something else" @@ -2058,7 +2058,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - REQUIRE_THAT( "" Equals(nullptr) ) + REQUIRE_THAT( "", Equals(nullptr) ) with expansion: "" equals: "" @@ -2070,7 +2070,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) ) + CHECK_THAT( testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) @@ -2083,14 +2083,14 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) ) + CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) + CHECK_THAT( testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) with expansion: "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) @@ -2103,7 +2103,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) ) + CHECK_THAT( testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) ) with expansion: "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" @@ -2116,7 +2116,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) ) + CHECK_THAT( testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" ) @@ -2129,14 +2129,14 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) + CHECK_THAT( testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) with expansion: "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" ) MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) + CHECK_THAT( testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) ) with expansion: "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" ) @@ -2149,7 +2149,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) ) + CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) ) with expansion: "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" ) @@ -2161,7 +2161,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) + CHECK_THAT( testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) ) with expansion: "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" ) @@ -2174,7 +2174,7 @@ MiscTests.cpp: MiscTests.cpp:: PASSED: - CHECK_THAT( testStringForMatching() !Contains( "different" ) ) + CHECK_THAT( testStringForMatching(), !Contains( "different" ) ) with expansion: "this string contains 'abc' as a substring" not contains: "different" @@ -2185,7 +2185,7 @@ MiscTests.cpp: ............................................................................... MiscTests.cpp:: FAILED: - CHECK_THAT( testStringForMatching() !Contains( "substring" ) ) + CHECK_THAT( testStringForMatching(), !Contains( "substring" ) ) with expansion: "this string contains 'abc' as a substring" not contains: "substring" @@ -2904,7 +2904,7 @@ TestMain.cpp: TestMain.cpp:: PASSED: - REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) + REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) ) with expansion: "Value after -x or --abortAfter must be greater than zero - while parsing: (-x, --abortx )" contains: "greater than zero" @@ -2919,7 +2919,7 @@ TestMain.cpp: TestMain.cpp:: PASSED: - REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) ) + REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) ) with expansion: "Unable to convert oops to destination type - while parsing: (-x, --abortx )" contains: "-x" @@ -3680,7 +3680,7 @@ TestMain.cpp: TestMain.cpp:: 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: "***************************************************************************- ***- @@ -7463,7 +7463,7 @@ TagAliasTests.cpp: TagAliasTests.cpp:: PASSED: - CHECK_THAT( what Contains( "[@zzz]" ) ) + CHECK_THAT( what, Contains( "[@zzz]" ) ) with expansion: "error: tag alias, "[@zzz]" already registered. First seen at file:2 @@ -7472,7 +7472,7 @@ with expansion: TagAliasTests.cpp:: PASSED: - CHECK_THAT( what Contains( "file" ) ) + CHECK_THAT( what, Contains( "file" ) ) with expansion: "error: tag alias, "[@zzz]" already registered. First seen at file:2 @@ -7481,7 +7481,7 @@ with expansion: TagAliasTests.cpp:: PASSED: - CHECK_THAT( what Contains( "2" ) ) + CHECK_THAT( what, Contains( "2" ) ) with expansion: "error: tag alias, "[@zzz]" already registered. First seen at file:2 @@ -7490,7 +7490,7 @@ with expansion: TagAliasTests.cpp:: PASSED: - CHECK_THAT( what Contains( "10" ) ) + CHECK_THAT( what, Contains( "10" ) ) with expansion: "error: tag alias, "[@zzz]" already registered. First seen at file:2 diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index a2728265..534eaa74 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -2294,7 +2294,7 @@ - testStringForMatching() Contains( "string" ) + testStringForMatching(), Contains( "string" ) "this string contains 'abc' as a substring" contains: "string" @@ -2302,7 +2302,7 @@ - testStringForMatching() Contains( "abc" ) + testStringForMatching(), Contains( "abc" ) "this string contains 'abc' as a substring" contains: "abc" @@ -2310,7 +2310,7 @@ - testStringForMatching() StartsWith( "this" ) + testStringForMatching(), StartsWith( "this" ) "this string contains 'abc' as a substring" starts with: "this" @@ -2318,7 +2318,7 @@ - testStringForMatching() EndsWith( "substring" ) + testStringForMatching(), EndsWith( "substring" ) "this string contains 'abc' as a substring" ends with: "substring" @@ -2329,7 +2329,7 @@ - testStringForMatching() Contains( "not there" ) + testStringForMatching(), Contains( "not there" ) "this string contains 'abc' as a substring" contains: "not there" @@ -2340,7 +2340,7 @@ - testStringForMatching() StartsWith( "string" ) + testStringForMatching(), StartsWith( "string" ) "this string contains 'abc' as a substring" starts with: "string" @@ -2351,7 +2351,7 @@ - testStringForMatching() EndsWith( "this" ) + testStringForMatching(), EndsWith( "this" ) "this string contains 'abc' as a substring" ends with: "this" @@ -2362,7 +2362,7 @@ - testStringForMatching() Equals( "something else" ) + testStringForMatching(), Equals( "something else" ) "this string contains 'abc' as a substring" equals: "something else" @@ -2373,7 +2373,7 @@ - "" Equals(nullptr) + "", Equals(nullptr) "" equals: "" @@ -2384,7 +2384,7 @@ - testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) + testStringForMatching(), AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) @@ -2395,7 +2395,7 @@ - testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) + testStringForMatching(), AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) @@ -2403,7 +2403,7 @@ - testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) + testStringForMatching(), AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) @@ -2414,7 +2414,7 @@ - testStringForMatching() Equals( "this string contains 'abc' as a substring" ) + testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" @@ -2425,7 +2425,7 @@ - testStringForMatching() Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) + testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" ) @@ -2436,7 +2436,7 @@ - testStringForMatching() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) + testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" ) @@ -2444,7 +2444,7 @@ - testStringForMatching2() Contains( "string" ) || Contains( "different" ) || Contains( "random" ) + testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" ) @@ -2455,7 +2455,7 @@ - testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) + testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "substring" ) @@ -2466,7 +2466,7 @@ - testStringForMatching() ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) + testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) "this string contains 'abc' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" ) @@ -2477,7 +2477,7 @@ - testStringForMatching() !Contains( "different" ) + testStringForMatching(), !Contains( "different" ) "this string contains 'abc' as a substring" not contains: "different" @@ -2488,7 +2488,7 @@ - testStringForMatching() !Contains( "substring" ) + testStringForMatching(), !Contains( "substring" ) "this string contains 'abc' as a substring" not contains: "substring" @@ -3241,7 +3241,7 @@
- parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) + parseIntoConfigAndReturnError( argv, config ), Contains( "greater than zero" ) "Value after -x or --abortAfter must be greater than zero @@ -3256,7 +3256,7 @@
- parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) + parseIntoConfigAndReturnError( argv, config ), Contains( "-x" ) "Unable to convert oops to destination type @@ -4102,7 +4102,7 @@ there" - t.toString() EndsWith( "... message truncated due to excessive size" ) + t.toString(), EndsWith( "... message truncated due to excessive size" ) "******************************************************************************- @@ -8080,7 +8080,7 @@ there"
- what Contains( "[@zzz]" ) + what, Contains( "[@zzz]" ) "error: tag alias, "[@zzz]" already registered. @@ -8090,7 +8090,7 @@ there" - what Contains( "file" ) + what, Contains( "file" ) "error: tag alias, "[@zzz]" already registered. @@ -8100,7 +8100,7 @@ there" - what Contains( "2" ) + what, Contains( "2" ) "error: tag alias, "[@zzz]" already registered. @@ -8110,7 +8110,7 @@ there" - what Contains( "10" ) + what, Contains( "10" ) "error: tag alias, "[@zzz]" already registered.