diff options
| author | Phil Nash | 2014-12-19 18:16:19 +0000 |
|---|---|---|
| committer | Phil Nash | 2014-12-19 18:16:19 +0000 |
| commit | 458b3ae257d46cecd8bc555a9ea59284997f12e4 (patch) | |
| tree | e5fe3b36556c518227994b98b1d8e1f33d87e3d9 /include | |
| parent | db0421e840a01125e0e52928de62cfd42c4dd5e4 (diff) | |
| download | catch3-458b3ae257d46cecd8bc555a9ea59284997f12e4.tar.gz | |
Fixed replace(inPlace) function
and added tests (should have done that in the first place - I'll never learn!)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_common.h | 1 | ||||
| -rw-r--r-- | include/internal/catch_common.hpp | 16 | ||||
| -rw-r--r-- | include/reporters/catch_reporter_teamcity.hpp | 20 |
3 files changed, 22 insertions, 15 deletions
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index 2001c297..68d23688 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -71,6 +71,7 @@ namespace Catch { void toLowerInPlace( std::string& s ); std::string toLower( std::string const& s ); std::string trim( std::string const& str ); + bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ); struct pluralise { pluralise( std::size_t count, std::string const& label ); diff --git a/include/internal/catch_common.hpp b/include/internal/catch_common.hpp index 6147aa5f..29e9ed5a 100644 --- a/include/internal/catch_common.hpp +++ b/include/internal/catch_common.hpp @@ -36,7 +36,21 @@ namespace Catch { return start != std::string::npos ? str.substr( start, 1+end-start ) : ""; } - + + bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { + bool replaced = false; + std::size_t i = str.find( replaceThis ); + while( i != std::string::npos ) { + replaced = true; + str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() ); + if( i < str.size()-withThis.size() ) + i = str.find( replaceThis, i+withThis.size() ); + else + i = std::string::npos; + } + return replaced; + } + pluralise::pluralise( std::size_t count, std::string const& label ) : m_count( count ), m_label( label ) diff --git a/include/reporters/catch_reporter_teamcity.hpp b/include/reporters/catch_reporter_teamcity.hpp index 127ad7b6..2de57d6a 100644 --- a/include/reporters/catch_reporter_teamcity.hpp +++ b/include/reporters/catch_reporter_teamcity.hpp @@ -21,22 +21,14 @@ namespace Catch { : StreamingReporterBase( _config ) {} - static bool replace( std::string& str, std::string const& replaceThis, std::string const& withThis ) { - std::size_t i = str.find( replaceThis ); - if( i != std::string::npos ) { - str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() ); - return true; - } - return false; - } static std::string escape( std::string const& str ) { std::string escaped = str; - while( replace( escaped, "\'", "|\'" ) || - replace( escaped, "\n", "|n" ) || - replace( escaped, "\r", "|r" ) || - replace( escaped, "|", "||" ) || - replace( escaped, "[", "|[" ) || - replace( escaped, "]", "|]" ) ); + replaceInPlace( escaped, "\'", "|\'" ); + replaceInPlace( escaped, "\n", "|n" ); + replaceInPlace( escaped, "\r", "|r" ); + replaceInPlace( escaped, "|", "||" ); + replaceInPlace( escaped, "[", "|[" ); + replaceInPlace( escaped, "]", "|]" ); return escaped; } virtual ~TeamCityReporter(); |