Fully committed to new Text class.

- moved impl into .hpp
- replaced last few uses of LineWrapper with Text
- removed LineWrapper

4 files changed, 736 insertions, 594 deletions

diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 167f1080..bfb9e47b 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -4,9 +4,9 @@ CatchSelfTest is a CATCH v0.9 b33 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:16
-
 ./succeeding/Approx/simple
+-------------------------------------------------------------------------------
+ApproxTests.cpp:16
 ...............................................................................
 
 ApproxTests.cpp:20:
@@ -46,9 +46,9 @@ with expansion:
   Approx( 1.23 ) != 1.24
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:34
-
 ./succeeding/Approx/epsilon
+-------------------------------------------------------------------------------
+ApproxTests.cpp:34
 ...............................................................................
 
 ApproxTests.cpp:38:
@@ -64,9 +64,9 @@ with expansion:
   1.23 == Approx( 1.231 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:47
-
 ./succeeding/Approx/float
+-------------------------------------------------------------------------------
+ApproxTests.cpp:47
 ...............................................................................
 
 ApproxTests.cpp:49:
@@ -82,9 +82,9 @@ with expansion:
   0 == Approx( 0 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:58
-
 ./succeeding/Approx/int
+-------------------------------------------------------------------------------
+ApproxTests.cpp:58
 ...............................................................................
 
 ApproxTests.cpp:60:
@@ -96,9 +96,9 @@ PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:69
-
 ./succeeding/Approx/mixed
+-------------------------------------------------------------------------------
+ApproxTests.cpp:69
 ...............................................................................
 
 ApproxTests.cpp:75:
@@ -132,9 +132,9 @@ with expansion:
   1.234 == Approx( 1.234 )
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:87
-
 ./succeeding/Approx/custom
+-------------------------------------------------------------------------------
+ApproxTests.cpp:87
 ...............................................................................
 
 ApproxTests.cpp:93:
@@ -186,9 +186,9 @@ with expansion:
   Approx( 1.23 ) != 1.25
 
 -------------------------------------------------------------------------------
-ApproxTests.cpp:108
-
 Approximate PI
+-------------------------------------------------------------------------------
+ApproxTests.cpp:108
 ...............................................................................
 
 ApproxTests.cpp:110:
@@ -204,9 +204,9 @@ with expansion:
   3.142857142857143 != Approx( 3.141 )
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:34
-
 ./succeeding/TestClass/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:34
 ...............................................................................
 
 ClassTests.cpp:24:
@@ -216,9 +216,9 @@ with expansion:
   "hello" == "hello"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:35
-
 ./failing/TestClass/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:35
 ...............................................................................
 
 ClassTests.cpp:28: FAILED:
@@ -227,9 +227,9 @@ with expansion:
   "hello" == "world"
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:45
-
 ./succeeding/Fixture/succeedingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:45
 ...............................................................................
 
 ClassTests.cpp:47:
@@ -239,9 +239,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ClassTests.cpp:53
-
 ./failing/Fixture/failingCase
+-------------------------------------------------------------------------------
+ClassTests.cpp:53
 ...............................................................................
 
 ClassTests.cpp:55: FAILED:
@@ -250,9 +250,9 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:47
-
 ./succeeding/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:47
 ...............................................................................
 
 ConditionTests.cpp:55:
@@ -298,9 +298,9 @@ with expansion:
   1.3 == Approx( 1.3 )
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:67
-
 ./failing/conditions/equality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:67
 ...............................................................................
 
 ConditionTests.cpp:71: FAILED:
@@ -369,9 +369,9 @@ with expansion:
   1.3 == Approx( 1.301 )
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:89
-
 ./succeeding/conditions/inequality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:89
 ...............................................................................
 
 ConditionTests.cpp:93:
@@ -441,9 +441,9 @@ with expansion:
   5 != 6
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:107
-
 ./failing/conditions/inequality
+-------------------------------------------------------------------------------
+ConditionTests.cpp:107
 ...............................................................................
 
 ConditionTests.cpp:111: FAILED:
@@ -472,9 +472,9 @@ with expansion:
   5 != 5
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:120
-
 ./succeeding/conditions/ordered
+-------------------------------------------------------------------------------
+ConditionTests.cpp:120
 ...............................................................................
 
 ConditionTests.cpp:124:
@@ -580,9 +580,9 @@ with expansion:
   "hello" > "a"
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:148
-
 ./failing/conditions/ordered
+-------------------------------------------------------------------------------
+ConditionTests.cpp:148
 ...............................................................................
 
 ConditionTests.cpp:152: FAILED:
@@ -681,9 +681,9 @@ with expansion:
   "hello" <= "a"
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:179
-
 ./succeeding/conditions/int literals
+-------------------------------------------------------------------------------
+ConditionTests.cpp:179
 ...............................................................................
 
 ConditionTests.cpp:188:
@@ -765,9 +765,9 @@ with expansion:
   0x<hex digits> > 4
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:218
-
 ./succeeding/conditions//long_to_unsigned_x
+-------------------------------------------------------------------------------
+ConditionTests.cpp:218
 ...............................................................................
 
 ConditionTests.cpp:226:
@@ -795,9 +795,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:233
-
 ./succeeding/conditions/const ints to int literal
+-------------------------------------------------------------------------------
+ConditionTests.cpp:233
 ...............................................................................
 
 ConditionTests.cpp:240:
@@ -825,9 +825,9 @@ with expansion:
   1 == 1
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:247
-
 ./succeeding/conditions/negative ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:247
 ...............................................................................
 
 ConditionTests.cpp:249:
@@ -867,9 +867,9 @@ with expansion:
   -2147483648 > 2
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:270
-
 ./succeeding/conditions/computed ints
+-------------------------------------------------------------------------------
+ConditionTests.cpp:270
 ...............................................................................
 
 ConditionTests.cpp:272:
@@ -879,9 +879,9 @@ with expansion:
   54 == 54
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:283
-
 ./succeeding/conditions/ptr
+-------------------------------------------------------------------------------
+ConditionTests.cpp:283
 ...............................................................................
 
 ConditionTests.cpp:288:
@@ -933,9 +933,9 @@ with expansion:
   0 != 0x<hex digits>
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:316
-
 ./succeeding/conditions/not
+-------------------------------------------------------------------------------
+ConditionTests.cpp:316
 ...............................................................................
 
 ConditionTests.cpp:320:
@@ -981,9 +981,9 @@ with expansion:
   !(1 == 2)
 
 -------------------------------------------------------------------------------
-ConditionTests.cpp:333
-
 ./failing/conditions/not
+-------------------------------------------------------------------------------
+ConditionTests.cpp:333
 ...............................................................................
 
 ConditionTests.cpp:337: FAILED:
@@ -1021,9 +1021,9 @@ with expansion:
   !(1 == 1)
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:33
-
 ./succeeding/exceptions/explicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:33
 ...............................................................................
 
 ExceptionTests.cpp:35:
@@ -1039,9 +1039,9 @@ PASSED:
   REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:41
-
 ./failing/exceptions/explicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:41
 ...............................................................................
 
 ExceptionTests.cpp:43: FAILED:
@@ -1059,9 +1059,9 @@ due to unexpected exception with message:
   expected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:48
-
 ./failing/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:48
 ...............................................................................
 
 ExceptionTests.cpp:48: FAILED:
@@ -1069,9 +1069,9 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:54
-
 ./failing/exceptions/implicit/2
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:54
 ...............................................................................
 
 ExceptionTests.cpp:56:
@@ -1084,10 +1084,10 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:62
-
 ./failing/exceptions/implicit/3
   section name
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:62
 ...............................................................................
 
 ExceptionTests.cpp:62: FAILED:
@@ -1095,18 +1095,18 @@ due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:69
-
 ./succeeding/exceptions/implicit
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:69
 ...............................................................................
 
 
 No assertions in test case, './succeeding/exceptions/implicit'
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:106
-
 ./failing/exceptions/custom
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:106
 ...............................................................................
 
 ExceptionTests.cpp:106: FAILED:
@@ -1114,9 +1114,9 @@ due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:114
-
 ./failing/exceptions/custom/nothrow
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:114
 ...............................................................................
 
 ExceptionTests.cpp:116: FAILED:
@@ -1125,9 +1125,9 @@ due to unexpected exception with message:
   unexpected custom exception
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:119
-
 ./failing/exceptions/custom/throw
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:119
 ...............................................................................
 
 ExceptionTests.cpp:121: FAILED:
@@ -1136,9 +1136,9 @@ due to unexpected exception with message:
   custom exception - not std
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:125
-
 ./failing/exceptions/custom/double
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:125
 ...............................................................................
 
 ExceptionTests.cpp:125: FAILED:
@@ -1146,9 +1146,9 @@ due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
-ExceptionTests.cpp:134
-
 ./succeeding/exceptions/notimplemented
+-------------------------------------------------------------------------------
+ExceptionTests.cpp:134
 ...............................................................................
 
 ExceptionTests.cpp:136:
@@ -1156,9 +1156,9 @@ PASSED:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:19
-
 ./succeeding/generators/1
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:19
 ...............................................................................
 
 GeneratorTests.cpp:26:
@@ -2026,9 +2026,9 @@ with expansion:
   214 == 214
 
 -------------------------------------------------------------------------------
-GeneratorTests.cpp:32
-
 ./succeeding/generators/2
+-------------------------------------------------------------------------------
+GeneratorTests.cpp:32
 ...............................................................................
 
 GeneratorTests.cpp:40:
@@ -2044,9 +2044,9 @@ with expansion:
   2 == 2
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:11
-
 ./succeeding/message
+-------------------------------------------------------------------------------
+MessageTests.cpp:11
 ...............................................................................
 
 MessageTests.cpp:14:
@@ -2058,9 +2058,9 @@ warning:
 No assertions in test case, './succeeding/message'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:16
-
 ./succeeding/succeed
+-------------------------------------------------------------------------------
+MessageTests.cpp:16
 ...............................................................................
 
 MessageTests.cpp:18:
@@ -2069,9 +2069,9 @@ with message:
   this is a success
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:21
-
 ./failing/message/info/1
+-------------------------------------------------------------------------------
+MessageTests.cpp:21
 ...............................................................................
 
 MessageTests.cpp:26: FAILED:
@@ -2083,9 +2083,9 @@ with messages:
   so should this
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:29
-
 ./mixed/message/info/2
+-------------------------------------------------------------------------------
+MessageTests.cpp:29
 ...............................................................................
 
 MessageTests.cpp:33:
@@ -2119,9 +2119,9 @@ with message:
   but not this
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:48
-
 ./failing/message/fail
+-------------------------------------------------------------------------------
+MessageTests.cpp:48
 ...............................................................................
 
 MessageTests.cpp:51: FAILED:
@@ -2129,10 +2129,10 @@ explicitly with message:
   This is a failure
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:56
-
 ./failing/message/sections
   one
+-------------------------------------------------------------------------------
+MessageTests.cpp:56
 ...............................................................................
 
 MessageTests.cpp:58: FAILED:
@@ -2140,10 +2140,10 @@ explicitly with message:
   Message from section one
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:61
-
 ./failing/message/sections
   two
+-------------------------------------------------------------------------------
+MessageTests.cpp:61
 ...............................................................................
 
 MessageTests.cpp:63: FAILED:
@@ -2152,10 +2152,10 @@ explicitly with message:
 
 Message from section one
 -------------------------------------------------------------------------------
-MessageTests.cpp:69
-
 ./succeeding/message/sections/stdout
   one
+-------------------------------------------------------------------------------
+MessageTests.cpp:69
 ...............................................................................
 
 
@@ -2163,19 +2163,19 @@ No assertions in section, 'one'
 
 Message from section two
 -------------------------------------------------------------------------------
-MessageTests.cpp:74
-
 ./succeeding/message/sections/stdout
   two
+-------------------------------------------------------------------------------
+MessageTests.cpp:74
 ...............................................................................
 
 
 No assertions in section, 'two'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:80
-
 ./mixed/message/scoped
+-------------------------------------------------------------------------------
+MessageTests.cpp:80
 ...............................................................................
 
 MessageTests.cpp:86:
@@ -2277,9 +2277,9 @@ with messages:
   i := 10
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:90
-
 ./succeeding/nofail
+-------------------------------------------------------------------------------
+MessageTests.cpp:90
 ...............................................................................
 
 MessageTests.cpp:92:
@@ -2290,18 +2290,18 @@ FAILED - but was ok:
 No assertions in test case, './succeeding/nofail'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:95
-
 just info
+-------------------------------------------------------------------------------
+MessageTests.cpp:95
 ...............................................................................
 
 
 No assertions in test case, 'just info'
 
 -------------------------------------------------------------------------------
-MessageTests.cpp:99
-
 just failure
+-------------------------------------------------------------------------------
+MessageTests.cpp:99
 ...............................................................................
 
 MessageTests.cpp:101: FAILED:
@@ -2309,10 +2309,10 @@ explicitly with message:
   Previous info should not be seen
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:19
-
 ./succeeding/Misc/Sections
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:19
 ...............................................................................
 
 MiscTests.cpp:21:
@@ -2328,10 +2328,10 @@ with expansion:
   2 != 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:25
-
 ./succeeding/Misc/Sections
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:25
 ...............................................................................
 
 MiscTests.cpp:27:
@@ -2341,10 +2341,10 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:36
-
 ./succeeding/Misc/Sections/nested
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:36
 ...............................................................................
 
 MiscTests.cpp:38:
@@ -2360,11 +2360,11 @@ with expansion:
   2 != 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:41
-
 ./succeeding/Misc/Sections/nested
   s1
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:41
 ...............................................................................
 
 MiscTests.cpp:43:
@@ -2374,11 +2374,11 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:55
-
 ./mixed/Misc/Sections/nested2
   s1
   s2
+-------------------------------------------------------------------------------
+MiscTests.cpp:55
 ...............................................................................
 
 MiscTests.cpp:57: FAILED:
@@ -2387,11 +2387,11 @@ with expansion:
   1 == 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:60
-
 ./mixed/Misc/Sections/nested2
   s1
   s3
+-------------------------------------------------------------------------------
+MiscTests.cpp:60
 ...............................................................................
 
 MiscTests.cpp:62:
@@ -2401,11 +2401,11 @@ with expansion:
   1 != 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:64
-
 ./mixed/Misc/Sections/nested2
   s1
   s4
+-------------------------------------------------------------------------------
+MiscTests.cpp:64
 ...............................................................................
 
 MiscTests.cpp:66:
@@ -2415,42 +2415,42 @@ with expansion:
   1 < 2
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:75
-
 ./Sections/nested/a/b
   c
   d (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:75
 ...............................................................................
 
 
 No assertions in section, 'd (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:79
-
 ./Sections/nested/a/b
   c
   e (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:79
 ...............................................................................
 
 
 No assertions in section, 'e (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:84
-
 ./Sections/nested/a/b
   f (leaf)
+-------------------------------------------------------------------------------
+MiscTests.cpp:84
 ...............................................................................
 
 
 No assertions in section, 'f (leaf)'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:97
-
 ./mixed/Misc/Sections/loops
   s1
+-------------------------------------------------------------------------------
+MiscTests.cpp:97
 ...............................................................................
 
 MiscTests.cpp:99: FAILED:
@@ -2459,9 +2459,9 @@ with expansion:
   0 > 1
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:104
-
 ./mixed/Misc/loops
+-------------------------------------------------------------------------------
+MiscTests.cpp:104
 ...............................................................................
 
 MiscTests.cpp:111: FAILED:
@@ -2525,18 +2525,18 @@ with message:
 Some information
 An error
 -------------------------------------------------------------------------------
-MiscTests.cpp:115
-
 ./succeeding/Misc/stdout,stderr
+-------------------------------------------------------------------------------
+MiscTests.cpp:115
 ...............................................................................
 
 
 No assertions in test case, './succeeding/Misc/stdout,stderr'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:127
-
 ./succeeding/Misc/null strings
+-------------------------------------------------------------------------------
+MiscTests.cpp:127
 ...............................................................................
 
 MiscTests.cpp:129:
@@ -2552,9 +2552,9 @@ with expansion:
   {null string} == {null string}
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:133
-
 ./failing/info
+-------------------------------------------------------------------------------
+MiscTests.cpp:133
 ...............................................................................
 
 MiscTests.cpp:138: FAILED:
@@ -2564,9 +2564,9 @@ with messages:
   i := 7
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:149
-
 ./succeeding/checkedif
+-------------------------------------------------------------------------------
+MiscTests.cpp:149
 ...............................................................................
 
 MiscTests.cpp:143:
@@ -2582,9 +2582,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:154
-
 ./failing/checkedif
+-------------------------------------------------------------------------------
+MiscTests.cpp:154
 ...............................................................................
 
 MiscTests.cpp:143: FAILED:
@@ -2598,9 +2598,9 @@ with expansion:
   false
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:167
-
 ./succeeding/checkedelse
+-------------------------------------------------------------------------------
+MiscTests.cpp:167
 ...............................................................................
 
 MiscTests.cpp:161:
@@ -2616,9 +2616,9 @@ with expansion:
   true
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:172
-
 ./failing/checkedelse
+-------------------------------------------------------------------------------
+MiscTests.cpp:172
 ...............................................................................
 
 MiscTests.cpp:161: FAILED:
@@ -2632,29 +2632,29 @@ with expansion:
   false
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:179
-
 ./misc/xmlentitycheck
   embedded xml
+-------------------------------------------------------------------------------
+MiscTests.cpp:179
 ...............................................................................
 
 
 No assertions in section, 'embedded xml'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:183
-
 ./misc/xmlentitycheck
   encoded chars
+-------------------------------------------------------------------------------
+MiscTests.cpp:183
 ...............................................................................
 
 
 No assertions in section, 'encoded chars'
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:189
-
 ./manual/onechar
+-------------------------------------------------------------------------------
+MiscTests.cpp:189
 ...............................................................................
 
 MiscTests.cpp:192: FAILED:
@@ -2663,9 +2663,9 @@ with message:
   3
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:195
-
 ./succeeding/atomic if
+-------------------------------------------------------------------------------
+MiscTests.cpp:195
 ...............................................................................
 
 MiscTests.cpp:202:
@@ -2675,9 +2675,9 @@ with expansion:
   0 == 0
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:210
-
 ./succeeding/matchers
+-------------------------------------------------------------------------------
+MiscTests.cpp:210
 ...............................................................................
 
 MiscTests.cpp:212:
@@ -2705,9 +2705,9 @@ with expansion:
   "this string contains 'abc' as a substring" ends with: "substring"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:219
-
 ./failing/matchers/Contains
+-------------------------------------------------------------------------------
+MiscTests.cpp:219
 ...............................................................................
 
 MiscTests.cpp:221: FAILED:
@@ -2716,9 +2716,9 @@ with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:224
-
 ./failing/matchers/StartsWith
+-------------------------------------------------------------------------------
+MiscTests.cpp:224
 ...............................................................................
 
 MiscTests.cpp:226: FAILED:
@@ -2727,9 +2727,9 @@ with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:229
-
 ./failing/matchers/EndsWith
+-------------------------------------------------------------------------------
+MiscTests.cpp:229
 ...............................................................................
 
 MiscTests.cpp:231: FAILED:
@@ -2738,9 +2738,9 @@ with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
 
 -------------------------------------------------------------------------------
-MiscTests.cpp:234
-
 ./failing/matchers/Equals