cheng/Catch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed line wrap bug

Browse Source 
Added line wrap tests and modified wrap algo to wrap within words using a -
This commit is contained in:
Phil Nash 2013-03-25 09:20:51 +00:00
parent 29426b6359
commit 2927c240a1
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_line_wrap.hpp
View File

@ -25,8 +25,14 @@ namespace Catch {
for( std::size_t pos = 0; pos < paragraph.size(); ++pos ) { for( std::size_t pos = 0; pos < paragraph.size(); ++pos ) {
if( pos == width ) { if( pos == width ) {
addIndent( os, indent ); addIndent( os, indent );
os << paragraph.substr( 0, wrapPoint ) << "\n"; if( paragraph[wrapPoint] == ' ' ) {
return recursivelyWrapLine( os, paragraph.substr( wrapPoint+1 ), columns, indent+tab ); os << paragraph.substr( 0, wrapPoint ) << "\n";
while( paragraph[++wrapPoint] == ' ' );
}
else {
os << paragraph.substr( 0, --wrapPoint ) << "-\n";
}
return recursivelyWrapLine( os, paragraph.substr( wrapPoint ), columns, indent+tab );
} }
if( paragraph[pos] == '\t' ) { if( paragraph[pos] == '\t' ) {
tab = pos; tab = pos;

35
projects/SelfTest/TestMain.cpp
View File

@ -10,6 +10,7 @@
#endif #endif
#include "catch_self_test.hpp" #include "catch_self_test.hpp"
#include "catch_line_wrap.h"
TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" ) { TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" ) {
using namespace Catch; using namespace Catch;
@ -422,5 +423,37 @@ TEST_CASE( "selftest/tags", "" ) {
CHECK( oneTag.matchesTags( "~[hide]" ) == false ); CHECK( oneTag.matchesTags( "~[hide]" ) == false );
} }
}
TEST_CASE( "Long strings can be wrapped", "[wrap]" ) {
// guide: 123456789012345678
std::string testString = "one two three four";
SECTION( "No wrapping", "" ) {
CHECK( Catch::wrapLongStrings( testString, 80, 0 ) == testString );
CHECK( Catch::wrapLongStrings( testString, 18, 0 ) == testString );
}
SECTION( "Wrapped once", "" ) {
CHECK( Catch::wrapLongStrings( testString, 17, 0 ) == "one two three\nfour" );
CHECK( Catch::wrapLongStrings( testString, 16, 0 ) == "one two three\nfour" );
CHECK( Catch::wrapLongStrings( testString, 15, 0 ) == "one two three\nfour" );
CHECK( Catch::wrapLongStrings( testString, 14, 0 ) == "one two three\nfour" );
CHECK( Catch::wrapLongStrings( testString, 13, 0 ) == "one two\nthree four" );
}
SECTION( "Wrapped twice", "" ) {
CHECK( Catch::wrapLongStrings( testString, 9, 0 ) == "one two\nthree\nfour" );
CHECK( Catch::wrapLongStrings( testString, 8, 0 ) == "one two\nthree\nfour" );
}
SECTION( "Wrapped three times", "" ) {
CHECK( Catch::wrapLongStrings( testString, 7, 0 ) == "one\ntwo\nthree\nfour" );
CHECK( Catch::wrapLongStrings( testString, 5, 0 ) == "one\ntwo\nthree\nfour" );
}
SECTION( "Short wrap", "" ) {
CHECK( Catch::wrapLongStrings( "abcdef", 4, 0 ) == "abc-\ndef" );
CHECK( Catch::wrapLongStrings( "abcdefg", 4, 0 ) == "abc-\ndefg" );
CHECK( Catch::wrapLongStrings( "abcdefgh", 4, 0 ) == "abc-\ndef-\ngh" );
CHECK( Catch::wrapLongStrings( testString, 4, 0 ) == "one\ntwo\nthr-\nee\nfour" );
CHECK( Catch::wrapLongStrings( testString, 3, 0 ) == "one\ntwo\nth-\nree\nfo-\nur" );
}
} }