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 'upstream/master'

Browse Source
This commit is contained in:
Fraser Hutchison
2013-10-23 15:14:52 +01:00
parent c1062c97b5 2b644b5128
commit 65a7d3a09f
44 changed files with 15089 additions and 15868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) );

4
include/internal/catch_reporter_registrars.hpp
View File

@@ -67,8 +67,8 @@ namespace Catch {
}
#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name );
namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
#endif // TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED

15
include/internal/catch_tags.hpp
View File

@@ -121,9 +121,10 @@ namespace Catch {
}
bool matches( std::set<std::string> const& tags ) const {
TagMap::const_iterator it = m_tags.begin();
TagMap::const_iterator itEnd = m_tags.end();
for(; it != itEnd; ++it ) {
for( TagMap::const_iterator
it = m_tags.begin(), itEnd = m_tags.end();
it != itEnd;
++it ) {
bool found = tags.find( it->first ) != tags.end();
if( found == it->second.isNegated() )
return false;
@@ -138,9 +139,10 @@ namespace Catch {
class TagExpression {
public:
bool matches( std::set<std::string> const& tags ) const {
std::vector<TagSet>::const_iterator it = m_tagSets.begin();
std::vector<TagSet>::const_iterator itEnd = m_tagSets.end();
for(; it != itEnd; ++it )
for( std::vector<TagSet>::const_iterator
it = m_tagSets.begin(), itEnd = m_tagSets.end();
it != itEnd;
++it )
if( it->matches( tags ) )
return true;
return false;
@@ -173,6 +175,7 @@ namespace Catch {
break;
case ',':
m_exp.m_tagSets.push_back( m_currentTagSet );
m_currentTagSet = TagSet();
break;
}
}

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' );

2
include/internal/catch_version.hpp
View File

@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 1, 0, 10, "master" );
Version libraryVersion( 1, 0, 11, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED