merge from upstream

This commit is contained in:
Malcolm Noyes
2013-12-11 20:57:42 +00:00
9 changed files with 51 additions and 71 deletions

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;

View File

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

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