From 016b063ae83b3c301cc9f0556a0933cc1252a7c0 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Mon, 25 Mar 2013 09:25:01 +0000
Subject: [PATCH] Line numbers changed and test added

---
 .../SelfTest/Baselines/approvedResults.txt    | 2117 ++++++++++++-----
 1 file changed, 1560 insertions(+), 557 deletions(-)

diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index df505ae..65371a7 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -732,25 +732,25 @@ with expansion:
 ./succeeding/conditions//long_to_unsigned_x
 ...............................................................................
 
-ConditionTests.cpp:223:
+ConditionTests.cpp:226:
 PASSED:
   REQUIRE( long_var == unsigned_char_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:224:
+ConditionTests.cpp:227:
 PASSED:
   REQUIRE( long_var == unsigned_short_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:225:
+ConditionTests.cpp:228:
 PASSED:
   REQUIRE( long_var == unsigned_int_var )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:226:
+ConditionTests.cpp:229:
 PASSED:
   REQUIRE( long_var == unsigned_long_var )
 with expansion:
@@ -760,25 +760,25 @@ with expansion:
 ./succeeding/conditions/const ints to int literal
 ...............................................................................
 
-ConditionTests.cpp:237:
+ConditionTests.cpp:240:
 PASSED:
   REQUIRE( unsigned_char_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:238:
+ConditionTests.cpp:241:
 PASSED:
   REQUIRE( unsigned_short_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:239:
+ConditionTests.cpp:242:
 PASSED:
   REQUIRE( unsigned_int_var == 1 )
 with expansion:
   1 == 1
 
-ConditionTests.cpp:240:
+ConditionTests.cpp:243:
 PASSED:
   REQUIRE( unsigned_long_var == 1 )
 with expansion:
@@ -788,37 +788,37 @@ with expansion:
 ./succeeding/conditions/negative ints
 ...............................................................................
 
-ConditionTests.cpp:246:
+ConditionTests.cpp:249:
 PASSED:
   CHECK( ( -1 > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:247:
+ConditionTests.cpp:250:
 PASSED:
   CHECK( -1 > 2u )
 with expansion:
   -1 > 2
 
-ConditionTests.cpp:249:
+ConditionTests.cpp:252:
 PASSED:
   CHECK( ( 2u < -1 ) )
 with expansion:
   true
 
-ConditionTests.cpp:250:
+ConditionTests.cpp:253:
 PASSED:
   CHECK( 2u < -1 )
 with expansion:
   2 < -1
 
-ConditionTests.cpp:253:
+ConditionTests.cpp:256:
 PASSED:
   CHECK( ( minInt > 2u ) )
 with expansion:
   true
 
-ConditionTests.cpp:254:
+ConditionTests.cpp:257:
 PASSED:
   CHECK( minInt > 2u )
 with expansion:
@@ -828,7 +828,7 @@ with expansion:
 ./succeeding/conditions/computed ints
 ...............................................................................
 
-ConditionTests.cpp:269:
+ConditionTests.cpp:272:
 PASSED:
   CHECK( 54 == 6*9 )
 with expansion:
@@ -838,49 +838,49 @@ with expansion:
 ./succeeding/conditions/ptr
 ...............................................................................
 
-ConditionTests.cpp:285:
+ConditionTests.cpp:288:
 PASSED:
   REQUIRE( p == __null )
 with expansion:
   __null == 0
 
-ConditionTests.cpp:286:
+ConditionTests.cpp:289:
 PASSED:
   REQUIRE( p == pNULL )
 with expansion:
   __null == __null
 
-ConditionTests.cpp:291:
+ConditionTests.cpp:294:
 PASSED:
   REQUIRE( p != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:294:
+ConditionTests.cpp:297:
 PASSED:
   REQUIRE( cp != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:297:
+ConditionTests.cpp:300:
 PASSED:
   REQUIRE( cpc != __null )
 with expansion:
   0x<hex digits> != 0
 
-ConditionTests.cpp:299:
+ConditionTests.cpp:302:
 PASSED:
   REQUIRE( returnsNull() == __null )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:300:
+ConditionTests.cpp:303:
 PASSED:
   REQUIRE( returnsConstNull() == __null )
 with expansion:
   {null string} == 0
 
-ConditionTests.cpp:302:
+ConditionTests.cpp:305:
 PASSED:
   REQUIRE( __null != p )
 with expansion:
@@ -890,43 +890,43 @@ with expansion:
 ./succeeding/conditions/not
 ...............................................................................
 
-ConditionTests.cpp:317:
+ConditionTests.cpp:320:
 PASSED:
   REQUIRE( false == false )
 
-ConditionTests.cpp:318:
+ConditionTests.cpp:321:
 PASSED:
   REQUIRE( true == true )
 
-ConditionTests.cpp:319:
+ConditionTests.cpp:322:
 PASSED:
   REQUIRE( !false )
 with expansion:
   true
 
-ConditionTests.cpp:320:
+ConditionTests.cpp:323:
 PASSED:
   REQUIRE_FALSE( !false )
 
-ConditionTests.cpp:322:
+ConditionTests.cpp:325:
 PASSED:
   REQUIRE( !falseValue )
 with expansion:
   true
 
-ConditionTests.cpp:323:
+ConditionTests.cpp:326:
 PASSED:
   REQUIRE_FALSE( !falseValue )
 with expansion:
   !false
 
-ConditionTests.cpp:325:
+ConditionTests.cpp:328:
 PASSED:
   REQUIRE( !(1 == 2) )
 with expansion:
   true
 
-ConditionTests.cpp:326:
+ConditionTests.cpp:329:
 PASSED:
   REQUIRE_FALSE( !1 == 2 )
 with expansion:
@@ -936,36 +936,36 @@ with expansion:
 ./failing/conditions/not
 ...............................................................................
 
-ConditionTests.cpp:334: FAILED:
+ConditionTests.cpp:337: FAILED:
   CHECK( false != false )
 
-ConditionTests.cpp:335: FAILED:
+ConditionTests.cpp:338: FAILED:
   CHECK( true != true )
 
-ConditionTests.cpp:336: FAILED:
+ConditionTests.cpp:339: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-ConditionTests.cpp:337: FAILED:
+ConditionTests.cpp:340: FAILED:
   CHECK_FALSE( !true )
 
-ConditionTests.cpp:339: FAILED:
+ConditionTests.cpp:342: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-ConditionTests.cpp:340: FAILED:
+ConditionTests.cpp:343: FAILED:
   CHECK_FALSE( !trueValue )
 with expansion:
   !true
 
-ConditionTests.cpp:342: FAILED:
+ConditionTests.cpp:345: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-ConditionTests.cpp:343: FAILED:
+ConditionTests.cpp:346: FAILED:
   CHECK_FALSE( !1 == 1 )
 with expansion:
   !(1 == 1)
@@ -1053,7 +1053,7 @@ due to unexpected exception with message:
 ./failing/exceptions/custom/nothrow
 ...............................................................................
 
-ExceptionTests.cpp:113: FAILED:
+ExceptionTests.cpp:116: FAILED:
   REQUIRE_NOTHROW( throw CustomException( "unexpected custom exception" ) )
 due to unexpected exception with message:
   unexpected custom exception
@@ -1062,7 +1062,7 @@ due to unexpected exception with message:
 ./failing/exceptions/custom/throw
 ...............................................................................
 
-ExceptionTests.cpp:118: FAILED:
+ExceptionTests.cpp:121: FAILED:
   REQUIRE_THROWS_AS( throw CustomException( "custom exception - not std" ) )
 due to unexpected exception with message:
   custom exception - not std
@@ -1071,7 +1071,7 @@ due to unexpected exception with message:
 ./failing/exceptions/custom/double
 ...............................................................................
 
-ExceptionTests.cpp:122: FAILED:
+ExceptionTests.cpp:125: FAILED:
 due to unexpected exception with message:
   3.14
 
@@ -1079,7 +1079,7 @@ due to unexpected exception with message:
 ./succeeding/exceptions/notimplemented
 ...............................................................................
 
-ExceptionTests.cpp:133:
+ExceptionTests.cpp:136:
 PASSED:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 
@@ -2696,6 +2696,183 @@ second tag
 
 No assertions in test case, 'second tag'
 
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+...............................................................................
+
+MiscTests.cpp:300:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:301:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  resizing bigger changes size and capacity
+...............................................................................
+
+MiscTests.cpp:306:
+PASSED:
+  REQUIRE( v.size() == 10 )
+with expansion:
+  10 == 10
+
+MiscTests.cpp:307:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+...............................................................................
+
+MiscTests.cpp:300:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:301:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  resizing smaller changes size but not capacity
+...............................................................................
+
+MiscTests.cpp:312:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+MiscTests.cpp:313:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  resizing smaller changes size but not capacity
+  We can use the 'swap trick' to reset the capacity
+...............................................................................
+
+MiscTests.cpp:319:
+PASSED:
+  REQUIRE( v.capacity() == 0 )
+with expansion:
+  0 == 0
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+...............................................................................
+
+MiscTests.cpp:300:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:301:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  resizing smaller changes size but not capacity
+...............................................................................
+
+MiscTests.cpp:312:
+PASSED:
+  REQUIRE( v.size() == 0 )
+with expansion:
+  0 == 0
+
+MiscTests.cpp:313:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+...............................................................................
+
+MiscTests.cpp:300:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:301:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  reserving bigger changes capacity but not size
+...............................................................................
+
+MiscTests.cpp:325:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:326:
+PASSED:
+  REQUIRE( v.capacity() >= 10 )
+with expansion:
+  10 >= 10
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+...............................................................................
+
+MiscTests.cpp:300:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:301:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
+-------------------------------------------------------------------------------
+vectors can be sized and resized
+  reserving smaller does not change size or capacity
+...............................................................................
+
+MiscTests.cpp:331:
+PASSED:
+  REQUIRE( v.size() == 5 )
+with expansion:
+  5 == 5
+
+MiscTests.cpp:332:
+PASSED:
+  REQUIRE( v.capacity() >= 5 )
+with expansion:
+  5 >= 5
+
 -------------------------------------------------------------------------------
 selftest/main
   selftest/expected result
@@ -3082,13 +3259,13 @@ selftest/main
   selftest/test counts/succeeding tests
 ...............................................................................
 
-TestMain.cpp:40:
+TestMain.cpp:41:
 PASSED:
   CHECK( totals.assertions.passed == 296 )
 with expansion:
   296 == 296
 
-TestMain.cpp:41:
+TestMain.cpp:42:
 PASSED:
   CHECK( totals.assertions.failed == 0 )
 with expansion:
@@ -3100,13 +3277,13 @@ selftest/main
   selftest/test counts/failing tests
 ...............................................................................
 
-TestMain.cpp:47:
+TestMain.cpp:48:
 PASSED:
   CHECK( totals.assertions.passed == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:48:
+TestMain.cpp:49:
 PASSED:
   CHECK( totals.assertions.failed == 73 )
 with expansion:
@@ -3116,13 +3293,13 @@ with expansion:
 meta/Misc/Sections
 ...............................................................................
 
-TestMain.cpp:57:
+TestMain.cpp:58:
 PASSED:
   CHECK( totals.assertions.passed == 2 )
 with expansion:
   2 == 2
 
-TestMain.cpp:58:
+TestMain.cpp:59:
 PASSED:
   CHECK( totals.assertions.failed == 1 )
 with expansion:
@@ -3133,29 +3310,29 @@ selftest/parser/2
   default
 ...............................................................................
 
-TestMain.cpp:97:
+TestMain.cpp:98:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:99:
+TestMain.cpp:100:
 PASSED:
   CHECK( config.shouldDebugBreak == false )
 with expansion:
   false == false
 
-TestMain.cpp:100:
+TestMain.cpp:101:
 PASSED:
   CHECK( config.cutoff == -1 )
 with expansion:
   -1 == -1
 
-TestMain.cpp:101:
+TestMain.cpp:102:
 PASSED:
   CHECK( config.allowThrows == true )
 with expansion:
   true == true
 
-TestMain.cpp:102:
+TestMain.cpp:103:
 PASSED:
   CHECK( config.reporter.empty() )
 with expansion:
@@ -3167,23 +3344,23 @@ selftest/parser/2
   -t/1
 ...............................................................................
 
-TestMain.cpp:108:
+TestMain.cpp:109:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:110:
+TestMain.cpp:111:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:111:
+TestMain.cpp:112:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:112:
+TestMain.cpp:113:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
@@ -3195,23 +3372,23 @@ selftest/parser/2
   -t/exclude:1
 ...............................................................................
 
-TestMain.cpp:116:
+TestMain.cpp:117:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:118:
+TestMain.cpp:119:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:119:
+TestMain.cpp:120:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:120:
+TestMain.cpp:121:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -3223,23 +3400,23 @@ selftest/parser/2
   --test/1
 ...............................................................................
 
-TestMain.cpp:125:
+TestMain.cpp:126:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:127:
+TestMain.cpp:128:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:128:
+TestMain.cpp:129:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:129:
+TestMain.cpp:130:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
@@ -3251,23 +3428,23 @@ selftest/parser/2
   --test/exclude:1
 ...............................................................................
 
-TestMain.cpp:134:
+TestMain.cpp:135:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:136:
+TestMain.cpp:137:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:137:
+TestMain.cpp:138:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:138:
+TestMain.cpp:139:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -3279,23 +3456,23 @@ selftest/parser/2
   --test/exclude:2
 ...............................................................................
 
-TestMain.cpp:143:
+TestMain.cpp:144:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:145:
+TestMain.cpp:146:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:146:
+TestMain.cpp:147:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:147:
+TestMain.cpp:148:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -3307,29 +3484,29 @@ selftest/parser/2
   -t/2
 ...............................................................................
 
-TestMain.cpp:152:
+TestMain.cpp:153:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:154:
+TestMain.cpp:155:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:155:
+TestMain.cpp:156:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:156:
+TestMain.cpp:157:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
   true
 
-TestMain.cpp:157:
+TestMain.cpp:158:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) )
 with expansion:
@@ -3341,7 +3518,7 @@ selftest/parser/2
   -t/0
 ...............................................................................
 
-TestMain.cpp:162:
+TestMain.cpp:163:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) )
 with expansion:
@@ -3354,11 +3531,11 @@ selftest/parser/2
   -r/console
 ...............................................................................
 
-TestMain.cpp:169:
+TestMain.cpp:170:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:171:
+TestMain.cpp:172:
 PASSED:
   REQUIRE( config.reporter == "console" )
 with expansion:
@@ -3370,11 +3547,11 @@ selftest/parser/2
   -r/xml
 ...............................................................................
 
-TestMain.cpp:175:
+TestMain.cpp:176:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:177:
+TestMain.cpp:178:
 PASSED:
   REQUIRE( config.reporter == "xml" )
 with expansion:
@@ -3386,11 +3563,11 @@ selftest/parser/2
   --reporter/junit
 ...............................................................................
 
-TestMain.cpp:181:
+TestMain.cpp:182:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:183:
+TestMain.cpp:184:
 PASSED:
   REQUIRE( config.reporter == "junit" )
 with expansion:
@@ -3402,7 +3579,7 @@ selftest/parser/2
   -r/error
 ...............................................................................
 
-TestMain.cpp:187:
+TestMain.cpp:188:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) )
 with expansion:
@@ -3415,11 +3592,11 @@ selftest/parser/2
   -b
 ...............................................................................
 
-TestMain.cpp:194:
+TestMain.cpp:195:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:196:
+TestMain.cpp:197:
 PASSED:
   REQUIRE( config.shouldDebugBreak == true )
 with expansion:
@@ -3431,11 +3608,11 @@ selftest/parser/2
   --break
 ...............................................................................
 
-TestMain.cpp:200:
+TestMain.cpp:201:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:202:
+TestMain.cpp:203:
 PASSED:
   REQUIRE( config.shouldDebugBreak )
 with expansion:
@@ -3447,7 +3624,7 @@ selftest/parser/2
   -b
 ...............................................................................
 
-TestMain.cpp:206:
+TestMain.cpp:207:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) )
 with expansion:
@@ -3460,11 +3637,11 @@ selftest/parser/2
   -a
 ...............................................................................
 
-TestMain.cpp:213:
+TestMain.cpp:214:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:215:
+TestMain.cpp:216:
 PASSED:
   REQUIRE( config.cutoff == 1 )
 with expansion:
@@ -3476,11 +3653,11 @@ selftest/parser/2
   -a/2
 ...............................................................................
 
-TestMain.cpp:219:
+TestMain.cpp:220:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:221:
+TestMain.cpp:222:
 PASSED:
   REQUIRE( config.cutoff == 2 )
 with expansion:
@@ -3492,7 +3669,7 @@ selftest/parser/2
   -a/error/0
 ...............................................................................
 
-TestMain.cpp:225:
+TestMain.cpp:226:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
@@ -3505,7 +3682,7 @@ selftest/parser/2
   -a/error/non numeric
 ...............................................................................
 
-TestMain.cpp:229:
+TestMain.cpp:230:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
@@ -3518,7 +3695,7 @@ selftest/parser/2
   -a/error/two args
 ...............................................................................
 
-TestMain.cpp:233:
+TestMain.cpp:234:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) )
 with expansion:
@@ -3531,11 +3708,11 @@ selftest/parser/2
   -nt
 ...............................................................................
 
-TestMain.cpp:240:
+TestMain.cpp:241:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:242:
+TestMain.cpp:243:
 PASSED:
   REQUIRE( config.allowThrows == false )
 with expansion:
@@ -3547,11 +3724,11 @@ selftest/parser/2
   --nothrow
 ...............................................................................
 
-TestMain.cpp:246:
+TestMain.cpp:247:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:248:
+TestMain.cpp:249:
 PASSED:
   REQUIRE( config.allowThrows == false )
 with expansion:
@@ -3563,17 +3740,17 @@ selftest/parser/2
   -o filename
 ...............................................................................
 
-TestMain.cpp:255:
+TestMain.cpp:256:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:257:
+TestMain.cpp:258:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
   "filename.ext" == "filename.ext"
 
-TestMain.cpp:258:
+TestMain.cpp:259:
 PASSED:
   REQUIRE( config.stream.empty() )
 with expansion:
@@ -3585,17 +3762,17 @@ selftest/parser/2
   -o %stdout
 ...............................................................................
 
-TestMain.cpp:262:
+TestMain.cpp:263:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:264:
+TestMain.cpp:265:
 PASSED:
   REQUIRE( config.stream == "stdout" )
 with expansion:
   "stdout" == "stdout"
 
-TestMain.cpp:265:
+TestMain.cpp:266:
 PASSED:
   REQUIRE( config.outputFilename.empty() )
 with expansion:
@@ -3607,11 +3784,11 @@ selftest/parser/2
   --out
 ...............................................................................
 
-TestMain.cpp:269:
+TestMain.cpp:270:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:271:
+TestMain.cpp:272:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -3623,23 +3800,23 @@ selftest/parser/2
   -a -b
 ...............................................................................
 
-TestMain.cpp:278:
+TestMain.cpp:279:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-TestMain.cpp:280:
+TestMain.cpp:281:
 PASSED:
   CHECK( config.cutoff == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:281:
+TestMain.cpp:282:
 PASSED:
   CHECK( config.shouldDebugBreak )
 with expansion:
   true
 
-TestMain.cpp:282:
+TestMain.cpp:283:
 PASSED:
   CHECK( config.allowThrows == false )
 with expansion:
@@ -3649,37 +3826,37 @@ with expansion:
 selftest/test filter
 ...............................................................................
 
-TestMain.cpp:291:
+TestMain.cpp:292:
 PASSED:
   CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:292:
+TestMain.cpp:293:
 PASSED:
   CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:297:
+TestMain.cpp:298:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:298:
+TestMain.cpp:299:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:300:
+TestMain.cpp:301:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
 with expansion:
   true
 
-TestMain.cpp:301:
+TestMain.cpp:302:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
 with expansion:
@@ -3689,25 +3866,25 @@ with expansion:
 selftest/test filters
 ...............................................................................
 
-TestMain.cpp:312:
+TestMain.cpp:313:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-TestMain.cpp:314:
+TestMain.cpp:315:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:315:
+TestMain.cpp:316:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-TestMain.cpp:316:
+TestMain.cpp:317:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
 with expansion:
@@ -3717,13 +3894,13 @@ with expansion:
 selftest/filter/prefix wildcard
 ...............................................................................
 
-TestMain.cpp:322:
+TestMain.cpp:323:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-TestMain.cpp:323:
+TestMain.cpp:324:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
 with expansion:
@@ -3733,25 +3910,25 @@ with expansion:
 selftest/filter/wildcard at both ends
 ...............................................................................
 
-TestMain.cpp:328:
+TestMain.cpp:329:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-TestMain.cpp:329:
+TestMain.cpp:330:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
 with expansion:
   true
 
-TestMain.cpp:330:
+TestMain.cpp:331:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
 with expansion:
   true
 
-TestMain.cpp:331:
+TestMain.cpp:332:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
 with expansion:
@@ -3761,23 +3938,23 @@ with expansion:
 selftest/option parsers
 ...............................................................................
 
-TestMain.cpp:351:
+TestMain.cpp:352:
 PASSED:
   CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) )
 
-TestMain.cpp:353:
+TestMain.cpp:354:
 PASSED:
   REQUIRE( config.filters.size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:354:
+TestMain.cpp:355:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:355:
+TestMain.cpp:356:
 PASSED:
   REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
@@ -3788,49 +3965,49 @@ selftest/tags
   one tag
 ...............................................................................
 
-TestMain.cpp:369:
+TestMain.cpp:370:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:370:
+TestMain.cpp:371:
 PASSED:
   CHECK( oneTag.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:371:
+TestMain.cpp:372:
 PASSED:
   CHECK( oneTag.getTags().size() == 1 )
 with expansion:
   1 == 1
 
-TestMain.cpp:373:
+TestMain.cpp:374:
 PASSED:
   CHECK( oneTag.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:374:
+TestMain.cpp:375:
 PASSED:
   CHECK( oneTag.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:375:
+TestMain.cpp:376:
 PASSED:
   CHECK( oneTag.matchesTags( p3 ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:376:
+TestMain.cpp:377:
 PASSED:
   CHECK( oneTag.matchesTags( p4 ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:377:
+TestMain.cpp:378:
 PASSED:
   CHECK( oneTag.matchesTags( p5 ) == false )
 with expansion:
@@ -3841,61 +4018,67 @@ selftest/tags
   two tags
 ...............................................................................
 
-TestMain.cpp:383:
+TestMain.cpp:384:
 PASSED:
   CHECK( twoTags.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:384:
+TestMain.cpp:385:
 PASSED:
   CHECK( twoTags.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:385:
+TestMain.cpp:386:
 PASSED:
   CHECK( twoTags.hasTag( "two" ) )
 with expansion:
   true
 
-TestMain.cpp:386:
+TestMain.cpp:387:
+PASSED:
+  CHECK( twoTags.hasTag( "Two" ) )
+with expansion:
+  true
+
+TestMain.cpp:388:
 PASSED:
   CHECK( twoTags.hasTag( "three" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:387:
+TestMain.cpp:389:
 PASSED:
   CHECK( twoTags.getTags().size() == 2 )
 with expansion:
   2 == 2
 
-TestMain.cpp:389:
+TestMain.cpp:391:
 PASSED:
   CHECK( twoTags.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:390:
+TestMain.cpp:392:
 PASSED:
   CHECK( twoTags.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:391:
+TestMain.cpp:393:
 PASSED:
   CHECK( twoTags.matchesTags( p3 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:392:
+TestMain.cpp:394:
 PASSED:
   CHECK( twoTags.matchesTags( p4 ) == true )
 with expansion:
   true == true
 
-TestMain.cpp:393:
+TestMain.cpp:395:
 PASSED:
   CHECK( twoTags.matchesTags( p5 ) == true )
 with expansion:
@@ -3906,25 +4089,25 @@ selftest/tags
   one tag with characters either side
 ...............................................................................
 
-TestMain.cpp:399:
+TestMain.cpp:401:
 PASSED:
   CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
 with expansion:
   "1234" == "1234"
 
-TestMain.cpp:400:
+TestMain.cpp:402:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "one" ) )
 with expansion:
   true
 
-TestMain.cpp:401:
+TestMain.cpp:403:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "two" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:402:
+TestMain.cpp:404:
 PASSED:
   CHECK( oneTagWithExtras.getTags().size() == 1 )
 with expansion:
@@ -3935,19 +4118,19 @@ selftest/tags
   start of a tag, but not closed
 ...............................................................................
 
-TestMain.cpp:409:
+TestMain.cpp:411:
 PASSED:
   CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
 with expansion:
   "[one" == "[one"
 
-TestMain.cpp:410:
+TestMain.cpp:412:
 PASSED:
   CHECK( oneTagOpen.hasTag( "one" ) == false )
 with expansion:
   false == false
 
-TestMain.cpp:411:
+TestMain.cpp:413:
 PASSED:
   CHECK( oneTagOpen.getTags().size() == 0 )
 with expansion:
@@ -3958,30 +4141,239 @@ selftest/tags
   hidden
 ...............................................................................
 
-TestMain.cpp:417:
+TestMain.cpp:419:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-TestMain.cpp:418:
+TestMain.cpp:420:
 PASSED:
   CHECK( oneTag.hasTag( "hide" ) )
 with expansion:
   true
 
-TestMain.cpp:419:
+TestMain.cpp:421:
 PASSED:
   CHECK( oneTag.isHidden() )
 with expansion:
   true
 
-TestMain.cpp:421:
+TestMain.cpp:423:
 PASSED:
   CHECK( oneTag.matchesTags( "~[hide]" ) == false )
 with expansion:
   false == false
 
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  No wrapping
+...............................................................................
+
+TestMain.cpp:433:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 80, 0 ) == testString )
+with expansion:
+  "one two three four"
+  ==
+  "one two three four"
+
+TestMain.cpp:434:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 18, 0 ) == testString )
+with expansion:
+  "one two three four"
+  ==
+  "one two three four"
+
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  Wrapped once
+...............................................................................
+
+TestMain.cpp:437:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 17, 0 ) == "one two three\nfour" )
+with expansion:
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
+
+TestMain.cpp:438:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 16, 0 ) == "one two three\nfour" )
+with expansion:
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
+
+TestMain.cpp:439:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 15, 0 ) == "one two three\nfour" )
+with expansion:
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
+
+TestMain.cpp:440:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 14, 0 ) == "one two three\nfour" )
+with expansion:
+  "one two three
+  four"
+  ==
+  "one two three
+  four"
+
+TestMain.cpp:441:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 13, 0 ) == "one two\nthree four" )
+with expansion:
+  "one two
+  three four"
+  ==
+  "one two
+  three four"
+
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  Wrapped twice
+...............................................................................
+
+TestMain.cpp:444:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 9, 0 ) == "one two\nthree\nfour" )
+with expansion:
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
+
+TestMain.cpp:445:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 8, 0 ) == "one two\nthree\nfour" )
+with expansion:
+  "one two
+  three
+  four"
+  ==
+  "one two
+  three
+  four"
+
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  Wrapped three times
+...............................................................................
+
+TestMain.cpp:448:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 7, 0 ) == "one\ntwo\nthree\nfour" )
+with expansion:
+  "one
+  two
+  three
+  four"
+  ==
+  "one
+  two
+  three
+  four"
+
+TestMain.cpp:449:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 5, 0 ) == "one\ntwo\nthree\nfour" )
+with expansion:
+  "one
+  two
+  three
+  four"
+  ==
+  "one
+  two
+  three
+  four"
+
+-------------------------------------------------------------------------------
+Long strings can be wrapped
+  Short wrap
+...............................................................................
+
+TestMain.cpp:452:
+PASSED:
+  CHECK( Catch::wrapLongStrings( "abcdef", 4, 0 ) == "abc-\ndef" )
+with expansion:
+  "abc-
+  def"
+  ==
+  "abc-
+  def"
+
+TestMain.cpp:453:
+PASSED:
+  CHECK( Catch::wrapLongStrings( "abcdefg", 4, 0 ) == "abc-\ndefg" )
+with expansion:
+  "abc-
+  defg"
+  ==
+  "abc-
+  defg"
+
+TestMain.cpp:454:
+PASSED:
+  CHECK( Catch::wrapLongStrings( "abcdefgh", 4, 0 ) == "abc-\ndef-\ngh" )
+with expansion:
+  "abc-
+  def-
+  gh"
+  ==
+  "abc-
+  def-
+  gh"
+
+TestMain.cpp:456:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 4, 0 ) == "one\ntwo\nthr-\nee\nfour" )
+with expansion:
+  "one
+  two
+  thr-
+  ee
+  four"
+  ==
+  "one
+  two
+  thr-
+  ee
+  four"
+
+TestMain.cpp:457:
+PASSED:
+  CHECK( Catch::wrapLongStrings( testString, 3, 0 ) == "one\ntwo\nth-\nree\nfo-\nur" )
+with expansion:
+  "one
+  two
+  th-
+  ree
+  fo-
+  ur"
+  ==
+  "one
+  two
+  th-
+  ree
+  fo-
+  ur"
+
 -------------------------------------------------------------------------------
 ./succeeding/Tricky/std::pair
 ...............................................................................
@@ -4312,7 +4704,7 @@ with message:
   no assertions
 
 ===============================================================================
-104 test cases - 47 failed (628 assertions - 104 failed)
+106 test cases - 47 failed (666 assertions - 104 failed)
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4607,7 +4999,7 @@ with expansion:
 13 test cases - 3 failed (40 assertions - 4 failed)
 
 <testsuites>
-  <testsuite name="~dummy" errors="9" failures="77" tests="628" hostname="tbd" time="tbd" timestamp="tbd">
+  <testsuite name="~dummy" errors="9" failures="77" tests="666" hostname="tbd" time="tbd" timestamp="tbd">
     <testcase classname="global" name="./succeeding/Approx/simple" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/epsilon" time="tbd"/>
     <testcase classname="global" name="./succeeding/Approx/float" time="tbd"/>
@@ -4756,16 +5148,10 @@ ConditionTests.cpp:174
     <testcase classname="global" name="./succeeding/conditions/not" time="tbd"/>
     <testcase classname="global" name="./failing/conditions/not" time="tbd">
       <failure message="false != false" type="CHECK">
-ConditionTests.cpp:334
+ConditionTests.cpp:337
       </failure>
       <failure message="true != true" type="CHECK">
-ConditionTests.cpp:335
-      </failure>
-      <failure message="false" type="CHECK">
-ConditionTests.cpp:336
-      </failure>
-      <failure message="!true" type="CHECK_FALSE">
-ConditionTests.cpp:337
+ConditionTests.cpp:338
       </failure>
       <failure message="false" type="CHECK">
 ConditionTests.cpp:339
@@ -4776,9 +5162,15 @@ ConditionTests.cpp:340
       <failure message="false" type="CHECK">
 ConditionTests.cpp:342
       </failure>
-      <failure message="!(1 == 1)" type="CHECK_FALSE">
+      <failure message="!true" type="CHECK_FALSE">
 ConditionTests.cpp:343
       </failure>
+      <failure message="false" type="CHECK">
+ConditionTests.cpp:345
+      </failure>
+      <failure message="!(1 == 1)" type="CHECK_FALSE">
+ConditionTests.cpp:346
+      </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/explicit" time="tbd"/>
     <testcase classname="global" name="./failing/exceptions/explicit" time="tbd">
@@ -4815,17 +5207,17 @@ ExceptionTests.cpp:106
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="tbd">
       <error message="throw CustomException( &quot;unexpected custom exception&quot; )" type="REQUIRE_NOTHROW">
-ExceptionTests.cpp:113
+ExceptionTests.cpp:116
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/throw" time="tbd">
       <error message="throw CustomException( &quot;custom exception - not std&quot; )" type="REQUIRE_THROWS_AS">
-ExceptionTests.cpp:118
+ExceptionTests.cpp:121
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/double" time="tbd">
       <error type="TEST_CASE">
-ExceptionTests.cpp:122
+ExceptionTests.cpp:125
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="tbd"/>
@@ -4990,6 +5382,7 @@ MiscTests.cpp:278
     </testcase>
     <testcase classname="global" name="first tag" time="tbd"/>
     <testcase classname="global" name="second tag" time="tbd"/>
+    <testcase classname="global" name="vectors can be sized and resized" time="tbd"/>
     <testcase classname="global" name="selftest/main" time="tbd">
       <system-out>
 Message from section one
@@ -5012,6 +5405,7 @@ An error
     <testcase classname="global" name="selftest/filter/wildcard at both ends" time="tbd"/>
     <testcase classname="global" name="selftest/option parsers" time="tbd"/>
     <testcase classname="global" name="selftest/tags" time="tbd"/>
+    <testcase classname="global" name="Long strings can be wrapped" time="tbd"/>
     <testcase classname="global" name="./succeeding/Tricky/std::pair" time="tbd"/>
     <testcase classname="global" name="./inprogress/failing/Tricky/trailing expression" time="tbd">
       <warning type="WARN">
@@ -6054,7 +6448,7 @@ ConditionTests.cpp" line="202">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions//long_to_unsigned_x">
-ConditionTests.cpp" line="223">
+ConditionTests.cpp" line="226">
         <Original>
           long_var == unsigned_char_var
         </Original>
@@ -6062,7 +6456,7 @@ ConditionTests.cpp" line="223">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="224">
+ConditionTests.cpp" line="227">
         <Original>
           long_var == unsigned_short_var
         </Original>
@@ -6070,7 +6464,7 @@ ConditionTests.cpp" line="224">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="225">
+ConditionTests.cpp" line="228">
         <Original>
           long_var == unsigned_int_var
         </Original>
@@ -6078,7 +6472,7 @@ ConditionTests.cpp" line="225">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="226">
+ConditionTests.cpp" line="229">
         <Original>
           long_var == unsigned_long_var
         </Original>
@@ -6089,7 +6483,7 @@ ConditionTests.cpp" line="226">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/const ints to int literal">
-ConditionTests.cpp" line="237">
+ConditionTests.cpp" line="240">
         <Original>
           unsigned_char_var == 1
         </Original>
@@ -6097,7 +6491,7 @@ ConditionTests.cpp" line="237">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="238">
+ConditionTests.cpp" line="241">
         <Original>
           unsigned_short_var == 1
         </Original>
@@ -6105,7 +6499,7 @@ ConditionTests.cpp" line="238">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="239">
+ConditionTests.cpp" line="242">
         <Original>
           unsigned_int_var == 1
         </Original>
@@ -6113,7 +6507,7 @@ ConditionTests.cpp" line="239">
           1 == 1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="240">
+ConditionTests.cpp" line="243">
         <Original>
           unsigned_long_var == 1
         </Original>
@@ -6124,7 +6518,7 @@ ConditionTests.cpp" line="240">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/negative ints">
-ConditionTests.cpp" line="246">
+ConditionTests.cpp" line="249">
         <Original>
           ( -1 > 2u )
         </Original>
@@ -6132,7 +6526,7 @@ ConditionTests.cpp" line="246">
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="247">
+ConditionTests.cpp" line="250">
         <Original>
           -1 > 2u
         </Original>
@@ -6140,7 +6534,7 @@ ConditionTests.cpp" line="247">
           -1 > 2
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="249">
+ConditionTests.cpp" line="252">
         <Original>
           ( 2u &lt; -1 )
         </Original>
@@ -6148,7 +6542,7 @@ ConditionTests.cpp" line="249">
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="250">
+ConditionTests.cpp" line="253">
         <Original>
           2u &lt; -1
         </Original>
@@ -6156,7 +6550,7 @@ ConditionTests.cpp" line="250">
           2 &lt; -1
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="253">
+ConditionTests.cpp" line="256">
         <Original>
           ( minInt > 2u )
         </Original>
@@ -6164,7 +6558,7 @@ ConditionTests.cpp" line="253">
           true
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="254">
+ConditionTests.cpp" line="257">
         <Original>
           minInt > 2u
         </Original>
@@ -6175,7 +6569,7 @@ ConditionTests.cpp" line="254">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/computed ints">
-ConditionTests.cpp" line="269">
+ConditionTests.cpp" line="272">
         <Original>
           54 == 6*9
         </Original>
@@ -6186,7 +6580,7 @@ ConditionTests.cpp" line="269">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/ptr">
-ConditionTests.cpp" line="285">
+ConditionTests.cpp" line="288">
         <Original>
           p == __null
         </Original>
@@ -6194,7 +6588,7 @@ ConditionTests.cpp" line="285">
           __null == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="286">
+ConditionTests.cpp" line="289">
         <Original>
           p == pNULL
         </Original>
@@ -6202,7 +6596,7 @@ ConditionTests.cpp" line="286">
           __null == __null
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="291">
+ConditionTests.cpp" line="294">
         <Original>
           p != __null
         </Original>
@@ -6210,7 +6604,7 @@ ConditionTests.cpp" line="291">
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="294">
+ConditionTests.cpp" line="297">
         <Original>
           cp != __null
         </Original>
@@ -6218,7 +6612,7 @@ ConditionTests.cpp" line="294">
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="297">
+ConditionTests.cpp" line="300">
         <Original>
           cpc != __null
         </Original>
@@ -6226,7 +6620,7 @@ ConditionTests.cpp" line="297">
           0x<hex digits> != 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="299">
+ConditionTests.cpp" line="302">
         <Original>
           returnsNull() == __null
         </Original>
@@ -6234,7 +6628,7 @@ ConditionTests.cpp" line="299">
           {null string} == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="300">
+ConditionTests.cpp" line="303">
         <Original>
           returnsConstNull() == __null
         </Original>
@@ -6242,7 +6636,7 @@ ConditionTests.cpp" line="300">
           {null string} == 0
         </Expanded>
       </Expression>
-ConditionTests.cpp" line="302">
+ConditionTests.cpp" line="305">
         <Original>
           __null != p
         </Original>
@@ -6253,41 +6647,25 @@ ConditionTests.cpp" line="302">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./succeeding/conditions/not">
-ConditionTests.cpp" line="317">
-        <Original>
-          false == false
-        </Original>
-        <Expanded>
-          false == false
-        </Expanded>
-      </Expression>
-ConditionTests.cpp" line="318">
-        <Original>
-          true == true
-        </Original>
-        <Expanded>
-          true == true
-        </Expanded>
-      </Expression>
-ConditionTests.cpp" line="319">
-        <Original>
-          !false
-        </Original>
-        <Expanded>
-          true
-        </Expanded>
-      </Expression>
 ConditionTests.cpp" line="320">
         <Original>
-          !false
+          false == false
         </Original>
         <Expanded>
-          !false
+          false == false
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="321">
+        <Original>
+          true == true
+        </Original>
+        <Expanded>
+          true == true
         </Expanded>
       </Expression>
 ConditionTests.cpp" line="322">
         <Original>
-          !falseValue
+          !false
         </Original>
         <Expanded>
           true
@@ -6295,7 +6673,7 @@ ConditionTests.cpp" line="322">
       </Expression>
 ConditionTests.cpp" line="323">
         <Original>
-          !falseValue
+          !false
         </Original>
         <Expanded>
           !false
@@ -6303,13 +6681,29 @@ ConditionTests.cpp" line="323">
       </Expression>
 ConditionTests.cpp" line="325">
         <Original>
-          !(1 == 2)
+          !falseValue
         </Original>
         <Expanded>
           true
         </Expanded>
       </Expression>
 ConditionTests.cpp" line="326">
+        <Original>
+          !falseValue
+        </Original>
+        <Expanded>
+          !false
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="328">
+        <Original>
+          !(1 == 2)
+        </Original>
+        <Expanded>
+          true
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="329">
         <Original>
           !1 == 2
         </Original>
@@ -6320,41 +6714,25 @@ ConditionTests.cpp" line="326">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="./failing/conditions/not">
-ConditionTests.cpp" line="334">
-        <Original>
-          false != false
-        </Original>
-        <Expanded>
-          false != false
-        </Expanded>
-      </Expression>
-ConditionTests.cpp" line="335">
-        <Original>
-          true != true
-        </Original>
-        <Expanded>
-          true != true
-        </Expanded>
-      </Expression>
-ConditionTests.cpp" line="336">
-        <Original>
-          !true
-        </Original>
-        <Expanded>
-          false
-        </Expanded>
-      </Expression>
 ConditionTests.cpp" line="337">
         <Original>
-          !true
+          false != false
         </Original>
         <Expanded>
-          !true
+          false != false
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="338">
+        <Original>
+          true != true
+        </Original>
+        <Expanded>
+          true != true
         </Expanded>
       </Expression>
 ConditionTests.cpp" line="339">
         <Original>
-          !trueValue
+          !true
         </Original>
         <Expanded>
           false
@@ -6362,7 +6740,7 @@ ConditionTests.cpp" line="339">
       </Expression>
 ConditionTests.cpp" line="340">
         <Original>
-          !trueValue
+          !true
         </Original>
         <Expanded>
           !true
@@ -6370,13 +6748,29 @@ ConditionTests.cpp" line="340">
       </Expression>
 ConditionTests.cpp" line="342">
         <Original>
-          !(1 == 1)
+          !trueValue
         </Original>
         <Expanded>
           false
         </Expanded>
       </Expression>
 ConditionTests.cpp" line="343">
+        <Original>
+          !trueValue
+        </Original>
+        <Expanded>
+          !true
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="345">
+        <Original>
+          !(1 == 1)
+        </Original>
+        <Expanded>
+          false
+        </Expanded>
+      </Expression>
+ConditionTests.cpp" line="346">
         <Original>
           !1 == 1
         </Original>
@@ -6493,41 +6887,41 @@ ExceptionTests.cpp" line="106">
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/nothrow">
-ExceptionTests.cpp" line="113">
+ExceptionTests.cpp" line="116">
         <Original>
           throw CustomException( &quot;unexpected custom exception&quot; )
         </Original>
         <Expanded>
           throw CustomException( &quot;unexpected custom exception&quot; )
         </Expanded>
-ExceptionTests.cpp" line="113">
+ExceptionTests.cpp" line="116">
           unexpected custom exception
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/throw">
-ExceptionTests.cpp" line="118">
+ExceptionTests.cpp" line="121">
         <Original>
           throw CustomException( &quot;custom exception - not std&quot; )
         </Original>
         <Expanded>
           throw CustomException( &quot;custom exception - not std&quot; )
         </Expanded>
-ExceptionTests.cpp" line="118">
+ExceptionTests.cpp" line="121">
           custom exception - not std
         </Exception>
       </Expression>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./failing/exceptions/custom/double">
-ExceptionTests.cpp" line="122">
+ExceptionTests.cpp" line="125">
         3.14
       </Exception>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="./succeeding/exceptions/notimplemented">
-ExceptionTests.cpp" line="133">
+ExceptionTests.cpp" line="136">
         <Original>
           thisFunctionNotImplemented( 7 )
         </Original>
@@ -8438,6 +8832,195 @@ MiscTests.cpp" line="269">
     <TestCase name="second tag">
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="vectors can be sized and resized">
+MiscTests.cpp" line="300">
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+MiscTests.cpp" line="301">
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing bigger changes size and capacity">
+MiscTests.cpp" line="306">
+          <Original>
+            v.size() == 10
+          </Original>
+          <Expanded>
+            10 == 10
+          </Expanded>
+        </Expression>
+MiscTests.cpp" line="307">
+          <Original>
+            v.capacity() >= 10
+          </Original>
+          <Expanded>
+            10 >= 10
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+MiscTests.cpp" line="300">
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+MiscTests.cpp" line="301">
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing smaller changes size but not capacity">
+MiscTests.cpp" line="312">
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+MiscTests.cpp" line="313">
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <Section name="We can use the 'swap trick' to reset the capacity">
+MiscTests.cpp" line="319">
+            <Original>
+              v.capacity() == 0
+            </Original>
+            <Expanded>
+              0 == 0
+            </Expanded>
+          </Expression>
+          <OverallResults successes="1" failures="0"/>
+        </Section>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+MiscTests.cpp" line="300">
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+MiscTests.cpp" line="301">
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="resizing smaller changes size but not capacity">
+MiscTests.cpp" line="312">
+          <Original>
+            v.size() == 0
+          </Original>
+          <Expanded>
+            0 == 0
+          </Expanded>
+        </Expression>
+MiscTests.cpp" line="313">
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+MiscTests.cpp" line="300">
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+MiscTests.cpp" line="301">
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="reserving bigger changes capacity but not size">
+MiscTests.cpp" line="325">
+          <Original>
+            v.size() == 5
+          </Original>
+          <Expanded>
+            5 == 5
+          </Expanded>
+        </Expression>
+MiscTests.cpp" line="326">
+          <Original>
+            v.capacity() >= 10
+          </Original>
+          <Expanded>
+            10 >= 10
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+MiscTests.cpp" line="300">
+        <Original>
+          v.size() == 5
+        </Original>
+        <Expanded>
+          5 == 5
+        </Expanded>
+      </Expression>
+MiscTests.cpp" line="301">
+        <Original>
+          v.capacity() >= 5
+        </Original>
+        <Expanded>
+          5 >= 5
+        </Expanded>
+      </Expression>
+      <Section name="reserving smaller does not change size or capacity">
+MiscTests.cpp" line="331">
+          <Original>
+            v.size() == 5
+          </Original>
+          <Expanded>
+            5 == 5
+          </Expanded>
+        </Expression>
+MiscTests.cpp" line="332">
+          <Original>
+            v.capacity() >= 5
+          </Original>
+          <Expanded>
+            5 >= 5
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="selftest/main">
       <Section name="selftest/expected result" description="Tests do what they claim">
         <Section name="selftest/expected result/failing tests" description="Tests in the 'failing' branch fail">
@@ -8456,7 +9039,7 @@ MiscTests.cpp" line="269">
       </Section>
       <Section name="selftest/test counts" description="Number of test cases that run is fixed">
         <Section name="selftest/test counts/succeeding tests" description="Number of 'succeeding' tests is fixed">
-TestMain.cpp" line="40">
+TestMain.cpp" line="41">
             <Original>
               totals.assertions.passed == 296
             </Original>
@@ -8464,7 +9047,7 @@ TestMain.cpp" line="40">
               296 == 296
             </Expanded>
           </Expression>
-TestMain.cpp" line="41">
+TestMain.cpp" line="42">
             <Original>
               totals.assertions.failed == 0
             </Original>
@@ -8478,7 +9061,7 @@ TestMain.cpp" line="41">
       </Section>
       <Section name="selftest/test counts" description="Number of test cases that run is fixed">
         <Section name="selftest/test counts/failing tests" description="Number of 'failing' tests is fixed">
-TestMain.cpp" line="47">
+TestMain.cpp" line="48">
             <Original>
               totals.assertions.passed == 1
             </Original>
@@ -8486,7 +9069,7 @@ TestMain.cpp" line="47">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="48">
+TestMain.cpp" line="49">
             <Original>
               totals.assertions.failed == 73
             </Original>
@@ -8501,7 +9084,7 @@ TestMain.cpp" line="48">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="meta/Misc/Sections">
-TestMain.cpp" line="57">
+TestMain.cpp" line="58">
         <Original>
           totals.assertions.passed == 2
         </Original>
@@ -8509,7 +9092,7 @@ TestMain.cpp" line="57">
           2 == 2
         </Expanded>
       </Expression>
-TestMain.cpp" line="58">
+TestMain.cpp" line="59">
         <Original>
           totals.assertions.failed == 1
         </Original>
@@ -8521,7 +9104,7 @@ TestMain.cpp" line="58">
     </TestCase>
     <TestCase name="selftest/parser/2">
       <Section name="default">
-TestMain.cpp" line="97">
+TestMain.cpp" line="98">
           <Original>
             parseIntoConfig( argv, config )
           </Original>
@@ -8529,7 +9112,7 @@ TestMain.cpp" line="97">
             parseIntoConfig( argv, config )
           </Expanded>
         </Expression>
-TestMain.cpp" line="99">
+TestMain.cpp" line="100">
           <Original>
             config.shouldDebugBreak == false
           </Original>
@@ -8537,7 +9120,7 @@ TestMain.cpp" line="99">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="100">
+TestMain.cpp" line="101">
           <Original>
             config.cutoff == -1
           </Original>
@@ -8545,7 +9128,7 @@ TestMain.cpp" line="100">
             -1 == -1
           </Expanded>
         </Expression>
-TestMain.cpp" line="101">
+TestMain.cpp" line="102">
           <Original>
             config.allowThrows == true
           </Original>
@@ -8553,7 +9136,7 @@ TestMain.cpp" line="101">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="102">
+TestMain.cpp" line="103">
           <Original>
             config.reporter.empty()
           </Original>
@@ -8565,7 +9148,7 @@ TestMain.cpp" line="102">
       </Section>
       <Section name="test lists">
         <Section name="-t/1" description="Specify one test case using -t">
-TestMain.cpp" line="108">
+TestMain.cpp" line="109">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8573,7 +9156,7 @@ TestMain.cpp" line="108">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="110">
+TestMain.cpp" line="111">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8581,7 +9164,7 @@ TestMain.cpp" line="110">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="111">
+TestMain.cpp" line="112">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -8589,7 +9172,7 @@ TestMain.cpp" line="111">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="112">
+TestMain.cpp" line="113">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -8603,7 +9186,7 @@ TestMain.cpp" line="112">
       </Section>
       <Section name="test lists">
         <Section name="-t/exclude:1" description="Specify one test case exclusion using -t exclude:">
-TestMain.cpp" line="116">
+TestMain.cpp" line="117">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8611,7 +9194,7 @@ TestMain.cpp" line="116">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="118">
+TestMain.cpp" line="119">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8619,7 +9202,7 @@ TestMain.cpp" line="118">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="119">
+TestMain.cpp" line="120">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -8627,7 +9210,7 @@ TestMain.cpp" line="119">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="120">
+TestMain.cpp" line="121">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -8641,7 +9224,7 @@ TestMain.cpp" line="120">
       </Section>
       <Section name="test lists">
         <Section name="--test/1" description="Specify one test case using --test">
-TestMain.cpp" line="125">
+TestMain.cpp" line="126">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8649,7 +9232,7 @@ TestMain.cpp" line="125">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="127">
+TestMain.cpp" line="128">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8657,7 +9240,7 @@ TestMain.cpp" line="127">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="128">
+TestMain.cpp" line="129">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -8665,7 +9248,7 @@ TestMain.cpp" line="128">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="129">
+TestMain.cpp" line="130">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -8679,7 +9262,7 @@ TestMain.cpp" line="129">
       </Section>
       <Section name="test lists">
         <Section name="--test/exclude:1" description="Specify one test case exclusion using --test exclude:">
-TestMain.cpp" line="134">
+TestMain.cpp" line="135">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8687,7 +9270,7 @@ TestMain.cpp" line="134">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="136">
+TestMain.cpp" line="137">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8695,7 +9278,7 @@ TestMain.cpp" line="136">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="137">
+TestMain.cpp" line="138">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -8703,7 +9286,7 @@ TestMain.cpp" line="137">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="138">
+TestMain.cpp" line="139">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -8717,7 +9300,7 @@ TestMain.cpp" line="138">
       </Section>
       <Section name="test lists">
         <Section name="--test/exclude:2" description="Specify one test case exclusion using --test ~">
-TestMain.cpp" line="143">
+TestMain.cpp" line="144">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8725,7 +9308,7 @@ TestMain.cpp" line="143">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="145">
+TestMain.cpp" line="146">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8733,7 +9316,7 @@ TestMain.cpp" line="145">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="146">
+TestMain.cpp" line="147">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) ) == false
             </Original>
@@ -8741,7 +9324,7 @@ TestMain.cpp" line="146">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="147">
+TestMain.cpp" line="148">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;alwaysIncluded&quot; ) )
             </Original>
@@ -8755,7 +9338,7 @@ TestMain.cpp" line="147">
       </Section>
       <Section name="test lists">
         <Section name="-t/2" description="Specify two test cases using -t">
-TestMain.cpp" line="152">
+TestMain.cpp" line="153">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8763,7 +9346,7 @@ TestMain.cpp" line="152">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="154">
+TestMain.cpp" line="155">
             <Original>
               config.filters.size() == 1
             </Original>
@@ -8771,7 +9354,7 @@ TestMain.cpp" line="154">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="155">
+TestMain.cpp" line="156">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
             </Original>
@@ -8779,7 +9362,7 @@ TestMain.cpp" line="155">
               false == false
             </Expanded>
           </Expression>
-TestMain.cpp" line="156">
+TestMain.cpp" line="157">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
             </Original>
@@ -8787,7 +9370,7 @@ TestMain.cpp" line="156">
               true
             </Expanded>
           </Expression>
-TestMain.cpp" line="157">
+TestMain.cpp" line="158">
             <Original>
               config.filters[0].shouldInclude( fakeTestCase( &quot;test2&quot; ) )
             </Original>
@@ -8801,7 +9384,7 @@ TestMain.cpp" line="157">
       </Section>
       <Section name="test lists">
         <Section name="-t/0" description="When no test names are supplied it is an error">
-TestMain.cpp" line="162">
+TestMain.cpp" line="163">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;at least 1&quot; )
             </Original>
@@ -8818,7 +9401,7 @@ TestMain.cpp" line="162">
       </Section>
       <Section name="reporter">
         <Section name="-r/console">
-TestMain.cpp" line="169">
+TestMain.cpp" line="170">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8826,7 +9409,7 @@ TestMain.cpp" line="169">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="171">
+TestMain.cpp" line="172">
             <Original>
               config.reporter == &quot;console&quot;
             </Original>
@@ -8840,7 +9423,7 @@ TestMain.cpp" line="171">
       </Section>
       <Section name="reporter">
         <Section name="-r/xml">
-TestMain.cpp" line="175">
+TestMain.cpp" line="176">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8848,7 +9431,7 @@ TestMain.cpp" line="175">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="177">
+TestMain.cpp" line="178">
             <Original>
               config.reporter == &quot;xml&quot;
             </Original>
@@ -8862,7 +9445,7 @@ TestMain.cpp" line="177">
       </Section>
       <Section name="reporter">
         <Section name="--reporter/junit">
-TestMain.cpp" line="181">
+TestMain.cpp" line="182">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8870,7 +9453,7 @@ TestMain.cpp" line="181">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="183">
+TestMain.cpp" line="184">
             <Original>
               config.reporter == &quot;junit&quot;
             </Original>
@@ -8884,7 +9467,7 @@ TestMain.cpp" line="183">
       </Section>
       <Section name="reporter">
         <Section name="-r/error" description="reporter config only accepts one argument">
-TestMain.cpp" line="187">
+TestMain.cpp" line="188">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;1 argument&quot; )
             </Original>
@@ -8901,7 +9484,7 @@ TestMain.cpp" line="187">
       </Section>
       <Section name="debugger">
         <Section name="-b">
-TestMain.cpp" line="194">
+TestMain.cpp" line="195">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8909,7 +9492,7 @@ TestMain.cpp" line="194">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="196">
+TestMain.cpp" line="197">
             <Original>
               config.shouldDebugBreak == true
             </Original>
@@ -8923,7 +9506,7 @@ TestMain.cpp" line="196">
       </Section>
       <Section name="debugger">
         <Section name="--break">
-TestMain.cpp" line="200">
+TestMain.cpp" line="201">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8931,7 +9514,7 @@ TestMain.cpp" line="200">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="202">
+TestMain.cpp" line="203">
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -8945,7 +9528,7 @@ TestMain.cpp" line="202">
       </Section>
       <Section name="debugger">
         <Section name="-b" description="break option has no arguments">
-TestMain.cpp" line="206">
+TestMain.cpp" line="207">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;0 arguments&quot; )
             </Original>
@@ -8962,7 +9545,7 @@ TestMain.cpp" line="206">
       </Section>
       <Section name="abort">
         <Section name="-a">
-TestMain.cpp" line="213">
+TestMain.cpp" line="214">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8970,7 +9553,7 @@ TestMain.cpp" line="213">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="215">
+TestMain.cpp" line="216">
             <Original>
               config.cutoff == 1
             </Original>
@@ -8984,7 +9567,7 @@ TestMain.cpp" line="215">
       </Section>
       <Section name="abort">
         <Section name="-a/2">
-TestMain.cpp" line="219">
+TestMain.cpp" line="220">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -8992,7 +9575,7 @@ TestMain.cpp" line="219">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="221">
+TestMain.cpp" line="222">
             <Original>
               config.cutoff == 2
             </Original>
@@ -9006,7 +9589,7 @@ TestMain.cpp" line="221">
       </Section>
       <Section name="abort">
         <Section name="-a/error/0">
-TestMain.cpp" line="225">
+TestMain.cpp" line="226">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
             </Original>
@@ -9020,7 +9603,7 @@ TestMain.cpp" line="225">
       </Section>
       <Section name="abort">
         <Section name="-a/error/non numeric">
-TestMain.cpp" line="229">
+TestMain.cpp" line="230">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;greater than zero&quot; )
             </Original>
@@ -9034,7 +9617,7 @@ TestMain.cpp" line="229">
       </Section>
       <Section name="abort">
         <Section name="-a/error/two args" description="cutoff only takes one argument">
-TestMain.cpp" line="233">
+TestMain.cpp" line="234">
             <Original>
               parseIntoConfigAndReturnError( argv, config ) Contains( &quot;0 and 1 argument&quot; )
             </Original>
@@ -9051,7 +9634,7 @@ TestMain.cpp" line="233">
       </Section>
       <Section name="nothrow">
         <Section name="-nt">
-TestMain.cpp" line="240">
+TestMain.cpp" line="241">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9059,7 +9642,7 @@ TestMain.cpp" line="240">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="242">
+TestMain.cpp" line="243">
             <Original>
               config.allowThrows == false
             </Original>
@@ -9073,7 +9656,7 @@ TestMain.cpp" line="242">
       </Section>
       <Section name="nothrow">
         <Section name="--nothrow">
-TestMain.cpp" line="246">
+TestMain.cpp" line="247">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9081,7 +9664,7 @@ TestMain.cpp" line="246">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="248">
+TestMain.cpp" line="249">
             <Original>
               config.allowThrows == false
             </Original>
@@ -9098,7 +9681,7 @@ TestMain.cpp" line="248">
       </Section>
       <Section name="streams">
         <Section name="-o filename">
-TestMain.cpp" line="255">
+TestMain.cpp" line="256">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9106,7 +9689,7 @@ TestMain.cpp" line="255">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="257">
+TestMain.cpp" line="258">
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -9114,7 +9697,7 @@ TestMain.cpp" line="257">
               &quot;filename.ext&quot; == &quot;filename.ext&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="258">
+TestMain.cpp" line="259">
             <Original>
               config.stream.empty()
             </Original>
@@ -9128,7 +9711,7 @@ TestMain.cpp" line="258">
       </Section>
       <Section name="streams">
         <Section name="-o %stdout">
-TestMain.cpp" line="262">
+TestMain.cpp" line="263">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9136,7 +9719,7 @@ TestMain.cpp" line="262">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="264">
+TestMain.cpp" line="265">
             <Original>
               config.stream == &quot;stdout&quot;
             </Original>
@@ -9144,7 +9727,7 @@ TestMain.cpp" line="264">
               &quot;stdout&quot; == &quot;stdout&quot;
             </Expanded>
           </Expression>
-TestMain.cpp" line="265">
+TestMain.cpp" line="266">
             <Original>
               config.outputFilename.empty()
             </Original>
@@ -9158,7 +9741,7 @@ TestMain.cpp" line="265">
       </Section>
       <Section name="streams">
         <Section name="--out">
-TestMain.cpp" line="269">
+TestMain.cpp" line="270">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9166,7 +9749,7 @@ TestMain.cpp" line="269">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="271">
+TestMain.cpp" line="272">
             <Original>
               config.outputFilename == &quot;filename.ext&quot;
             </Original>
@@ -9183,7 +9766,7 @@ TestMain.cpp" line="271">
       </Section>
       <Section name="combinations">
         <Section name="-a -b">
-TestMain.cpp" line="278">
+TestMain.cpp" line="279">
             <Original>
               parseIntoConfig( argv, config )
             </Original>
@@ -9191,7 +9774,7 @@ TestMain.cpp" line="278">
               parseIntoConfig( argv, config )
             </Expanded>
           </Expression>
-TestMain.cpp" line="280">
+TestMain.cpp" line="281">
             <Original>
               config.cutoff == 1
             </Original>
@@ -9199,7 +9782,7 @@ TestMain.cpp" line="280">
               1 == 1
             </Expanded>
           </Expression>
-TestMain.cpp" line="281">
+TestMain.cpp" line="282">
             <Original>
               config.shouldDebugBreak
             </Original>
@@ -9207,7 +9790,7 @@ TestMain.cpp" line="281">
               true
             </Expanded>
           </Expression>
-TestMain.cpp" line="282">
+TestMain.cpp" line="283">
             <Original>
               config.allowThrows == false
             </Original>
@@ -9222,7 +9805,7 @@ TestMain.cpp" line="282">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/test filter">
-TestMain.cpp" line="291">
+TestMain.cpp" line="292">
         <Original>
           matchAny.shouldInclude( fakeTestCase( &quot;any&quot; ) )
         </Original>
@@ -9230,7 +9813,7 @@ TestMain.cpp" line="291">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="292">
+TestMain.cpp" line="293">
         <Original>
           matchNone.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -9238,7 +9821,7 @@ TestMain.cpp" line="292">
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="297">
+TestMain.cpp" line="298">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -9246,7 +9829,7 @@ TestMain.cpp" line="297">
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="298">
+TestMain.cpp" line="299">
         <Original>
           matchNonHidden.shouldInclude( fakeTestCase( &quot;any&quot; ) )
         </Original>
@@ -9254,7 +9837,7 @@ TestMain.cpp" line="298">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="300">
+TestMain.cpp" line="301">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) )
         </Original>
@@ -9262,7 +9845,7 @@ TestMain.cpp" line="300">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="301">
+TestMain.cpp" line="302">
         <Original>
           matchNonHidden.shouldInclude( fakeTestCase( &quot;./any&quot; ) ) == false
         </Original>
@@ -9273,7 +9856,7 @@ TestMain.cpp" line="301">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/test filters">
-TestMain.cpp" line="312">
+TestMain.cpp" line="313">
         <Original>
           matchHidden.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
         </Original>
@@ -9281,7 +9864,7 @@ TestMain.cpp" line="312">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="314">
+TestMain.cpp" line="315">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;any&quot; ) ) == false
         </Original>
@@ -9289,7 +9872,7 @@ TestMain.cpp" line="314">
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="315">
+TestMain.cpp" line="316">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;./something&quot; ) )
         </Original>
@@ -9297,7 +9880,7 @@ TestMain.cpp" line="315">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="316">
+TestMain.cpp" line="317">
         <Original>
           filters.shouldInclude( fakeTestCase( &quot;./anything&quot; ) ) == false
         </Original>
@@ -9308,7 +9891,7 @@ TestMain.cpp" line="316">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/filter/prefix wildcard">
-TestMain.cpp" line="322">
+TestMain.cpp" line="323">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
         </Original>
@@ -9316,7 +9899,7 @@ TestMain.cpp" line="322">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="323">
+TestMain.cpp" line="324">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) ) == false
         </Original>
@@ -9327,7 +9910,7 @@ TestMain.cpp" line="323">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/filter/wildcard at both ends">
-TestMain.cpp" line="328">
+TestMain.cpp" line="329">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;big badger&quot; ) )
         </Original>
@@ -9335,7 +9918,7 @@ TestMain.cpp" line="328">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="329">
+TestMain.cpp" line="330">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;little badgers&quot; ) )
         </Original>
@@ -9343,7 +9926,7 @@ TestMain.cpp" line="329">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="330">
+TestMain.cpp" line="331">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;badgers are big&quot; ) )
         </Original>
@@ -9351,7 +9934,7 @@ TestMain.cpp" line="330">
           true
         </Expanded>
       </Expression>
-TestMain.cpp" line="331">
+TestMain.cpp" line="332">
         <Original>
           matchBadgers.shouldInclude( fakeTestCase( &quot;hedgehogs&quot; ) ) == false
         </Original>
@@ -9362,7 +9945,7 @@ TestMain.cpp" line="331">
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="selftest/option parsers">
-TestMain.cpp" line="351">
+TestMain.cpp" line="352">
         <Original>
           opt.parseIntoConfig( parser, config )
         </Original>
@@ -9370,7 +9953,7 @@ TestMain.cpp" line="351">
           opt.parseIntoConfig( parser, config )
         </Expanded>
       </Expression>
-TestMain.cpp" line="353">
+TestMain.cpp" line="354">
         <Original>
           config.filters.size() == 1
         </Original>
@@ -9378,7 +9961,7 @@ TestMain.cpp" line="353">
           1 == 1
         </Expanded>
       </Expression>
-TestMain.cpp" line="354">
+TestMain.cpp" line="355">
         <Original>
           config.filters[0].shouldInclude( fakeTestCase( &quot;notIncluded&quot; ) ) == false
         </Original>
@@ -9386,7 +9969,7 @@ TestMain.cpp" line="354">
           false == false
         </Expanded>
       </Expression>
-TestMain.cpp" line="355">
+TestMain.cpp" line="356">
         <Original>
           config.filters[0].shouldInclude( fakeTestCase( &quot;test1&quot; ) )
         </Original>
@@ -9398,7 +9981,7 @@ TestMain.cpp" line="355">
     </TestCase>
     <TestCase name="selftest/tags">
       <Section name="one tag">
-TestMain.cpp" line="369">
+TestMain.cpp" line="370">
           <Original>
             oneTag.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -9406,7 +9989,7 @@ TestMain.cpp" line="369">
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="370">
+TestMain.cpp" line="371">
           <Original>
             oneTag.hasTag( &quot;one&quot; )
           </Original>
@@ -9414,7 +9997,7 @@ TestMain.cpp" line="370">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="371">
+TestMain.cpp" line="372">
           <Original>
             oneTag.getTags().size() == 1
           </Original>
@@ -9422,7 +10005,7 @@ TestMain.cpp" line="371">
             1 == 1
           </Expanded>
         </Expression>
-TestMain.cpp" line="373">
+TestMain.cpp" line="374">
           <Original>
             oneTag.matchesTags( p1 ) == true
           </Original>
@@ -9430,7 +10013,7 @@ TestMain.cpp" line="373">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="374">
+TestMain.cpp" line="375">
           <Original>
             oneTag.matchesTags( p2 ) == true
           </Original>
@@ -9438,7 +10021,7 @@ TestMain.cpp" line="374">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="375">
+TestMain.cpp" line="376">
           <Original>
             oneTag.matchesTags( p3 ) == false
           </Original>
@@ -9446,7 +10029,7 @@ TestMain.cpp" line="375">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="376">
+TestMain.cpp" line="377">
           <Original>
             oneTag.matchesTags( p4 ) == false
           </Original>
@@ -9454,7 +10037,7 @@ TestMain.cpp" line="376">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="377">
+TestMain.cpp" line="378">
           <Original>
             oneTag.matchesTags( p5 ) == false
           </Original>
@@ -9465,7 +10048,7 @@ TestMain.cpp" line="377">
         <OverallResults successes="8" failures="0"/>
       </Section>
       <Section name="two tags">
-TestMain.cpp" line="383">
+TestMain.cpp" line="384">
           <Original>
             twoTags.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -9473,7 +10056,7 @@ TestMain.cpp" line="383">
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="384">
+TestMain.cpp" line="385">
           <Original>
             twoTags.hasTag( &quot;one&quot; )
           </Original>
@@ -9481,7 +10064,7 @@ TestMain.cpp" line="384">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="385">
+TestMain.cpp" line="386">
           <Original>
             twoTags.hasTag( &quot;two&quot; )
           </Original>
@@ -9489,7 +10072,15 @@ TestMain.cpp" line="385">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="386">
+TestMain.cpp" line="387">
+          <Original>
+            twoTags.hasTag( &quot;Two&quot; )
+          </Original>
+          <Expanded>
+            true
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="388">
           <Original>
             twoTags.hasTag( &quot;three&quot; ) == false
           </Original>
@@ -9497,7 +10088,7 @@ TestMain.cpp" line="386">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="387">
+TestMain.cpp" line="389">
           <Original>
             twoTags.getTags().size() == 2
           </Original>
@@ -9505,7 +10096,7 @@ TestMain.cpp" line="387">
             2 == 2
           </Expanded>
         </Expression>
-TestMain.cpp" line="389">
+TestMain.cpp" line="391">
           <Original>
             twoTags.matchesTags( p1 ) == true
           </Original>
@@ -9513,7 +10104,7 @@ TestMain.cpp" line="389">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="390">
+TestMain.cpp" line="392">
           <Original>
             twoTags.matchesTags( p2 ) == true
           </Original>
@@ -9521,7 +10112,7 @@ TestMain.cpp" line="390">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="391">
+TestMain.cpp" line="393">
           <Original>
             twoTags.matchesTags( p3 ) == true
           </Original>
@@ -9529,7 +10120,7 @@ TestMain.cpp" line="391">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="392">
+TestMain.cpp" line="394">
           <Original>
             twoTags.matchesTags( p4 ) == true
           </Original>
@@ -9537,7 +10128,7 @@ TestMain.cpp" line="392">
             true == true
           </Expanded>
         </Expression>
-TestMain.cpp" line="393">
+TestMain.cpp" line="395">
           <Original>
             twoTags.matchesTags( p5 ) == true
           </Original>
@@ -9545,10 +10136,10 @@ TestMain.cpp" line="393">
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="10" failures="0"/>
+        <OverallResults successes="11" failures="0"/>
       </Section>
       <Section name="one tag with characters either side">
-TestMain.cpp" line="399">
+TestMain.cpp" line="401">
           <Original>
             oneTagWithExtras.getTestCaseInfo().description == &quot;1234&quot;
           </Original>
@@ -9556,7 +10147,7 @@ TestMain.cpp" line="399">
             &quot;1234&quot; == &quot;1234&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="400">
+TestMain.cpp" line="402">
           <Original>
             oneTagWithExtras.hasTag( &quot;one&quot; )
           </Original>
@@ -9564,7 +10155,7 @@ TestMain.cpp" line="400">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="401">
+TestMain.cpp" line="403">
           <Original>
             oneTagWithExtras.hasTag( &quot;two&quot; ) == false
           </Original>
@@ -9572,7 +10163,7 @@ TestMain.cpp" line="401">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="402">
+TestMain.cpp" line="404">
           <Original>
             oneTagWithExtras.getTags().size() == 1
           </Original>
@@ -9583,7 +10174,7 @@ TestMain.cpp" line="402">
         <OverallResults successes="4" failures="0"/>
       </Section>
       <Section name="start of a tag, but not closed">
-TestMain.cpp" line="409">
+TestMain.cpp" line="411">
           <Original>
             oneTagOpen.getTestCaseInfo().description == &quot;[one&quot;
           </Original>
@@ -9591,7 +10182,7 @@ TestMain.cpp" line="409">
             &quot;[one&quot; == &quot;[one&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="410">
+TestMain.cpp" line="412">
           <Original>
             oneTagOpen.hasTag( &quot;one&quot; ) == false
           </Original>
@@ -9599,7 +10190,7 @@ TestMain.cpp" line="410">
             false == false
           </Expanded>
         </Expression>
-TestMain.cpp" line="411">
+TestMain.cpp" line="413">
           <Original>
             oneTagOpen.getTags().size() == 0
           </Original>
@@ -9610,7 +10201,7 @@ TestMain.cpp" line="411">
         <OverallResults successes="3" failures="0"/>
       </Section>
       <Section name="hidden">
-TestMain.cpp" line="417">
+TestMain.cpp" line="419">
           <Original>
             oneTag.getTestCaseInfo().description == &quot;&quot;
           </Original>
@@ -9618,7 +10209,7 @@ TestMain.cpp" line="417">
             &quot;&quot; == &quot;&quot;
           </Expanded>
         </Expression>
-TestMain.cpp" line="418">
+TestMain.cpp" line="420">
           <Original>
             oneTag.hasTag( &quot;hide&quot; )
           </Original>
@@ -9626,7 +10217,7 @@ TestMain.cpp" line="418">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="419">
+TestMain.cpp" line="421">
           <Original>
             oneTag.isHidden()
           </Original>
@@ -9634,7 +10225,7 @@ TestMain.cpp" line="419">
             true
           </Expanded>
         </Expression>
-TestMain.cpp" line="421">
+TestMain.cpp" line="423">
           <Original>
             oneTag.matchesTags( &quot;~[hide]&quot; ) == false
           </Original>
@@ -9646,6 +10237,240 @@ TestMain.cpp" line="421">
       </Section>
       <OverallResult success="true"/>
     </TestCase>
+    <TestCase name="Long strings can be wrapped">
+      <Section name="No wrapping">
+TestMain.cpp" line="433">
+          <Original>
+            Catch::wrapLongStrings( testString, 80, 0 ) == testString
+          </Original>
+          <Expanded>
+            &quot;one two three four&quot;
+==
+&quot;one two three four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="434">
+          <Original>
+            Catch::wrapLongStrings( testString, 18, 0 ) == testString
+          </Original>
+          <Expanded>
+            &quot;one two three four&quot;
+==
+&quot;one two three four&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="Wrapped once">
+TestMain.cpp" line="437">
+          <Original>
+            Catch::wrapLongStrings( testString, 17, 0 ) == &quot;one two three\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="438">
+          <Original>
+            Catch::wrapLongStrings( testString, 16, 0 ) == &quot;one two three\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="439">
+          <Original>
+            Catch::wrapLongStrings( testString, 15, 0 ) == &quot;one two three\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="440">
+          <Original>
+            Catch::wrapLongStrings( testString, 14, 0 ) == &quot;one two three\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two three
+four&quot;
+==
+&quot;one two three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="441">
+          <Original>
+            Catch::wrapLongStrings( testString, 13, 0 ) == &quot;one two\nthree four&quot;
+          </Original>
+          <Expanded>
+            &quot;one two
+three four&quot;
+==
+&quot;one two
+three four&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <Section name="Wrapped twice">
+TestMain.cpp" line="444">
+          <Original>
+            Catch::wrapLongStrings( testString, 9, 0 ) == &quot;one two\nthree\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="445">
+          <Original>
+            Catch::wrapLongStrings( testString, 8, 0 ) == &quot;one two\nthree\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one two
+three
+four&quot;
+==
+&quot;one two
+three
+four&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="Wrapped three times">
+TestMain.cpp" line="448">
+          <Original>
+            Catch::wrapLongStrings( testString, 7, 0 ) == &quot;one\ntwo\nthree\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one
+two
+three
+four&quot;
+==
+&quot;one
+two
+three
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="449">
+          <Original>
+            Catch::wrapLongStrings( testString, 5, 0 ) == &quot;one\ntwo\nthree\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one
+two
+three
+four&quot;
+==
+&quot;one
+two
+three
+four&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="2" failures="0"/>
+      </Section>
+      <Section name="Short wrap">
+TestMain.cpp" line="452">
+          <Original>
+            Catch::wrapLongStrings( &quot;abcdef&quot;, 4, 0 ) == &quot;abc-\ndef&quot;
+          </Original>
+          <Expanded>
+            &quot;abc-
+def&quot;
+==
+&quot;abc-
+def&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="453">
+          <Original>
+            Catch::wrapLongStrings( &quot;abcdefg&quot;, 4, 0 ) == &quot;abc-\ndefg&quot;
+          </Original>
+          <Expanded>
+            &quot;abc-
+defg&quot;
+==
+&quot;abc-
+defg&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="454">
+          <Original>
+            Catch::wrapLongStrings( &quot;abcdefgh&quot;, 4, 0 ) == &quot;abc-\ndef-\ngh&quot;
+          </Original>
+          <Expanded>
+            &quot;abc-
+def-
+gh&quot;
+==
+&quot;abc-
+def-
+gh&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="456">
+          <Original>
+            Catch::wrapLongStrings( testString, 4, 0 ) == &quot;one\ntwo\nthr-\nee\nfour&quot;
+          </Original>
+          <Expanded>
+            &quot;one
+two
+thr-
+ee
+four&quot;
+==
+&quot;one
+two
+thr-
+ee
+four&quot;
+          </Expanded>
+        </Expression>
+TestMain.cpp" line="457">
+          <Original>
+            Catch::wrapLongStrings( testString, 3, 0 ) == &quot;one\ntwo\nth-\nree\nfo-\nur&quot;
+          </Original>
+          <Expanded>
+            &quot;one
+two
+th-
+ree
+fo-
+ur&quot;
+==
+&quot;one
+two
+th-
+ree
+fo-
+ur&quot;
+          </Expanded>
+        </Expression>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
+      <OverallResult success="true"/>
+    </TestCase>
     <TestCase name="./succeeding/Tricky/std::pair">
 TrickyTests.cpp" line="37">
         <Original>
@@ -9977,9 +10802,9 @@ BDDTests.cpp" line="23">
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="524" failures="104"/>
+    <OverallResults successes="562" failures="104"/>
   </Group>
-  <OverallResults successes="524" failures="104"/>
+  <OverallResults successes="562" failures="104"/>
 </Catch>
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']
@@ -10155,63 +10980,63 @@ ConditionTests.cpp:202: (std::numeric_limits<unsigned long>::max)() > ul succeed
 [Finished: './succeeding/conditions/int literals' All tests passed (13 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions//long_to_unsigned_x]
-ConditionTests.cpp:223: long_var == unsigned_char_var succeeded for: 1 == 1
-ConditionTests.cpp:224: long_var == unsigned_short_var succeeded for: 1 == 1
-ConditionTests.cpp:225: long_var == unsigned_int_var succeeded for: 1 == 1
-ConditionTests.cpp:226: long_var == unsigned_long_var succeeded for: 1 == 1
+ConditionTests.cpp:226: long_var == unsigned_char_var succeeded for: 1 == 1
+ConditionTests.cpp:227: long_var == unsigned_short_var succeeded for: 1 == 1
+ConditionTests.cpp:228: long_var == unsigned_int_var succeeded for: 1 == 1
+ConditionTests.cpp:229: long_var == unsigned_long_var succeeded for: 1 == 1
 [Finished: './succeeding/conditions//long_to_unsigned_x' All tests passed (4 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/const ints to int literal]
-ConditionTests.cpp:237: unsigned_char_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:238: unsigned_short_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:239: unsigned_int_var == 1 succeeded for: 1 == 1
-ConditionTests.cpp:240: unsigned_long_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp:240: unsigned_char_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp:241: unsigned_short_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp:242: unsigned_int_var == 1 succeeded for: 1 == 1
+ConditionTests.cpp:243: unsigned_long_var == 1 succeeded for: 1 == 1
 [Finished: './succeeding/conditions/const ints to int literal' All tests passed (4 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/negative ints]
-ConditionTests.cpp:246: ( -1 > 2u ) succeeded for: true
-ConditionTests.cpp:247: -1 > 2u succeeded for: -1 > 2
-ConditionTests.cpp:249: ( 2u < -1 ) succeeded for: true
-ConditionTests.cpp:250: 2u < -1 succeeded for: 2 < -1
-ConditionTests.cpp:253: ( minInt > 2u ) succeeded for: true
-ConditionTests.cpp:254: minInt > 2u succeeded for: -2147483648 > 2
+ConditionTests.cpp:249: ( -1 > 2u ) succeeded for: true
+ConditionTests.cpp:250: -1 > 2u succeeded for: -1 > 2
+ConditionTests.cpp:252: ( 2u < -1 ) succeeded for: true
+ConditionTests.cpp:253: 2u < -1 succeeded for: 2 < -1
+ConditionTests.cpp:256: ( minInt > 2u ) succeeded for: true
+ConditionTests.cpp:257: minInt > 2u succeeded for: -2147483648 > 2
 [Finished: './succeeding/conditions/negative ints' All tests passed (6 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/computed ints]
-ConditionTests.cpp:269: 54 == 6*9 succeeded for: 54 == 54
+ConditionTests.cpp:272: 54 == 6*9 succeeded for: 54 == 54
 [Finished: './succeeding/conditions/computed ints' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/conditions/ptr]
-ConditionTests.cpp:285: p == __null succeeded for: __null == 0
-ConditionTests.cpp:286: p == pNULL succeeded for: __null == __null
-ConditionTests.cpp:291: p != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:294: cp != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:297: cpc != __null succeeded for: 0x<hex digits> != 0
-ConditionTests.cpp:299: returnsNull() == __null succeeded for: {null string} == 0
-ConditionTests.cpp:300: returnsConstNull() == __null succeeded for: {null string} == 0
-ConditionTests.cpp:302: __null != p succeeded for: 0 != 0x<hex digits>
+ConditionTests.cpp:288: p == __null succeeded for: __null == 0
+ConditionTests.cpp:289: p == pNULL succeeded for: __null == __null
+ConditionTests.cpp:294: p != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp:297: cp != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp:300: cpc != __null succeeded for: 0x<hex digits> != 0
+ConditionTests.cpp:302: returnsNull() == __null succeeded for: {null string} == 0
+ConditionTests.cpp:303: returnsConstNull() == __null succeeded for: {null string} == 0
+ConditionTests.cpp:305: __null != p succeeded for: 0 != 0x<hex digits>
 [Finished: './succeeding/conditions/ptr' All tests passed (8 assertions in 1 test case)]
 
 [Running: ./succeeding/conditions/not]
-ConditionTests.cpp:317: false == false succeeded
-ConditionTests.cpp:318: true == true succeeded
-ConditionTests.cpp:319: !false succeeded for: true
-ConditionTests.cpp:320: !false succeeded
-ConditionTests.cpp:322: !falseValue succeeded for: true
-ConditionTests.cpp:323: !falseValue succeeded for: !false
-ConditionTests.cpp:325: !(1 == 2) succeeded for: true
-ConditionTests.cpp:326: !1 == 2 succeeded for: !(1 == 2)
+ConditionTests.cpp:320: false == false succeeded
+ConditionTests.cpp:321: true == true succeeded
+ConditionTests.cpp:322: !false succeeded for: true
+ConditionTests.cpp:323: !false succeeded
+ConditionTests.cpp:325: !falseValue succeeded for: true
+ConditionTests.cpp:326: !falseValue succeeded for: !false
+ConditionTests.cpp:328: !(1 == 2) succeeded for: true
+ConditionTests.cpp:329: !1 == 2 succeeded for: !(1 == 2)
 [Finished: './succeeding/conditions/not' All tests passed (8 assertions in 1 test case)]
 
 [Running: ./failing/conditions/not]
-ConditionTests.cpp:334: false != false failed
-ConditionTests.cpp:335: true != true failed
-ConditionTests.cpp:336: !true failed for: false
-ConditionTests.cpp:337: !true failed
-ConditionTests.cpp:339: !trueValue failed for: false
-ConditionTests.cpp:340: !trueValue failed for: !true
-ConditionTests.cpp:342: !(1 == 1) failed for: false
-ConditionTests.cpp:343: !1 == 1 failed for: !(1 == 1)
+ConditionTests.cpp:337: false != false failed
+ConditionTests.cpp:338: true != true failed
+ConditionTests.cpp:339: !true failed for: false
+ConditionTests.cpp:340: !true failed
+ConditionTests.cpp:342: !trueValue failed for: false
+ConditionTests.cpp:343: !trueValue failed for: !true
+ConditionTests.cpp:345: !(1 == 1) failed for: false
+ConditionTests.cpp:346: !1 == 1 failed for: !(1 == 1)
 [Finished: './failing/conditions/not' 1 test case failed (All 8 assertions failed)]
 
 [Running: ./succeeding/exceptions/explicit]
@@ -10254,19 +11079,19 @@ ExceptionTests.cpp:106: Unexpected exception with message: 'custom exception'
 [Finished: './failing/exceptions/custom' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/nothrow]
-ExceptionTests.cpp:113: throw CustomException( "unexpected custom exception" ) failed with unexpected exception with message: 'unexpected custom exception'
+ExceptionTests.cpp:116: throw CustomException( "unexpected custom exception" ) failed with unexpected exception with message: 'unexpected custom exception'
 [Finished: './failing/exceptions/custom/nothrow' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/throw]
-ExceptionTests.cpp:118: throw CustomException( "custom exception - not std" ) failed with unexpected exception with message: 'custom exception - not std'
+ExceptionTests.cpp:121: throw CustomException( "custom exception - not std" ) failed with unexpected exception with message: 'custom exception - not std'
 [Finished: './failing/exceptions/custom/throw' 1 test case failed (1 assertion failed)]
 
 [Running: ./failing/exceptions/custom/double]
-ExceptionTests.cpp:122: Unexpected exception with message: '3.14'
+ExceptionTests.cpp:125: Unexpected exception with message: '3.14'
 [Finished: './failing/exceptions/custom/double' 1 test case failed (1 assertion failed)]
 
 [Running: ./succeeding/exceptions/notimplemented]
-ExceptionTests.cpp:133: thisFunctionNotImplemented( 7 ) succeeded
+ExceptionTests.cpp:136: thisFunctionNotImplemented( 7 ) succeeded
 [Finished: './succeeding/exceptions/notimplemented' All tests passed (1 assertion in 1 test case)]
 
 [Running: ./succeeding/generators/1]
@@ -10741,6 +11566,48 @@ No assertions in test case, 'second tag'
 
 [Finished: 'second tag' 1 test case failed (1 assertion failed)]
 
+[Running: vectors can be sized and resized]
+MiscTests.cpp:300: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:301: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'resizing bigger changes size and capacity']
+MiscTests.cpp:306: v.size() == 10 succeeded for: 10 == 10
+MiscTests.cpp:307: v.capacity() >= 10 succeeded for: 10 >= 10
+[End of section: 'resizing bigger changes size and capacity' All 2 assertions passed]
+
+MiscTests.cpp:300: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:301: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'resizing smaller changes size but not capacity']
+MiscTests.cpp:312: v.size() == 0 succeeded for: 0 == 0
+MiscTests.cpp:313: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'We can use the 'swap trick' to reset the capacity']
+MiscTests.cpp:319: v.capacity() == 0 succeeded for: 0 == 0
+[End of section: 'We can use the 'swap trick' to reset the capacity' 1 assertion passed]
+
+[End of section: 'resizing smaller changes size but not capacity' All 3 assertions passed]
+
+MiscTests.cpp:300: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:301: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'resizing smaller changes size but not capacity']
+MiscTests.cpp:312: v.size() == 0 succeeded for: 0 == 0
+MiscTests.cpp:313: v.capacity() >= 5 succeeded for: 5 >= 5
+[End of section: 'resizing smaller changes size but not capacity' All 2 assertions passed]
+
+MiscTests.cpp:300: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:301: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'reserving bigger changes capacity but not size']
+MiscTests.cpp:325: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:326: v.capacity() >= 10 succeeded for: 10 >= 10
+[End of section: 'reserving bigger changes capacity but not size' All 2 assertions passed]
+
+MiscTests.cpp:300: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:301: v.capacity() >= 5 succeeded for: 5 >= 5
+[Started section: 'reserving smaller does not change size or capacity']
+MiscTests.cpp:331: v.size() == 5 succeeded for: 5 == 5
+MiscTests.cpp:332: v.capacity() >= 5 succeeded for: 5 >= 5
+[End of section: 'reserving smaller does not change size or capacity' All 2 assertions passed]
+
+[Finished: 'vectors can be sized and resized' All tests passed (21 assertions in 1 test case)]
+
 [Running: selftest/main]
 [Started section: 'selftest/expected result']
 [Started section: 'selftest/expected result/failing tests']
@@ -10908,16 +11775,16 @@ Some information
 An error
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/succeeding tests']
-TestMain.cpp:40: totals.assertions.passed == 296 succeeded for: 296 == 296
-TestMain.cpp:41: totals.assertions.failed == 0 succeeded for: 0 == 0
+TestMain.cpp:41: totals.assertions.passed == 296 succeeded for: 296 == 296
+TestMain.cpp:42: totals.assertions.failed == 0 succeeded for: 0 == 0
 [End of section: 'selftest/test counts/succeeding tests' All 2 assertions passed]
 
 [End of section: 'selftest/test counts' All 2 assertions passed]
 
 [Started section: 'selftest/test counts']
 [Started section: 'selftest/test counts/failing tests']
-TestMain.cpp:47: totals.assertions.passed == 1 succeeded for: 1 == 1
-TestMain.cpp:48: totals.assertions.failed == 73 succeeded for: 73 == 73
+TestMain.cpp:48: totals.assertions.passed == 1 succeeded for: 1 == 1
+TestMain.cpp:49: totals.assertions.failed == 73 succeeded for: 73 == 73
 [End of section: 'selftest/test counts/failing tests' All 2 assertions passed]
 
 [End of section: 'selftest/test counts' All 2 assertions passed]
@@ -10925,83 +11792,83 @@ TestMain.cpp:48: totals.assertions.failed == 73 succeeded for: 73 == 73
 [Finished: 'selftest/main' All tests passed (76 assertions in 1 test case)]
 
 [Running: meta/Misc/Sections]
-TestMain.cpp:57: totals.assertions.passed == 2 succeeded for: 2 == 2
-TestMain.cpp:58: totals.assertions.failed == 1 succeeded for: 1 == 1
+TestMain.cpp:58: totals.assertions.passed == 2 succeeded for: 2 == 2
+TestMain.cpp:59: totals.assertions.failed == 1 succeeded for: 1 == 1
 [Finished: 'meta/Misc/Sections' All tests passed (2 assertions in 1 test case)]
 
 [Running: selftest/parser/2]
 [Started section: 'default']
-TestMain.cpp:97: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:99: config.shouldDebugBreak == false succeeded for: false == false
-TestMain.cpp:100: config.cutoff == -1 succeeded for: -1 == -1
-TestMain.cpp:101: config.allowThrows == true succeeded for: true == true
-TestMain.cpp:102: config.reporter.empty() succeeded for: true
+TestMain.cpp:98: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:100: config.shouldDebugBreak == false succeeded for: false == false
+TestMain.cpp:101: config.cutoff == -1 succeeded for: -1 == -1
+TestMain.cpp:102: config.allowThrows == true succeeded for: true == true
+TestMain.cpp:103: config.reporter.empty() succeeded for: true
 [End of section: 'default' All 5 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '-t/1']
-TestMain.cpp:108: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:110: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:111: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:112: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp:109: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:111: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:112: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp:113: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
 [End of section: '-t/1' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '-t/exclude:1']
-TestMain.cpp:116: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:118: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:119: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
-TestMain.cpp:120: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
+TestMain.cpp:117: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:119: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:120: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
+TestMain.cpp:121: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
 [End of section: '-t/exclude:1' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '--test/1']
-TestMain.cpp:125: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:127: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:128: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:129: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp:126: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:128: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:129: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp:130: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
 [End of section: '--test/1' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '--test/exclude:1']
-TestMain.cpp:134: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:136: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:137: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
-TestMain.cpp:138: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
+TestMain.cpp:135: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:137: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:138: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
+TestMain.cpp:139: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
 [End of section: '--test/exclude:1' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '--test/exclude:2']
-TestMain.cpp:143: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:145: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:146: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
-TestMain.cpp:147: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
+TestMain.cpp:144: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:146: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:147: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false succeeded for: false == false
+TestMain.cpp:148: config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) succeeded for: true
 [End of section: '--test/exclude:2' All 4 assertions passed]
 
 [End of section: 'test lists' All 4 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '-t/2']
-TestMain.cpp:152: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:154: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:155: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:156: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
-TestMain.cpp:157: config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) succeeded for: true
+TestMain.cpp:153: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:155: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:156: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp:157: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp:158: config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) succeeded for: true
 [End of section: '-t/2' All 5 assertions passed]
 
 [End of section: 'test lists' All 5 assertions passed]
 
 [Started section: 'test lists']
 [Started section: '-t/0']
-TestMain.cpp:162: parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) succeeded for:
+TestMain.cpp:163: parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) succeeded for:
 "Error while parsing arguments. Expected at least 1 argument." contains: "at least 1"
 [End of section: '-t/0' 1 assertion passed]
 
@@ -11009,31 +11876,31 @@ TestMain.cpp:162: parseIntoConfigAndReturnError( argv, config ) Contains( "at le
 
 [Started section: 'reporter']
 [Started section: '-r/console']
-TestMain.cpp:169: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:171: config.reporter == "console" succeeded for: "console" == "console"
+TestMain.cpp:170: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:172: config.reporter == "console" succeeded for: "console" == "console"
 [End of section: '-r/console' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '-r/xml']
-TestMain.cpp:175: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:177: config.reporter == "xml" succeeded for: "xml" == "xml"
+TestMain.cpp:176: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:178: config.reporter == "xml" succeeded for: "xml" == "xml"
 [End of section: '-r/xml' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '--reporter/junit']
-TestMain.cpp:181: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:183: config.reporter == "junit" succeeded for: "junit" == "junit"
+TestMain.cpp:182: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:184: config.reporter == "junit" succeeded for: "junit" == "junit"
 [End of section: '--reporter/junit' All 2 assertions passed]
 
 [End of section: 'reporter' All 2 assertions passed]
 
 [Started section: 'reporter']
 [Started section: '-r/error']
-TestMain.cpp:187: parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) succeeded for:
+TestMain.cpp:188: parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) succeeded for:
 "Error while parsing arguments. Expected 1 argument. Arguments were: one two" contains: "1 argument"
 [End of section: '-r/error' 1 assertion passed]
 
@@ -11041,23 +11908,23 @@ TestMain.cpp:187: parseIntoConfigAndReturnError( argv, config ) Contains( "1 arg
 
 [Started section: 'debugger']
 [Started section: '-b']
-TestMain.cpp:194: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:196: config.shouldDebugBreak == true succeeded for: true == true
+TestMain.cpp:195: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:197: config.shouldDebugBreak == true succeeded for: true == true
 [End of section: '-b' All 2 assertions passed]
 
 [End of section: 'debugger' All 2 assertions passed]
 
 [Started section: 'debugger']
 [Started section: '--break']
-TestMain.cpp:200: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:202: config.shouldDebugBreak succeeded for: true
+TestMain.cpp:201: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:203: config.shouldDebugBreak succeeded for: true
 [End of section: '--break' All 2 assertions passed]
 
 [End of section: 'debugger' All 2 assertions passed]
 
 [Started section: 'debugger']
 [Started section: '-b']
-TestMain.cpp:206: parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) succeeded for:
+TestMain.cpp:207: parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) succeeded for:
 "Error while parsing arguments. Expected 0 arguments. Arguments were: unexpected" contains: "0 arguments"
 [End of section: '-b' 1 assertion passed]
 
@@ -11065,23 +11932,23 @@ TestMain.cpp:206: parseIntoConfigAndReturnError( argv, config ) Contains( "0 arg
 
 [Started section: 'abort']
 [Started section: '-a']
-TestMain.cpp:213: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:215: config.cutoff == 1 succeeded for: 1 == 1
+TestMain.cpp:214: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:216: config.cutoff == 1 succeeded for: 1 == 1
 [End of section: '-a' All 2 assertions passed]
 
 [End of section: 'abort' All 2 assertions passed]
 
 [Started section: 'abort']
 [Started section: '-a/2']
-TestMain.cpp:219: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:221: config.cutoff == 2 succeeded for: 2 == 2
+TestMain.cpp:220: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:222: config.cutoff == 2 succeeded for: 2 == 2
 [End of section: '-a/2' All 2 assertions passed]
 
 [End of section: 'abort' All 2 assertions passed]
 
 [Started section: 'abort']
 [Started section: '-a/error/0']
-TestMain.cpp:225: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
+TestMain.cpp:226: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
 "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: 0" contains: "greater than zero"
 [End of section: '-a/error/0' 1 assertion passed]
 
@@ -11089,7 +11956,7 @@ TestMain.cpp:225: parseIntoConfigAndReturnError( argv, config ) Contains( "great
 
 [Started section: 'abort']
 [Started section: '-a/error/non numeric']
-TestMain.cpp:229: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
+TestMain.cpp:230: parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) succeeded for:
 "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: oops" contains: "greater than zero"
 [End of section: '-a/error/non numeric' 1 assertion passed]
 
@@ -11097,7 +11964,7 @@ TestMain.cpp:229: parseIntoConfigAndReturnError( argv, config ) Contains( "great
 
 [Started section: 'abort']
 [Started section: '-a/error/two args']
-TestMain.cpp:233: parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) succeeded for:
+TestMain.cpp:234: parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) succeeded for:
 "Error while parsing arguments. Expected between 0 and 1 argument. Arguments were: 1 2" contains: "0 and 1 argument"
 [End of section: '-a/error/two args' 1 assertion passed]
 
@@ -11105,52 +11972,52 @@ TestMain.cpp:233: parseIntoConfigAndReturnError( argv, config ) Contains( "0 and
 
 [Started section: 'nothrow']
 [Started section: '-nt']
-TestMain.cpp:240: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:242: config.allowThrows == false succeeded for: false == false
+TestMain.cpp:241: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:243: config.allowThrows == false succeeded for: false == false
 [End of section: '-nt' All 2 assertions passed]
 
 [End of section: 'nothrow' All 2 assertions passed]
 
 [Started section: 'nothrow']
 [Started section: '--nothrow']
-TestMain.cpp:246: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:248: config.allowThrows == false succeeded for: false == false
+TestMain.cpp:247: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:249: config.allowThrows == false succeeded for: false == false
 [End of section: '--nothrow' All 2 assertions passed]
 
 [End of section: 'nothrow' All 2 assertions passed]
 
 [Started section: 'streams']
 [Started section: '-o filename']
-TestMain.cpp:255: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:257: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
-TestMain.cpp:258: config.stream.empty() succeeded for: true
+TestMain.cpp:256: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:258: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+TestMain.cpp:259: config.stream.empty() succeeded for: true
 [End of section: '-o filename' All 3 assertions passed]
 
 [End of section: 'streams' All 3 assertions passed]
 
 [Started section: 'streams']
 [Started section: '-o %stdout']
-TestMain.cpp:262: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:264: config.stream == "stdout" succeeded for: "stdout" == "stdout"
-TestMain.cpp:265: config.outputFilename.empty() succeeded for: true
+TestMain.cpp:263: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:265: config.stream == "stdout" succeeded for: "stdout" == "stdout"
+TestMain.cpp:266: config.outputFilename.empty() succeeded for: true
 [End of section: '-o %stdout' All 3 assertions passed]
 
 [End of section: 'streams' All 3 assertions passed]
 
 [Started section: 'streams']
 [Started section: '--out']
-TestMain.cpp:269: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:271: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
+TestMain.cpp:270: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:272: config.outputFilename == "filename.ext" succeeded for: "filename.ext" == "filename.ext"
 [End of section: '--out' All 2 assertions passed]
 
 [End of section: 'streams' All 2 assertions passed]
 
 [Started section: 'combinations']
 [Started section: '-a -b']
-TestMain.cpp:278: parseIntoConfig( argv, config ) succeeded
-TestMain.cpp:280: config.cutoff == 1 succeeded for: 1 == 1
-TestMain.cpp:281: config.shouldDebugBreak succeeded for: true
-TestMain.cpp:282: config.allowThrows == false succeeded for: false == false
+TestMain.cpp:279: parseIntoConfig( argv, config ) succeeded
+TestMain.cpp:281: config.cutoff == 1 succeeded for: 1 == 1
+TestMain.cpp:282: config.shouldDebugBreak succeeded for: true
+TestMain.cpp:283: config.allowThrows == false succeeded for: false == false
 [End of section: '-a -b' All 4 assertions passed]
 
 [End of section: 'combinations' All 4 assertions passed]
@@ -11158,86 +12025,222 @@ TestMain.cpp:282: config.allowThrows == false succeeded for: false == false
 [Finished: 'selftest/parser/2' All tests passed (66 assertions in 1 test case)]
 
 [Running: selftest/test filter]
-TestMain.cpp:291: matchAny.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
-TestMain.cpp:292: matchNone.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:297: matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:298: matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
-TestMain.cpp:300: matchHidden.shouldInclude( fakeTestCase( "./any" ) ) succeeded for: true
-TestMain.cpp:301: matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false succeeded for: false == false
+TestMain.cpp:292: matchAny.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
+TestMain.cpp:293: matchNone.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp:298: matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp:299: matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) succeeded for: true
+TestMain.cpp:301: matchHidden.shouldInclude( fakeTestCase( "./any" ) ) succeeded for: true
+TestMain.cpp:302: matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false succeeded for: false == false
 [Finished: 'selftest/test filter' All tests passed (6 assertions in 1 test case)]
 
 [Running: selftest/test filters]
-TestMain.cpp:312: matchHidden.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
-TestMain.cpp:314: filters.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
-TestMain.cpp:315: filters.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
-TestMain.cpp:316: filters.shouldInclude( fakeTestCase( "./anything" ) ) == false succeeded for: false == false
+TestMain.cpp:313: matchHidden.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
+TestMain.cpp:315: filters.shouldInclude( fakeTestCase( "any" ) ) == false succeeded for: false == false
+TestMain.cpp:316: filters.shouldInclude( fakeTestCase( "./something" ) ) succeeded for: true
+TestMain.cpp:317: filters.shouldInclude( fakeTestCase( "./anything" ) ) == false succeeded for: false == false
 [Finished: 'selftest/test filters' All tests passed (4 assertions in 1 test case)]
 
 [Running: selftest/filter/prefix wildcard]
-TestMain.cpp:322: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
-TestMain.cpp:323: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false succeeded for: false == false
+TestMain.cpp:323: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
+TestMain.cpp:324: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false succeeded for: false == false
 [Finished: 'selftest/filter/prefix wildcard' All tests passed (2 assertions in 1 test case)]
 
 [Running: selftest/filter/wildcard at both ends]
-TestMain.cpp:328: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
-TestMain.cpp:329: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) succeeded for: true
-TestMain.cpp:330: matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) succeeded for: true
-TestMain.cpp:331: matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false succeeded for: false == false
+TestMain.cpp:329: matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) succeeded for: true
+TestMain.cpp:330: matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) succeeded for: true
+TestMain.cpp:331: matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) succeeded for: true
+TestMain.cpp:332: matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false succeeded for: false == false
 [Finished: 'selftest/filter/wildcard at both ends' All tests passed (4 assertions in 1 test case)]
 
 [Running: selftest/option parsers]
-TestMain.cpp:351: opt.parseIntoConfig( parser, config ) succeeded
-TestMain.cpp:353: config.filters.size() == 1 succeeded for: 1 == 1
-TestMain.cpp:354: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
-TestMain.cpp:355: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
+TestMain.cpp:352: opt.parseIntoConfig( parser, config ) succeeded
+TestMain.cpp:354: config.filters.size() == 1 succeeded for: 1 == 1
+TestMain.cpp:355: config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false succeeded for: false == false
+TestMain.cpp:356: config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) succeeded for: true
 [Finished: 'selftest/option parsers' All tests passed (4 assertions in 1 test case)]
 
 [Running: selftest/tags]
 [Started section: 'one tag']
-TestMain.cpp:369: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:370: oneTag.hasTag( "one" ) succeeded for: true
-TestMain.cpp:371: oneTag.getTags().size() == 1 succeeded for: 1 == 1
-TestMain.cpp:373: oneTag.matchesTags( p1 ) == true succeeded for: true == true
-TestMain.cpp:374: oneTag.matchesTags( p2 ) == true succeeded for: true == true
-TestMain.cpp:375: oneTag.matchesTags( p3 ) == false succeeded for: false == false
-TestMain.cpp:376: oneTag.matchesTags( p4 ) == false succeeded for: false == false
-TestMain.cpp:377: oneTag.matchesTags( p5 ) == false succeeded for: false == false
+TestMain.cpp:370: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp:371: oneTag.hasTag( "one" ) succeeded for: true
+TestMain.cpp:372: oneTag.getTags().size() == 1 succeeded for: 1 == 1
+TestMain.cpp:374: oneTag.matchesTags( p1 ) == true succeeded for: true == true
+TestMain.cpp:375: oneTag.matchesTags( p2 ) == true succeeded for: true == true
+TestMain.cpp:376: oneTag.matchesTags( p3 ) == false succeeded for: false == false
+TestMain.cpp:377: oneTag.matchesTags( p4 ) == false succeeded for: false == false
+TestMain.cpp:378: oneTag.matchesTags( p5 ) == false succeeded for: false == false
 [End of section: 'one tag' All 8 assertions passed]
 
 [Started section: 'two tags']
-TestMain.cpp:383: twoTags.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:384: twoTags.hasTag( "one" ) succeeded for: true
-TestMain.cpp:385: twoTags.hasTag( "two" ) succeeded for: true
-TestMain.cpp:386: twoTags.hasTag( "three" ) == false succeeded for: false == false
-TestMain.cpp:387: twoTags.getTags().size() == 2 succeeded for: 2 == 2
-TestMain.cpp:389: twoTags.matchesTags( p1 ) == true succeeded for: true == true
-TestMain.cpp:390: twoTags.matchesTags( p2 ) == true succeeded for: true == true
-TestMain.cpp:391: twoTags.matchesTags( p3 ) == true succeeded for: true == true
-TestMain.cpp:392: twoTags.matchesTags( p4 ) == true succeeded for: true == true
-TestMain.cpp:393: twoTags.matchesTags( p5 ) == true succeeded for: true == true
-[End of section: 'two tags' All 10 assertions passed]
+TestMain.cpp:384: twoTags.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp:385: twoTags.hasTag( "one" ) succeeded for: true
+TestMain.cpp:386: twoTags.hasTag( "two" ) succeeded for: true
+TestMain.cpp:387: twoTags.hasTag( "Two" ) succeeded for: true
+TestMain.cpp:388: twoTags.hasTag( "three" ) == false succeeded for: false == false
+TestMain.cpp:389: twoTags.getTags().size() == 2 succeeded for: 2 == 2
+TestMain.cpp:391: twoTags.matchesTags( p1 ) == true succeeded for: true == true
+TestMain.cpp:392: twoTags.matchesTags( p2 ) == true succeeded for: true == true
+TestMain.cpp:393: twoTags.matchesTags( p3 ) == true succeeded for: true == true
+TestMain.cpp:394: twoTags.matchesTags( p4 ) == true succeeded for: true == true
+TestMain.cpp:395: twoTags.matchesTags( p5 ) == true succeeded for: true == true
+[End of section: 'two tags' All 11 assertions passed]
 
 [Started section: 'one tag with characters either side']
-TestMain.cpp:399: oneTagWithExtras.getTestCaseInfo().description == "1234" succeeded for: "1234" == "1234"
-TestMain.cpp:400: oneTagWithExtras.hasTag( "one" ) succeeded for: true
-TestMain.cpp:401: oneTagWithExtras.hasTag( "two" ) == false succeeded for: false == false
-TestMain.cpp:402: oneTagWithExtras.getTags().size() == 1 succeeded for: 1 == 1
+TestMain.cpp:401: oneTagWithExtras.getTestCaseInfo().description == "1234" succeeded for: "1234" == "1234"
+TestMain.cpp:402: oneTagWithExtras.hasTag( "one" ) succeeded for: true
+TestMain.cpp:403: oneTagWithExtras.hasTag( "two" ) == false succeeded for: false == false
+TestMain.cpp:404: oneTagWithExtras.getTags().size() == 1 succeeded for: 1 == 1
 [End of section: 'one tag with characters either side' All 4 assertions passed]
 
 [Started section: 'start of a tag, but not closed']
-TestMain.cpp:409: oneTagOpen.getTestCaseInfo().description == "[one" succeeded for: "[one" == "[one"
-TestMain.cpp:410: oneTagOpen.hasTag( "one" ) == false succeeded for: false == false
-TestMain.cpp:411: oneTagOpen.getTags().size() == 0 succeeded for: 0 == 0
+TestMain.cpp:411: oneTagOpen.getTestCaseInfo().description == "[one" succeeded for: "[one" == "[one"
+TestMain.cpp:412: oneTagOpen.hasTag( "one" ) == false succeeded for: false == false
+TestMain.cpp:413: oneTagOpen.getTags().size() == 0 succeeded for: 0 == 0
 [End of section: 'start of a tag, but not closed' All 3 assertions passed]
 
 [Started section: 'hidden']
-TestMain.cpp:417: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
-TestMain.cpp:418: oneTag.hasTag( "hide" ) succeeded for: true
-TestMain.cpp:419: oneTag.isHidden() succeeded for: true
-TestMain.cpp:421: oneTag.matchesTags( "~[hide]" ) == false succeeded for: false == false
+TestMain.cpp:419: oneTag.getTestCaseInfo().description == "" succeeded for: "" == ""
+TestMain.cpp:420: oneTag.hasTag( "hide" ) succeeded for: true
+TestMain.cpp:421: oneTag.isHidden() succeeded for: true
+TestMain.cpp:423: oneTag.matchesTags( "~[hide]" ) == false succeeded for: false == false
 [End of section: 'hidden' All 4 assertions passed]
 
-[Finished: 'selftest/tags' All tests passed (29 assertions in 1 test case)]
+[Finished: 'selftest/tags' All tests passed (30 assertions in 1 test case)]
+
+[Running: Long strings can be wrapped]
+[Started section: 'No wrapping']
+TestMain.cpp:433: Catch::wrapLongStrings( testString, 80, 0 ) == testString succeeded for:
+	"one two three four"
+==
+"one two three four"
+TestMain.cpp:434: Catch::wrapLongStrings( testString, 18, 0 ) == testString succeeded for:
+	"one two three four"
+==
+"one two three four"
+[End of section: 'No wrapping' All 2 assertions passed]
+
+[Started section: 'Wrapped once']
+TestMain.cpp:437: Catch::wrapLongStrings( testString, 17, 0 ) == "one two three\nfour" succeeded for:
+	"one two three
+four"
+==
+"one two three
+four"
+TestMain.cpp:438: Catch::wrapLongStrings( testString, 16, 0 ) == "one two three\nfour" succeeded for:
+	"one two three
+four"
+==
+"one two three
+four"
+TestMain.cpp:439: Catch::wrapLongStrings( testString, 15, 0 ) == "one two three\nfour" succeeded for:
+	"one two three
+four"
+==
+"one two three
+four"
+TestMain.cpp:440: Catch::wrapLongStrings( testString, 14, 0 ) == "one two three\nfour" succeeded for:
+	"one two three
+four"
+==
+"one two three
+four"
+TestMain.cpp:441: Catch::wrapLongStrings( testString, 13, 0 ) == "one two\nthree four" succeeded for:
+	"one two
+three four"
+==
+"one two
+three four"
+[End of section: 'Wrapped once' All 5 assertions passed]
+
+[Started section: 'Wrapped twice']
+TestMain.cpp:444: Catch::wrapLongStrings( testString, 9, 0 ) == "one two\nthree\nfour" succeeded for:
+	"one two
+three
+four"
+==
+"one two
+three
+four"
+TestMain.cpp:445: Catch::wrapLongStrings( testString, 8, 0 ) == "one two\nthree\nfour" succeeded for:
+	"one two
+three
+four"
+==
+"one two
+three
+four"
+[End of section: 'Wrapped twice' All 2 assertions passed]
+
+[Started section: 'Wrapped three times']
+TestMain.cpp:448: Catch::wrapLongStrings( testString, 7, 0 ) == "one\ntwo\nthree\nfour" succeeded for:
+	"one
+two
+three
+four"
+==
+"one
+two
+three
+four"
+TestMain.cpp:449: Catch::wrapLongStrings( testString, 5, 0 ) == "one\ntwo\nthree\nfour" succeeded for:
+	"one
+two
+three
+four"
+==
+"one
+two
+three
+four"
+[End of section: 'Wrapped three times' All 2 assertions passed]
+
+[Started section: 'Short wrap']
+TestMain.cpp:452: Catch::wrapLongStrings( "abcdef", 4, 0 ) == "abc-\ndef" succeeded for: "abc-
+def"
+==
+"abc-
+def"
+TestMain.cpp:453: Catch::wrapLongStrings( "abcdefg", 4, 0 ) == "abc-\ndefg" succeeded for: "abc-
+defg"
+==
+"abc-
+defg"
+TestMain.cpp:454: Catch::wrapLongStrings( "abcdefgh", 4, 0 ) == "abc-\ndef-\ngh" succeeded for: "abc-
+def-
+gh"
+==
+"abc-
+def-
+gh"
+TestMain.cpp:456: Catch::wrapLongStrings( testString, 4, 0 ) == "one\ntwo\nthr-\nee\nfour" succeeded for:
+	"one
+two
+thr-
+ee
+four"
+==
+"one
+two
+thr-
+ee
+four"
+TestMain.cpp:457: Catch::wrapLongStrings( testString, 3, 0 ) == "one\ntwo\nth-\nree\nfo-\nur" succeeded for:
+	"one
+two
+th-
+ree
+fo-
+ur"
+==
+"one
+two
+th-
+ree
+fo-
+ur"
+[End of section: 'Short wrap' All 5 assertions passed]
+
+[Finished: 'Long strings can be wrapped' All tests passed (16 assertions in 1 test case)]
 
 [Running: ./succeeding/Tricky/std::pair]
 TrickyTests.cpp:37: (std::pair<int, int>( 1, 2 )) == aNicePair succeeded for: std::pair( 1, 2 ) == std::pair( 1, 2 )
@@ -11374,10 +12377,10 @@ VariadicMacrosTests.cpp:26:  succeeded
 [End of section: 'Section with one argument' 1 assertion passed]
 
 [Finished: 'Variadic macros' All tests passed (1 assertion in 1 test case)]
-[End of group: '~dummy'. 47 of 104 test cases failed (104 of 628 assertions failed)]
+[End of group: '~dummy'. 47 of 106 test cases failed (104 of 666 assertions failed)]
 
 
-[Testing completed. 47 of 104 test cases failed (104 of 628 assertions failed)]
+[Testing completed. 47 of 106 test cases failed (104 of 666 assertions failed)]
 
 [Started testing: CatchSelfTest]
 [Started group: '~dummy']