eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-27 23:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fully committed to new Text class.

Browse source 
- moved impl into .hpp
- replaced last few uses of LineWrapper with Text
- removed LineWrapper
This commit is contained in:
Phil Nash 2013-04-20 19:36:40 +01:00
parent 97d99852a8
commit b3acf45d70
13 changed files with 954 additions and 961 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/internal/catch_list.hpp
View file

@ -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() )