Improve performance of SonarQube reporter handling passing assertions

This mirrors the changes done to the JUnit reporter in commit
fe483c056d9516d3550519c29fbf14a4d84d06d4

2 files changed, 308 insertions, 0 deletions

diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index 1b5b8757..1cd2858b 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -14,51 +14,66 @@ at AssertionHandler.tests.cpp:<line number>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Clara.tests.cpp">
     <testCase name="Clara::Arg supports single-arg parse the way Opt does" duration="{duration}"/>
+    <testCase name="Clara::Opt supports accept-many lambdas" duration="{duration}"/>
     <testCase name="Clara::Opt supports accept-many lambdas/Parsing fails on multiple options without accept_many" duration="{duration}"/>
     <testCase name="Clara::Opt supports accept-many lambdas/Parsing succeeds on multiple options with accept_many" duration="{duration}"/>
     <testCase name="is_unary_function" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp">
+    <testCase name="Parsing sharding-related cli flags" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/shard-count" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/Negative shard count reports error" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/Zero shard count reports error" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/shard-index" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/Negative shard index reports error" duration="{duration}"/>
     <testCase name="Parsing sharding-related cli flags/Shard index 0 is accepted" duration="{duration}"/>
+    <testCase name="Parsing warnings" duration="{duration}"/>
     <testCase name="Parsing warnings/NoAssertions" duration="{duration}"/>
     <testCase name="Parsing warnings/NoTests is no longer supported" duration="{duration}"/>
     <testCase name="Parsing warnings/Combining multiple warnings" duration="{duration}"/>
+    <testCase name="Process can be configured on command line" duration="{duration}"/>
     <testCase name="Process can be configured on command line/empty args don't cause a crash" duration="{duration}"/>
     <testCase name="Process can be configured on command line/default - no arguments" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/test lists" duration="{duration}"/>
     <testCase name="Process can be configured on command line/test lists/Specify one test case using" duration="{duration}"/>
     <testCase name="Process can be configured on command line/test lists/Specify one test case exclusion using exclude:" duration="{duration}"/>
     <testCase name="Process can be configured on command line/test lists/Specify one test case exclusion using ~" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/reporter" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/-r/console" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/-r/xml" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/--reporter/junit" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/must match one of the available ones" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/With output file" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/With Windows-like absolute path as output file" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/reporter/Multiple reporters" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/Multiple reporters/All with output files" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/Multiple reporters/Mixed output files and default output" duration="{duration}"/>
     <testCase name="Process can be configured on command line/reporter/Multiple reporters/cannot have multiple reporters with default output" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/debugger" duration="{duration}"/>
     <testCase name="Process can be configured on command line/debugger/-b" duration="{duration}"/>
     <testCase name="Process can be configured on command line/debugger/--break" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/abort" duration="{duration}"/>
     <testCase name="Process can be configured on command line/abort/-a aborts after first failure" duration="{duration}"/>
     <testCase name="Process can be configured on command line/abort/-x 2 aborts after two failures" duration="{duration}"/>
     <testCase name="Process can be configured on command line/abort/-x must be numeric" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/abort/wait-for-keypress" duration="{duration}"/>
     <testCase name="Process can be configured on command line/abort/wait-for-keypress/Accepted options" duration="{duration}"/>
     <testCase name="Process can be configured on command line/abort/wait-for-keypress/invalid options are reported" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/nothrow" duration="{duration}"/>
     <testCase name="Process can be configured on command line/nothrow/-e" duration="{duration}"/>
     <testCase name="Process can be configured on command line/nothrow/--nothrow" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/output filename" duration="{duration}"/>
     <testCase name="Process can be configured on command line/output filename/-o filename" duration="{duration}"/>
     <testCase name="Process can be configured on command line/output filename/--out" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/combinations" duration="{duration}"/>
     <testCase name="Process can be configured on command line/combinations/Single character flags can be combined" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/use-colour" duration="{duration}"/>
     <testCase name="Process can be configured on command line/use-colour/without option" duration="{duration}"/>
     <testCase name="Process can be configured on command line/use-colour/auto" duration="{duration}"/>
     <testCase name="Process can be configured on command line/use-colour/yes" duration="{duration}"/>
     <testCase name="Process can be configured on command line/use-colour/no" duration="{duration}"/>
     <testCase name="Process can be configured on command line/use-colour/error" duration="{duration}"/>
+    <testCase name="Process can be configured on command line/Benchmark options" duration="{duration}"/>
     <testCase name="Process can be configured on command line/Benchmark options/samples" duration="{duration}"/>
     <testCase name="Process can be configured on command line/Benchmark options/resamples" duration="{duration}"/>
     <testCase name="Process can be configured on command line/Benchmark options/confidence-interval" duration="{duration}"/>
@@ -67,13 +82,16 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="Test with special, characters &quot;in name" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/ColourImpl.tests.cpp">
+    <testCase name="ColourGuard behaviour" duration="{duration}"/>
     <testCase name="ColourGuard behaviour/ColourGuard is disengaged by default" duration="{duration}"/>
     <testCase name="ColourGuard behaviour/ColourGuard is engaged by op&lt;&lt;" duration="{duration}"/>
     <testCase name="ColourGuard behaviour/ColourGuard can be engaged explicitly" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Details.tests.cpp">
+    <testCase name="CaseInsensitiveEqualsTo is case insensitive" duration="{duration}"/>
     <testCase name="CaseInsensitiveEqualsTo is case insensitive/Degenerate cases" duration="{duration}"/>
     <testCase name="CaseInsensitiveEqualsTo is case insensitive/Plain comparisons" duration="{duration}"/>
+    <testCase name="CaseInsensitiveLess is case insensitive" duration="{duration}"/>
     <testCase name="CaseInsensitiveLess is case insensitive/Degenerate cases" duration="{duration}"/>
     <testCase name="CaseInsensitiveLess is case insensitive/Plain comparisons" duration="{duration}"/>
   </file>
@@ -82,35 +100,49 @@ at AssertionHandler.tests.cpp:<line number>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/GeneratorsImpl.tests.cpp">
     <testCase name="Filter generator throws exception for empty generator" duration="{duration}"/>
+    <testCase name="Generators internals" duration="{duration}"/>
     <testCase name="Generators internals/Single value" duration="{duration}"/>
     <testCase name="Generators internals/Preset values" duration="{duration}"/>
     <testCase name="Generators internals/Generator combinator" duration="{duration}"/>
     <testCase name="Generators internals/Explicitly typed generator sequence" duration="{duration}"/>
+    <testCase name="Generators internals/Filter generator" duration="{duration}"/>
     <testCase name="Generators internals/Filter generator/Simple filtering" duration="{duration}"/>
     <testCase name="Generators internals/Filter generator/Filter out multiple elements at the start and end" duration="{duration}"/>
     <testCase name="Generators internals/Filter generator/Throws on construction if it can't get initial element" duration="{duration}"/>
+    <testCase name="Generators internals/Take generator" duration="{duration}"/>
     <testCase name="Generators internals/Take generator/Take less" duration="{duration}"/>
     <testCase name="Generators internals/Take generator/Take more" duration="{duration}"/>
     <testCase name="Generators internals/Map with explicit return type" duration="{duration}"/>
     <testCase name="Generators internals/Map with deduced return type" duration="{duration}"/>
+    <testCase name="Generators internals/Repeat" duration="{duration}"/>
     <testCase name="Generators internals/Repeat/Singular repeat" duration="{duration}"/>
     <testCase name="Generators internals/Repeat/Actual repeat" duration="{duration}"/>
+    <testCase name="Generators internals/Range" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Positive auto step" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive auto step/Integer" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Negative auto step" duration="{duration}"/>
     <testCase name="Generators internals/Range/Negative auto step/Integer" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Positive manual step" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Positive manual step/Integer" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Integer/Exact" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Integer/Slightly over end" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Integer/Slightly under end" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Positive manual step/Floating Point" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Floating Point/Exact" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Floating Point/Slightly over end" duration="{duration}"/>
     <testCase name="Generators internals/Range/Positive manual step/Floating Point/Slightly under end" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Negative manual step" duration="{duration}"/>
+    <testCase name="Generators internals/Range/Negative manual step/Integer" duration="{duration}"/>
     <testCase name="Generators internals/Range/Negative manual step/Integer/Exact" duration="{duration}"/>
     <testCase name="Generators internals/Range/Negative manual step/Integer/Slightly over end" duration="{duration}"/>
     <testCase name="Generators internals/Range/Negative manual step/Integer/Slightly under end" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/InternalBenchmark.tests.cpp">
     <testCase name="analyse no analysis" duration="{duration}"/>
+    <testCase name="benchmark function call" duration="{duration}"/>
     <testCase name="benchmark function call/without chronometer" duration="{duration}"/>
     <testCase name="benchmark function call/with chronometer" duration="{duration}"/>
+    <testCase name="classify_outliers" duration="{duration}"/>
     <testCase name="classify_outliers/none" duration="{duration}"/>
     <testCase name="classify_outliers/low severe" duration="{duration}"/>
     <testCase name="classify_outliers/low mild" duration="{duration}"/>
@@ -130,6 +162,7 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="weighted_average_quantile" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp">
+    <testCase name="JsonWriter" duration="{duration}"/>
     <testCase name="JsonWriter/Newly constructed JsonWriter does nothing" duration="{duration}"/>
     <testCase name="JsonWriter/Calling writeObject will create an empty pair of braces" duration="{duration}"/>
     <testCase name="JsonWriter/Calling writeObject with key will create an object to write the value" duration="{duration}"/>
@@ -139,6 +172,7 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" duration="{duration}"/>
     <testCase name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" duration="{duration}"/>
     <testCase name="JsonWriter/Custom class shall be quoted" duration="{duration}"/>
+    <testCase name="JsonWriter escapes charaters in strings properly" duration="{duration}"/>
     <testCase name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" duration="{duration}"/>
     <testCase name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" duration="{duration}"/>
     <testCase name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" duration="{duration}"/>
@@ -150,10 +184,12 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Parse.tests.cpp">
+    <testCase name="Parse uints" duration="{duration}"/>
     <testCase name="Parse uints/proper inputs" duration="{duration}"/>
     <testCase name="Parse uints/Bad inputs" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/PartTracker.tests.cpp">
+    <testCase name="#1938 - GENERATE after a section" duration="{duration}"/>
     <testCase name="#1938 - GENERATE after a section/A" duration="{duration}"/>
     <testCase name="#1938 - GENERATE after a section/B" duration="{duration}"/>
     <testCase name="#1938 - Section followed by flat generate" duration="{duration}"/>
@@ -176,6 +212,7 @@ at AssertionHandler.tests.cpp:<line number>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/RandomNumberGeneration.tests.cpp">
     <testCase name="Comparison ops" duration="{duration}"/>
+    <testCase name="Our PCG implementation provides expected results for known seeds" duration="{duration}"/>
     <testCase name="Our PCG implementation provides expected results for known seeds/Default seeded" duration="{duration}"/>
     <testCase name="Our PCG implementation provides expected results for known seeds/Specific seed" duration="{duration}"/>
     <testCase name="Random seed generation accepts known methods" duration="{duration}"/>
@@ -217,6 +254,7 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="Reporter's write listings to provided stream/XML reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/XML reporter lists tests" duration="{duration}"/>
     <testCase name="Reproducer for #2309 - a very long description past 80 chars (default console width) with a late colon : blablabla" duration="{duration}"/>
+    <testCase name="The default listing implementation write to provided stream" duration="{duration}"/>
     <testCase name="The default listing implementation write to provided stream/Listing tags" duration="{duration}"/>
     <testCase name="The default listing implementation write to provided stream/Listing reporters" duration="{duration}"/>
     <testCase name="The default listing implementation write to provided stream/Listing tests" duration="{duration}"/>
@@ -230,11 +268,13 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="stdout and stderr streams have %-starting name" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/String.tests.cpp">
+    <testCase name="StringRef" duration="{duration}"/>
     <testCase name="StringRef/Empty string" duration="{duration}"/>
     <testCase name="StringRef/From string literal" duration="{duration}"/>
     <testCase name="StringRef/From sub-string" duration="{duration}"/>
     <testCase name="StringRef/Copy construction is shallow" duration="{duration}"/>
     <testCase name="StringRef/Copy assignment is shallow" duration="{duration}"/>
+    <testCase name="StringRef/Substrings" duration="{duration}"/>
     <testCase name="StringRef/Substrings/zero-based substring" duration="{duration}"/>
     <testCase name="StringRef/Substrings/non-zero-based substring" duration="{duration}"/>
     <testCase name="StringRef/Substrings/Pointer values of full refs should match" duration="{duration}"/>
@@ -243,24 +283,29 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="StringRef/Substrings/Substring off the end are trimmed" duration="{duration}"/>
     <testCase name="StringRef/Substrings/substring start after the end is empty" duration="{duration}"/>
     <testCase name="StringRef/Comparisons are deep" duration="{duration}"/>
+    <testCase name="StringRef/from std::string" duration="{duration}"/>
     <testCase name="StringRef/from std::string/implicitly constructed" duration="{duration}"/>
     <testCase name="StringRef/from std::string/explicitly constructed" duration="{duration}"/>
     <testCase name="StringRef/from std::string/assigned" duration="{duration}"/>
+    <testCase name="StringRef/to std::string" duration="{duration}"/>
     <testCase name="StringRef/to std::string/explicitly constructed" duration="{duration}"/>
     <testCase name="StringRef/to std::string/assigned" duration="{duration}"/>
     <testCase name="StringRef/std::string += StringRef" duration="{duration}"/>
     <testCase name="StringRef/StringRef + StringRef" duration="{duration}"/>
+    <testCase name="StringRef at compilation time" duration="{duration}"/>
     <testCase name="StringRef at compilation time/Simple constructors" duration="{duration}"/>
     <testCase name="StringRef at compilation time/UDL construction" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/StringManip.tests.cpp">
     <testCase name="Trim strings" duration="{duration}"/>
+    <testCase name="replaceInPlace" duration="{duration}"/>
     <testCase name="replaceInPlace/replace single char" duration="{duration}"/>
     <testCase name="replaceInPlace/replace two chars" duration="{duration}"/>
     <testCase name="replaceInPlace/replace first char" duration="{duration}"/>
     <testCase name="replaceInPlace/replace last char" duration="{duration}"/>
     <testCase name="replaceInPlace/replace all chars" duration="{duration}"/>
     <testCase name="replaceInPlace/replace no chars" duration="{duration}"/>
+    <testCase name="replaceInPlace/no replace in already-replaced string" duration="{duration}"/>
     <testCase name="replaceInPlace/no replace in already-replaced string/lengthening" duration="{duration}"/>
     <testCase name="replaceInPlace/no replace in already-replaced string/shortening" duration="{duration}"/>
     <testCase name="replaceInPlace/escape '" duration="{duration}"/>
@@ -268,6 +313,7 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="startsWith" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Tag.tests.cpp">
+    <testCase name="Tag alias can be registered against tag patterns" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" duration="{duration}"/>
     <testCase name="Tag alias can be registered against tag patterns/Tag aliases must be of the form [@name]" duration="{duration}"/>
     <testCase name="Tags with spaces and non-alphanumerical characters are accepted" duration="{duration}"/>
@@ -279,6 +325,7 @@ at AssertionHandler.tests.cpp:<line number>
   <file path="tests/<exe-name>/IntrospectiveTests/TestCaseInfoHasher.tests.cpp">
     <testCase name="Hashers with different seed produce different hash with same test case" duration="{duration}"/>
     <testCase name="Hashers with same seed produce same hash" duration="{duration}"/>
+    <testCase name="Hashing different test cases produces different result" duration="{duration}"/>
     <testCase name="Hashing different test cases produces different result/Different test name" duration="{duration}"/>
     <testCase name="Hashing different test cases produces different result/Different classname" duration="{duration}"/>
     <testCase name="Hashing different test cases produces different result/Different tags" duration="{duration}"/>
@@ -286,6 +333,7 @@ at AssertionHandler.tests.cpp:<line number>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/TestSpec.tests.cpp">
     <testCase name="#1905 -- test spec parser properly clears internal state between compound tests" duration="{duration}"/>
+    <testCase name="#1912 -- test spec parser handles escaping" duration="{duration}"/>
     <testCase name="#1912 -- test spec parser handles escaping/Various parentheses" duration="{duration}"/>
     <testCase name="#1912 -- test spec parser handles escaping/backslash in test name" duration="{duration}"/>
   </file>
@@ -299,16 +347,20 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="Stringifying char arrays with statically known sizes - char" duration="{duration}"/>
     <testCase name="Stringifying char arrays with statically known sizes - signed char" duration="{duration}"/>
     <testCase name="Stringifying char arrays with statically known sizes - unsigned char" duration="{duration}"/>
+    <testCase name="parseEnums" duration="{duration}"/>
     <testCase name="parseEnums/No enums" duration="{duration}"/>
     <testCase name="parseEnums/One enum value" duration="{duration}"/>
     <testCase name="parseEnums/Multiple enum values" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/UniquePtr.tests.cpp">
+    <testCase name="Upcasting special member functions" duration="{duration}"/>
     <testCase name="Upcasting special member functions/Move constructor" duration="{duration}"/>
     <testCase name="Upcasting special member functions/move assignment" duration="{duration}"/>
+    <testCase name="make_unique reimplementation" duration="{duration}"/>
     <testCase name="make_unique reimplementation/From lvalue copies" duration="{duration}"/>
     <testCase name="make_unique reimplementation/From rvalue moves" duration="{duration}"/>
     <testCase name="make_unique reimplementation/Variadic constructor" duration="{duration}"/>
+    <testCase name="unique_ptr reimplementation: basic functionality" duration="{duration}"/>
     <testCase name="unique_ptr reimplementation: basic functionality/Default constructed unique_ptr is empty" duration="{duration}"/>
     <testCase name="unique_ptr reimplementation: basic functionality/Take ownership of allocation" duration="{duration}"/>
     <testCase name="unique_ptr reimplementation: basic functionality/Take ownership of allocation/Plain reset deallocates" duration="{duration}"/>
@@ -319,6 +371,7 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="unique_ptr reimplementation: basic functionality/free swap" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Xml.tests.cpp">
+    <testCase name="XmlEncode" duration="{duration}"/>
     <testCase name="XmlEncode/normal string" duration="{duration}"/>
     <testCase name="XmlEncode/empty string" duration="{duration}"/>
     <testCase name="XmlEncode/string with ampersand" duration="{duration}"/>
@@ -348,14 +401,27 @@ at AssertionHandler.tests.cpp:<line number>
     <testCase name="Use a custom approx" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/BDD.tests.cpp">
+    <testCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods" duration="{duration}"/>
     <testCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me" duration="{duration}"/>
+    <testCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me/When: We get the count" duration="{duration}"/>
     <testCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods/Given: No operations precede me/When: We get the count/Then: Subsequently values are higher" duration="{duration}"/>
+    <testCase name="Scenario: Do that thing with the thing" duration="{duration}"/>
+    <testCase name="Scenario: Do that thing with the thing/Given: This stuff exists" duration="{duration}"/>
+    <testCase name="Scenario: Do that thing with the thing/Given: This stuff exists/And given: And some assumption" duration="{duration}"/>
+    <testCase name="Scenario: Do that thing with the thing/Given: This stuff exists/And given: And some assumption/When: I do this" duration="{duration}"/>
     <testCase name="Scenario: Do that thing with the thing/Given: This stuff exists/And given: And some assumption/When: I do this/Then: it should do this" duration="{duration}"/>
     <testCase name="Scenario: Do that thing with the thing/Given: This stuff exists/And given: And some assumption/When: I do this/Then: it should do this/And: do that" duration="{duration}"/>
+    <testCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping" duration="{duration}"/>
+    <testCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping/Given: A section name that is so long that it cannot fit in a single console width" duration="{duration}"/>
+    <testCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping/Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario" duration="{duration}"/>
     <testCase name="Scenario: This is a really long scenario name to see how the list command deals with wrapping/Given: A section name that is so long that it cannot fit in a single console width/When: The test headers are printed as part of the normal running of the scenario/Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent" duration="{duration}"/>
+    <testCase name="Scenario: Vector resizing affects size and capacity" duration="{duration}"/>
     <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector" duration="{duration}"/>
+    <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: it is made larger" duration="{duration}"/>
     <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: it is made larger/Then: the size and capacity go up" duration="{duration}"/>
+    <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: it is made larger/Then: the size and capacity go up/And when: it is made smaller again" duration="{duration}"/>
     <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: it is made larger/Then: the size and capacity go up/And when: it is made smaller again/Then: the size goes down but the capacity stays the same" duration="{duration}"/>
+    <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: we reserve more space" duration="{duration}"/>
     <testCase name="Scenario: Vector resizing affects size and capacity/Given: an empty vector/When: we reserve more space/Then: The capacity is increased but the size remains the same" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/Class.tests.cpp">
@@ -529,6 +595,7 @@ with expansion:
 at Class.tests.cpp:<line number>
       </failure>
     </testCase>
+    <testCase name="A TEST_CASE_PERSISTENT_FIXTURE based test run that succeeds" duration="{duration}"/>
     <testCase name="A TEST_CASE_PERSISTENT_FIXTURE based test run that succeeds/First partial run" duration="{duration}"/>
     <testCase name="A TEST_CASE_PERSISTENT_FIXTURE based test run that succeeds/Second partial run" duration="{duration}"/>
     <testCase name="Template test case method with test types specified inside std::tuple - MyTypes - 0" duration="{duration}"/>
@@ -540,6 +607,7 @@ at Class.tests.cpp:<line number>
     <testCase name="#1147" duration="{duration}"/>
     <testCase name="#1238" duration="{duration}"/>
     <testCase name="#1245" duration="{duration}"/>
+    <testCase name="#1319: Sections can have description (even if it is not saved" duration="{duration}"/>
     <testCase name="#1319: Sections can have description (even if it is not saved/SectionName" duration="{duration}"/>
     <testCase name="#1403" duration="{duration}"/>
     <testCase name="#1548" duration="{duration}"/>
@@ -749,24 +817,28 @@ at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Inequality checks that should succeed" duration="{duration}"/>
+    <testCase name="Mayfail test case with nested sections/1" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/1/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
 at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
+    <testCase name="Mayfail test case with nested sections/2" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/2/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
 at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
+    <testCase name="Mayfail test case with nested sections/1" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/1/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
 at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
+    <testCase name="Mayfail test case with nested sections/2" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/2/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
@@ -933,6 +1005,7 @@ at Decomposition.tests.cpp:<line number>
     <testCase name="toString(enum)" duration="{duration}"/>
   </file>
   <file path="tests/<exe-name>/UsageTests/Exception.tests.cpp">
+    <testCase name="#748 - captures with unexpected exceptions" duration="{duration}"/>
     <testCase name="#748 - captures with unexpected exceptions/outside assertions" duration="{duration}">
       <skipped message="TEST_CASE()">
 FAILED:
@@ -982,6 +1055,7 @@ custom std exception
 at Exception.tests.cpp:<line number>
       </error>
     </testCase>
+    <testCase name="Exception messages can be tested for" duration="{duration}"/>
     <testCase name="Exception messages can be tested for/exact match" duration="{duration}"/>
     <testCase name="Exception messages can be tested for/different case" duration="{duration}"/>
     <testCase name="Exception messages can be tested for/wildcarded" duration="{duration}"/>
@@ -1073,6 +1147,7 @@ unexpected exception
 at Exception.tests.cpp:<line number>
       </error>
     </testCase>
+    <testCase name="When unchecked exceptions are thrown, but caught, they do not affect the test" duration="{duration}"/>
     <testCase name="thrown std::strings are translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
@@ -1092,21 +1167,27 @@ at Generators.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="3x3x3 ints" duration="{duration}"/>
+    <testCase name="Copy and then generate a range" duration="{duration}"/>
     <testCase name="Copy and then generate a range/from var and iterators" duration="{duration}"/>
     <testCase name="Copy and then generate a range/From a temporary container" duration="{duration}"/>
     <testCase name="Copy and then generate a range/Final validation" duration="{duration}"/>
     <testCase name="GENERATE can combine literals and generators" duration="{duration}"/>
+    <testCase name="Generators -- adapters" duration="{duration}"/>
+    <testCase name="Generators -- adapters/Filtering by predicate" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Basic usage" duration="{duration}"/>
     <testCase name="Generators -- adapters/Filtering by predicate/Throws if there are no matching values" duration="{duration}"/>
     <testCase name="Generators -- adapters/Shortening a range" duration="{duration}"/>
+    <testCase name="Generators -- adapters/Transforming elements" duration="{duration}"/>
     <testCase name="Generators -- adapters/Transforming elements/Same type" duration="{duration}"/>
     <testCase name="Generators -- adapters/Transforming elements/Different type" duration="{duration}"/>
     <testCase name="Generators -- adapters/Transforming elements/Different deduced type" duration="{duration}"/>
     <testCase name="Generators -- adapters/Repeating a generator" duration="{duration}"/>
+    <testCase name="Generators -- adapters/Chunking a generator into sized pieces" duration="{duration}"/>
     <testCase name="Generators -- adapters/Chunking a generator into sized pieces/Number of elements in source is divisible by chunk size" duration="{duration}"/>
     <testCase name="Generators -- adapters/Chunking a generator into sized pieces/Number of elements in source is not divisible by chunk size" duration="{duration}"/>
     <testCase name="Generators -- adapters/Chunking a generator into sized pieces/Chunk size of zero" duration="{duration}"/>
     <testCase name="Generators -- adapters/Chunking a generator into sized pieces/Throws on too small generators" duration="{duration}"/>
+    <testCase name="Generators -- simple" duration="{duration}"/>
     <testCase name="Generators -- simple/one" duration="{duration}"/>
     <testCase name="Generators -- simple/two" duration="{duration}"/>
     <testCase name="Nested generators and captured variables" duration="{duration}"/>
@@ -1116,6 +1197,7 @@ at Generators.tests.cpp:<line number>
   <file path="tests/<exe-name>/UsageTests/Matchers.tests.cpp">
     <testCase name="#2152 - ULP checks between differently signed values were wrong - double" duration="{duration}"/>
     <testCase name="#2152 - ULP checks between differently signed values were wrong - float" duration="{duration}"/>
+    <testCase name="Arbitrary predicate matcher" duration="{duration}"/>
     <testCase name="Arbitrary predicate matcher/Function pointer" duration="{duration}"/>
     <testCase name="Arbitrary predicate matcher/Lambdas + different type" duration="{duration}"/>
     <testCase name="Combining MatchAllOfGeneric does not nest" duration="{duration}"/>
@@ -1125,8 +1207,10 @@ at Generators.tests.cpp:<line number>
     <testCase name="Combining only templated matchers" duration="{duration}"/>
     <testCase name="Combining templated and concrete matchers" duration="{duration}"/>
     <testCase name="Combining templated matchers" duration="{duration}"/>
+    <testCase name="Composed generic matchers shortcircuit" duration="{duration}"/>
     <testCase name="Composed generic matchers shortcircuit/MatchAllOf" duration="{duration}"/>
     <testCase name="Composed generic matchers shortcircuit/MatchAnyOf" duration="{duration}"/>
+    <testCase name="Composed matchers shortcircuit" duration="{duration}"/>
     <testCase name="Composed matchers shortcircuit/MatchAllOf" duration="{duration}"/>
     <testCase name="Composed matchers shortcircuit/MatchAnyOf" duration="{duration}"/>
     <testCase name="Contains string matcher" duration="{duration}">
@@ -1223,6 +1307,7 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Exception matchers that succeed" duration="{duration}"/>
     <testCase name="Exception message can be matched" duration="{duration}"/>
     <testCase name="Exceptions matchers" duration="{duration}"/>
+    <testCase name="Floating point matchers: double" duration="{duration}"/>
     <testCase name="Floating point matchers: double/Relative" duration="{duration}"/>
     <testCase name="Floating point matchers: double/Relative/Some subnormal values" duration="{duration}"/>
     <testCase name="Floating point matchers: double/Margin" duration="{duration}"/>
@@ -1230,6 +1315,7 @@ at Matchers.tests.cpp:<line number>
     <testCase name="Floating point matchers: double/Composed" duration="{duration}"/>
     <testCase name="Floating point matchers: double/Constructor validation" duration="{duration}"/>
     <testCase name="Floating point matchers: double/IsNaN" duration="{duration}"/>
+    <testCase name="Floating point matchers: float" duration="{duration}"/>
     <testCase name="Floating point matchers: float/Relative" duration="{duration}"/>
     <testCase name="Floating point matchers: float/Relative/Some subnormal values" duration="{duration}"/>
     <testCase name="Floating point matchers: float/Margin" duration="{duration}"/>
@@ -1302,10 +1388,13 @@ at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="String matchers" duration="{duration}"/>
+    <testCase name="Vector Approx matcher" duration="{duration}"/>
     <testCase name="Vector Approx matcher/Empty vector is roughly equal to an empty vector" duration="{duration}"/>
+    <testCase name="Vector Approx matcher/Vectors with elements" duration="{duration}"/>
     <testCase name="Vector Approx matcher/Vectors with elements/A vector is approx equal to itself" duration="{duration}"/>
     <testCase name="Vector Approx matcher/Vectors with elements/Different length" duration="{duration}"/>
     <testCase name="Vector Approx matcher/Vectors with elements/Same length, different elements" duration="{duration}"/>
+    <testCase name="Vector Approx matcher -- failing" duration="{duration}"/>
     <testCase name="Vector Approx matcher -- failing/Empty and non empty vectors are not approx equal" duration="{duration}">
       <failure message="CHECK_THAT(empty, Approx( t1 ))">
 FAILED:
@@ -1324,11 +1413,13 @@ with expansion:
 at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
+    <testCase name="Vector matchers" duration="{duration}"/>
     <testCase name="Vector matchers/Contains (element)" duration="{duration}"/>
     <testCase name="Vector matchers/Contains (vector)" duration="{duration}"/>
     <testCase name="Vector matchers/Contains (element), composed" duration="{duration}"/>
     <testCase name="Vector matchers/Equals" duration="{duration}"/>
     <testCase name="Vector matchers/UnorderedEquals" duration="{duration}"/>
+    <testCase name="Vector matchers that fail" duration="{duration}"/>
     <testCase name="Vector matchers that fail/Contains (element)" duration="{duration}">
       <failure message="CHECK_THAT(v, VectorContains( -1 ))">
 FAILED:
@@ -1423,82 +1514,114 @@ at Matchers.tests.cpp:<line number>
     </testCase>
   </file>
   <file path="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp">
+    <testCase name="Basic use of the Contains range match