diff options
| author | Phil Nash | 2017-07-20 23:13:08 +0100 |
|---|---|---|
| committer | Phil Nash | 2017-07-20 23:13:08 +0100 |
| commit | 6ec7709e07f89baeb01d3872236b80c3aa17bb8a (patch) | |
| tree | 6046c2af4db6bfd5d08e34411be83c41641cbd27 /include | |
| parent | 58d8bc6985a70e537cfcc4959dfc405ba9cb2a00 (diff) | |
| download | catch3-6ec7709e07f89baeb01d3872236b80c3aa17bb8a.tar.gz | |
removed final use of tbc_text_format (console reporter)
Diffstat (limited to 'include')
| -rw-r--r-- | include/reporters/catch_reporter_console.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/reporters/catch_reporter_console.cpp b/include/reporters/catch_reporter_console.cpp index 3643c1df..b70df425 100644 --- a/include/reporters/catch_reporter_console.cpp +++ b/include/reporters/catch_reporter_console.cpp @@ -11,13 +11,15 @@ #include "../internal/catch_reporter_registrars.hpp" #include "../internal/catch_console_colour.hpp" #include "../internal/catch_version.h" -#include "../internal/catch_text.h" +#include "../internal/catch_clara.h" // For TextFlow #include <cfloat> #include <cstdio> namespace Catch { + using namespace clara::TextFlow; + struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> { using StreamingReporterBase::StreamingReporterBase; @@ -209,7 +211,7 @@ namespace Catch { if( result.hasExpandedExpression() ) { stream << "with expansion:\n"; Colour colourGuard( Colour::ReconstructedExpression ); - stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << '\n'; + stream << Column( result.getExpandedExpression() ).indent(2) << '\n'; } } void printMessage() const { @@ -218,7 +220,7 @@ namespace Catch { for( auto const& msg : messages ) { // If this assertion is a warning ignore any INFO messages if( printInfoMessages || msg.type != ResultWas::Info ) - stream << Text( msg.message, TextAttributes().setIndent(2) ) << '\n'; + stream << Column( msg.message ).indent(2) << '\n'; } } void printSourceInfo() const { @@ -311,9 +313,7 @@ namespace Catch { i+=2; else i = 0; - stream << Text( _string, TextAttributes() - .setIndent( indent+i) - .setInitialIndent( indent ) ) << '\n'; + stream << Column( _string ).indent( indent+i ).initialIndent( indent ) << '\n'; } struct SummaryColumn { |