3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-22 20:45:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	README.md
	include/internal/catch_version.hpp
	single_include/catch.hpp
This commit is contained in:
dmitry.trifonov
2013-10-27 21:32:15 +04:00
parent 8be507e4a6 93a945cee9
commit 7be4d07158
18 changed files with 2560 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/internal/catch_context_impl.hpp
View File

@@ -17,7 +17,7 @@ namespace Catch {
class Context : public IMutableContext {
Context() : m_config( NULL ) {}
Context() : m_config( NULL ), m_runner( NULL ), m_resultCapture( NULL ) {}
Context( Context const& );
void operator=( Context const& );
@@ -77,9 +77,9 @@ namespace Catch {
}
private:
Ptr<IConfig const> m_config;
IRunner* m_runner;
IResultCapture* m_resultCapture;
Ptr<IConfig const> m_config;
std::map<std::string, IGeneratorsForTest*> m_generatorsByTestName;
};

2
include/internal/catch_list.hpp
View File

@@ -58,7 +58,7 @@ namespace Catch {
matchedTests++;
Text nameWrapper( it->getTestCaseInfo().name,
TextAttributes()
.setWidth( maxNameLen )
.setWidth( maxNameLen+2 )
.setInitialIndent(2)
.setIndent(4) );

5
include/internal/catch_text.hpp
View File

@@ -23,7 +23,10 @@ namespace Catch {
std::string remainder = _str;
while( !remainder.empty() ) {
assert( lines.size() < 1000 );
if( lines.size() >= 1000 ) {
lines.push_back( "... message truncated due to excessive size" );
return;
}
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' );