Fully committed to new Text class.

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

13 files changed, 849 insertions, 856 deletions

diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp
index 81f0ad5f..7f24d5b5 100644
--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -13,7 +13,6 @@
 #include "internal/catch_runner_impl.hpp"
 #include "internal/catch_test_spec.h"
 #include "internal/catch_version.h"
-#include "internal/catch_line_wrap.h"
 #include "internal/catch_text.h"
 
 #include <fstream>
@@ -162,7 +161,6 @@ namespace Catch {
                 displayedSpecificOption = true;
                 std::cout   << "\n" << opt.optionNames() << " " << opt.argsSynopsis() << "\n\n"
                             << opt.optionSummary() << "\n\n"
-//                            << LineWrapper().setIndent( 2 ).wrap( opt.optionDescription() ) << "\n" << std::endl;
                             << Text( opt.optionDescription(), TextAttributes().setIndent( 2 ) ) << "\n" << std::endl;
             }
         }
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index f3f214b2..ff95675b 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -27,7 +27,7 @@
 #include "catch_test_case_info.hpp"
 #include "catch_tags.hpp"
 #include "catch_version.hpp"
-#include "catch_line_wrap.hpp"
+#include "catch_text.hpp"
 #include "catch_message.hpp"
 #include "catch_legacy_reporter_adapter.hpp"
 
diff --git a/include/internal/catch_line_wrap.h b/include/internal/catch_line_wrap.h
deleted file mode 100644
index cfd31df8..00000000
--- a/include/internal/catch_line_wrap.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Created by Phil on 11/1/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_CATCH_LINE_WRAP_H_INCLUDED
-#define TWOBLUECUBES_CATCH_LINE_WRAP_H_INCLUDED
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-    
-    class LineWrapper {
-    public:
-        LineWrapper();
-
-        LineWrapper& setIndent( std::size_t _indent );
-        LineWrapper& setInitialIndent( std::size_t _initalIndent );
-        LineWrapper& setRight( std::size_t _right );
-        LineWrapper& setTabChar( char _tabChar );
-
-        LineWrapper& wrap( std::string const& _str );
-
-        std::string toString() const;
-
-        typedef std::vector<std::string>::const_iterator const_iterator;
-
-        const_iterator begin() const { return lines.begin(); }
-        const_iterator end() const { return lines.end(); }
-        std::string const& last() const { return lines.back(); }
-        std::size_t size() const { return lines.size(); }
-        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
-
-        friend std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper );
-        
-    private:
-        void wrapInternal( std::string const& _str );
-        void addLine( const std::string& _line );
-        bool isWrapPoint( char c );
-        std::size_t getCurrentIndent() const;
-
-        std::size_t right;
-        std::size_t nextTab;
-        std::size_t tab;
-        std::size_t indent;
-        std::size_t initialIndent;
-        std::string wrappableChars;
-        char tabChar;
-        int recursionCount;
-        std::vector<std::string> lines;
-    };
-    
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_LINE_WRAP_H_INCLUDED
diff --git a/include/internal/catch_line_wrap.hpp b/include/internal/catch_line_wrap.hpp
deleted file mode 100644
index aa278f5d..00000000
--- a/include/internal/catch_line_wrap.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  Created by Phil on 11/1/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_CATCH_LINE_WRAP_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_LINE_WRAP_HPP_INCLUDED
-
-#include "catch_line_wrap.h"
-
-namespace Catch {
-    
-    LineWrapper::LineWrapper()
-    :   right( CATCH_CONFIG_CONSOLE_WIDTH-1 ),
-        nextTab( 0 ),
-        tab( 0 ),
-        indent( 0 ),
-        initialIndent( (std::size_t)-1 ), // use indent by default
-        wrappableChars( " [({.,/|\\" ),
-        tabChar( '\t' ),
-        recursionCount( 0 )
-    {}
-    
-    LineWrapper& LineWrapper::setIndent( std::size_t _indent ) {
-        indent = _indent;
-        return *this;
-    }
-    LineWrapper& LineWrapper::setInitialIndent( std::size_t _initialIndent ) {
-        initialIndent = _initialIndent;
-        return *this;
-    }
-    LineWrapper& LineWrapper::setRight( std::size_t _right ) {
-        right = _right;
-        return *this;
-    }
-    LineWrapper& LineWrapper::wrap( std::string const& _str ) {
-        nextTab = tab = 0;
-        wrapInternal( _str );
-        return *this;
-    }
-    LineWrapper& LineWrapper::setTabChar( char _tabChar ) {
-        tabChar = _tabChar;
-        return *this;
-    }
-    bool LineWrapper::isWrapPoint( char c ) {
-        return wrappableChars.find( c ) != std::string::npos;
-    }
-    void LineWrapper::wrapInternal( std::string const& _str ) {
-        assert( ++recursionCount < 1000 );
-
-        std::size_t width = right - getCurrentIndent();
-        std::size_t wrapPoint = width-tab;
-        for( std::size_t pos = 0; pos < _str.size(); ++pos ) {
-            if( _str[pos] == '\n' )
-            {
-                addLine( _str.substr( 0, pos ) );
-                nextTab = tab = 0;
-                return wrapInternal( _str.substr( pos+1 ) );
-            }                
-            if( pos == width-tab ) {
-                if( _str[wrapPoint] == ' ' ) {
-                    addLine( _str.substr( 0, wrapPoint ) );
-                    while( _str[++wrapPoint] == ' ' );
-                }
-                else if( isWrapPoint( _str[wrapPoint] ) ) {
-                    addLine( _str.substr( 0, wrapPoint ) );
-                }
-                else {
-                    addLine( _str.substr( 0, --wrapPoint ) + '-' );
-                }
-                return wrapInternal( _str.substr( wrapPoint ) );
-            }
-            if( _str[pos] == tabChar ) {
-                nextTab = pos;
-                std::string withoutTab = _str.substr( 0, nextTab ) + _str.substr( nextTab+1 );
-                return wrapInternal( withoutTab );
-            }
-            else if( pos > 0 && isWrapPoint( _str[pos] ) ) {
-                wrapPoint = pos;
-            }
-        }
-        addLine( _str );
-    }
-
-    std::ostream& operator << ( std::ostream& _stream, LineWrapper const& _lineWrapper ) {
-        for( LineWrapper::const_iterator it = _lineWrapper.begin(), itEnd = _lineWrapper.end();
-            it != itEnd; ++it ) {
-            if( it != _lineWrapper.begin() )
-                _stream << "\n";
-            _stream << *it;
-        }
-        return _stream;
-    }
-    std::string LineWrapper::toString() const {
-        std::ostringstream oss;
-        oss << *this;
-        return oss.str();
-    }
-    
-    void LineWrapper::addLine( const std::string& _line ) {
-        lines.push_back( std::string( tab + getCurrentIndent(), ' ' ) + _line );
-        if( nextTab > 0 )
-            tab = nextTab;
-    }
-    
-    std::size_t LineWrapper::getCurrentIndent() const
-    {
-        return (initialIndent != (std::size_t)-1 && lines.empty() )
-            ? initialIndent
-            : indent;
-    }
-    
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_LINE_WRAP_HPP_INCLUDED
diff --git a/include/internal/catch_list.hpp b/include/internal/catch_list.hpp
index c0a44081..b1504f4d 100644
--- a/include/internal/catch_list.hpp
+++ b/include/internal/catch_list.hpp
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
 
 #include "catch_commandline.hpp"
-#include "catch_line_wrap.h"
+#include "catch_text.h"
 #include "catch_console_colour.hpp"
 
 #include <limits>
@@ -57,11 +57,11 @@ namespace Catch {
             if( matchesFilters( config.filters, *it ) ) {
                 matchedTests++;
                 // !TBD: consider listAs()
-                LineWrapper nameWrapper;
-                nameWrapper.setRight( maxNameLen ).setIndent( 2 ).wrap( it->getTestCaseInfo().name );
+                Text nameWrapper(   it->getTestCaseInfo().name,
+                                    TextAttributes().setWidth( maxNameLen ).setIndent(2) );
 
-                LineWrapper tagsWrapper;
-                tagsWrapper.setRight( maxTagLen ).wrap( it->getTestCaseInfo().tagsAsString );
+                Text tagsWrapper(   it->getTestCaseInfo().tagsAsString,
+                                    TextAttributes().setWidth( maxTagLen ) );
                 
                 for( std::size_t i = 0; i < std::max( nameWrapper.size(), tagsWrapper.size() ); ++i ) {
                     Colour::Code colour = Colour::None;
@@ -135,9 +135,9 @@ namespace Catch {
         for( std::map<std::string, int>::const_iterator countIt = tagCounts.begin(), countItEnd = tagCounts.end();
                 countIt != countItEnd;
                 ++countIt ) {            
-            LineWrapper wrapper;
-            wrapper.setIndent(2).setRight( maxTagLen ).wrap( "[" + countIt->first + "]" );
-            
+            Text wrapper( "[" + countIt->first + "]", TextAttributes()
+                                                        .setIndent(2)
+                                                        .setWidth( maxTagLen ) );
             std::cout << wrapper;
             std::size_t dots = 2;
             if( maxTagLen > wrapper.last().size() )
diff --git a/include/internal/catch_test_case_info.h b/include/internal/catch_test_case_info.h
index fde9748a..ba804b19 100644
--- a/include/internal/catch_test_case_info.h
+++ b/include/internal/catch_test_case_info.h
@@ -9,6 +9,7 @@
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
 #include "catch_common.h"
+#include "catch_ptr.hpp"
 
 #include <string>
 #include <set>
diff --git a/include/internal/catch_text.h b/include/internal/catch_text.h
index 97288a72..8584da31 100644
--- a/include/internal/catch_text.h
+++ b/include/internal/catch_text.h
@@ -8,6 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 
+#include "catch_config.hpp"
+
 #include <string>
 #include <vector>
 
@@ -34,62 +36,8 @@ namespace Catch {
 
     class Text {
     public:
-        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
-        : attr( _attr )
-        {
-            std::string wrappableChars = " [({.,/|\\-";
-            std::size_t indent = _attr.initialIndent != std::string::npos
-                ? _attr.initialIndent
-                : _attr.indent;
-            std::string remainder = _str;
-
-            while( !remainder.empty() ) {
-                assert( lines.size() < 1000 );
-                std::size_t tabPos = std::string::npos;
-                std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
-                std::size_t pos = remainder.find_first_of( '\n' );
-                if( pos <= width ) {
-                    width = pos;
-                }
-                pos = remainder.find_last_of( _attr.tabChar, width );
-                if( pos != std::string::npos ) {
-                    tabPos = pos;
-                    if( remainder[width] == '\n' )
-                        width--;
-                    remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
-                }
-                
-                if( width == remainder.size() ) {
-                    spliceLine( indent, remainder, width );
-                }
-                else if( remainder[width] == '\n' ) {
-                    spliceLine( indent, remainder, width );
-                    if( width <= 1 || remainder.size() != 1 )
-                        remainder = remainder.substr( 1 );
-                    indent = _attr.indent;
-                }
-                else {
-                    pos = remainder.find_last_of( wrappableChars, width );
-                    if( pos != std::string::npos ) {
-                        spliceLine( indent, remainder, pos );
-                        if( remainder[0] == ' ' )
-                            remainder = remainder.substr( 1 );
-                    }
-                    else {
-                        spliceLine( indent, remainder, width-1 );
-                        lines.back() += "-";
-                    }
-                    if( lines.size() == 1 )
-                        indent = _attr.indent;
-                    if( tabPos != std::string::npos )
-                        indent += tabPos;
-                }
-            }
-        }
-        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
-            lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
-            _remainder = _remainder.substr( _pos );
-        }
+        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() );
+        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos );
         
         typedef std::vector<std::string>::const_iterator const_iterator;
 
@@ -98,21 +46,9 @@ namespace Catch {
         std::string const& last() const { return lines.back(); }
         std::size_t size() const { return lines.size(); }
         std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+        std::string toString() const;
 
-        friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
-            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
-                it != itEnd; ++it ) {
-                if( it != _text.begin() )
-                    _stream << "\n";
-                _stream << *it;
-            }
-            return _stream;
-        }
-        std::string toString() const {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
+        friend std::ostream& operator << ( std::ostream& _stream, Text const& _text );
         
     private:
         std::string str;
diff --git a/include/internal/catch_text.hpp b/include/internal/catch_text.hpp
new file mode 100644
index 00000000..bc502e8d
--- /dev/null
+++ b/include/internal/catch_text.hpp
@@ -0,0 +1,92 @@
+/*
+ *  Created by Phil on 20/4/2013.
+ *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_CATCH_TEXT_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_TEXT_HPP_INCLUDED
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+    
+    Text::Text( std::string const& _str, TextAttributes const& _attr )
+    : attr( _attr )
+    {
+        std::string wrappableChars = " [({.,/|\\-";
+        std::size_t indent = _attr.initialIndent != std::string::npos
+            ? _attr.initialIndent
+            : _attr.indent;
+        std::string remainder = _str;
+
+        while( !remainder.empty() ) {
+            assert( lines.size() < 1000 );
+            std::size_t tabPos = std::string::npos;
+            std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
+            std::size_t pos = remainder.find_first_of( '\n' );
+            if( pos <= width ) {
+                width = pos;
+            }
+            pos = remainder.find_last_of( _attr.tabChar, width );
+            if( pos != std::string::npos ) {
+                tabPos = pos;
+                if( remainder[width] == '\n' )
+                    width--;
+                remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
+            }
+            
+            if( width == remainder.size() ) {
+                spliceLine( indent, remainder, width );
+            }
+            else if( remainder[width] == '\n' ) {
+                spliceLine( indent, remainder, width );
+                if( width <= 1 || remainder.size() != 1 )
+                    remainder = remainder.substr( 1 );
+                indent = _attr.indent;
+            }
+            else {
+                pos = remainder.find_last_of( wrappableChars, width );
+                if( pos != std::string::npos && pos > 0 ) {
+                    spliceLine( indent, remainder, pos );
+                    if( remainder[0] == ' ' )
+                        remainder = remainder.substr( 1 );
+                }
+                else {
+                    spliceLine( indent, remainder, width-1 );
+                    lines.back() += "-";
+                }
+                if( lines.size() == 1 )
+                    indent = _attr.indent;
+                if( tabPos != std::string::npos )
+                    indent += tabPos;
+            }
+        }
+    }
+
+    void Text::spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
+        lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
+        _remainder = _remainder.substr( _pos );
+    }
+
+    std::string Text::toString() const {
+        std::ostringstream oss;
+        oss << *this;
+        return oss.str();
+    }
+
+    std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+        for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+            it != itEnd; ++it ) {
+            if( it != _text.begin() )
+                _stream << "\n";
+            _stream << *it;
+        }
+        return _stream;
+    }
+    
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_TEXT_HPP_INCLUDED
diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp
index 8326cc2f..99ba0bc3 100644
--- a/include/reporters/catch_reporter_console.hpp
+++ b/include/reporters/catch_reporter_console.hpp
@@ -203,7 +203,7 @@ namespace Catch {
                 if( result.hasExpandedExpression() ) {
                     stream << "with expansion:\n";
                     Colour colourGuard( Colour::ReconstructedExpression );
-                    stream << LineWrapper().setIndent(2).wrap( result.getExpandedExpression() ) << "\n";
+                    stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << "\n";
                 }
             }
             void printMessage() const {
@@ -212,7 +212,7 @@ namespace Catch {
                 for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
                         it != itEnd;
                         ++it ) {                    
-                    stream << LineWrapper().setIndent(2).wrap( it->message ) << "\n";
+                    stream << Text( it->message, TextAttributes().setIndent(2) ) << "\n";
                 }
             }
             void printSourceInfo() const {
@@ -313,10 +313,9 @@ namespace Catch {
                 i+=2;
             else
                 i = 0;
-            stream << LineWrapper()
-                        .setIndent( indent+i)
-                        .setInitialIndent( indent )
-                        .wrap( _string ) << "\n";
+            stream << Text( _string, TextAttributes()
+                                        .setIndent( indent+i)
+                                        .setInitialIndent( indent ) ) << "\n";
         }
         
         void printTotals( const Totals& totals ) {
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
+---------------------------------------------