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

merge from upstream

Browse Source
This commit is contained in:
Malcolm Noyes
2013-12-11 20:57:42 +00:00
parent 9f280a412d a6d74bd55a
commit a3a56158f0
9 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_common.h
View File

@@ -57,16 +57,6 @@ namespace Catch {
delete it->second;
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
template<typename ContainerT, typename Function>
inline void forEach( ContainerT const& container, Function function ) {
std::for_each( container.begin(), container.end(), function );
}
bool startsWith( std::string const& s, std::string const& prefix );
bool endsWith( std::string const& s, std::string const& suffix );
bool contains( std::string const& s, std::string const& infix );

2
include/internal/catch_debugger.h
View File

@@ -43,7 +43,7 @@ namespace Catch{
#endif
#ifndef CATCH_BREAK_INTO_DEBUGGER
#define CATCH_BREAK_INTO_DEBUGGER()
#define CATCH_BREAK_INTO_DEBUGGER() Catch::isTrue( true );
#endif
#endif // TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED

2
include/internal/catch_version.hpp
View File

@@ -14,7 +14,7 @@ namespace Catch {
// These numbers are maintained by a script
template <typename T>
const T LibraryVersionInfo<T>::value( 1, 0, 16, "master" );
const T LibraryVersionInfo<T>::value( 1, 0, 17, "master" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

4
include/reporters/catch_reporter_bases.hpp
View File

@@ -168,9 +168,9 @@ namespace Catch {
Ptr<TestRunNode> node = new TestRunNode( testRunStats );
node->children.swap( m_testGroups );
m_testRuns.push_back( node );
testRunEnded();
testRunEndedCumulative();
}
virtual void testRunEnded() = 0;
virtual void testRunEndedCumulative() = 0;
Ptr<IConfig> m_config;
std::ostream& stream;

2
include/reporters/catch_reporter_junit.hpp
View File

@@ -70,7 +70,7 @@ namespace Catch {
writeGroup( *m_testGroups.back(), suiteTime );
}
virtual void testRunEnded() {
virtual void testRunEndedCumulative() {
xml.endElement();
}

4
include/reporters/catch_reporter_xml.hpp
View File

@@ -59,7 +59,7 @@ namespace Catch {
virtual void StartSection( const std::string& sectionName, const std::string& description ) {
if( m_sectionDepth++ > 0 ) {
m_xml.startElement( "Section" )
.writeAttribute( "name", sectionName )
.writeAttribute( "name", trim( sectionName ) )
.writeAttribute( "description", description );
}
}
@@ -76,7 +76,7 @@ namespace Catch {
}
virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) {
m_xml.startElement( "TestCase" ).writeAttribute( "name", testInfo.name );
m_xml.startElement( "TestCase" ).writeAttribute( "name", trim( testInfo.name ) );
m_currentTestSuccess = true;
}