3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-10-31 20:27:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix (hopefully) for #5 (reopened)

Browse Source 
Adds name to JUnit reporter's testsuite element, even when running all tests.
Also removes redundant comment from the output.
This commit is contained in:
Phil Nash
2012-11-16 08:47:03 +00:00
parent be1cddb7ee
commit ef60d54671
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/catch_version.hpp
View File

@@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion = { 0, 9, 1, "integration" };
Version libraryVersion = { 0, 9, 2, "integration" };
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

9
include/reporters/catch_reporter_junit.hpp
View File

@@ -79,8 +79,11 @@ namespace Catch {
virtual void StartTesting(){}
virtual void StartGroup( const std::string& groupName ) {
m_statsForSuites.push_back( Stats( groupName ) );
virtual void StartGroup( const std::string& groupName ) {
if( groupName.empty() )
m_statsForSuites.push_back( Stats( "all tests" ) );
else
m_statsForSuites.push_back( Stats( groupName ) );
m_currentStats = &m_statsForSuites.back();
}
@@ -188,8 +191,6 @@ namespace Catch {
std::vector<TestCaseStats>::const_iterator it = stats.m_testCaseStats.begin();
std::vector<TestCaseStats>::const_iterator itEnd = stats.m_testCaseStats.end();
for(; it != itEnd; ++it ) {
xml.writeBlankLine();
xml.writeComment( "Test case" );
XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
xml.writeAttribute( "classname", it->m_className );

13
single_include/catch.hpp
View File

@@ -1,6 +1,6 @@
/*
* CATCH v0.9 build 1 (integration branch)
* Generated: 2012-11-15 22:13:35.214657
* CATCH v0.9 build 2 (integration branch)
* Generated: 2012-11-16 08:44:53.410120
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -5375,7 +5375,7 @@ namespace Catch {
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion = { 0, 9, 1, "integration" };
Version libraryVersion = { 0, 9, 2, "integration" };
}
// #included from: ../reporters/catch_reporter_basic.hpp
@@ -6148,7 +6148,10 @@ namespace Catch {
virtual void StartTesting(){}
virtual void StartGroup( const std::string& groupName ) {
m_statsForSuites.push_back( Stats( groupName ) );
if( groupName.empty() )
m_statsForSuites.push_back( Stats( "all tests" ) );
else
m_statsForSuites.push_back( Stats( groupName ) );
m_currentStats = &m_statsForSuites.back();
}
@@ -6256,8 +6259,6 @@ namespace Catch {
std::vector<TestCaseStats>::const_iterator it = stats.m_testCaseStats.begin();
std::vector<TestCaseStats>::const_iterator itEnd = stats.m_testCaseStats.end();
for(; it != itEnd; ++it ) {
xml.writeBlankLine();
xml.writeComment( "Test case" );
XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
xml.writeAttribute( "classname", it->m_className );