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

Some clean-up and a little more JUnit implementation

Browse Source
This commit is contained in:
Phil Nash 2010-12-10 08:18:06 +00:00
parent 0ab4432025
commit a35e4b5670
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
catch_reporter_junit.hpp
View File

@ -21,28 +21,6 @@ namespace Catch
{ {
class JunitReporter : public Catch::ITestReporter class JunitReporter : public Catch::ITestReporter
{ {
struct Indenter
{
Indenter& operator ++()
{
m_indent += "\t";
return *this;
}
Indenter& operator --()
{
m_indent = m_indent.substr( 0, m_indent.length()-1 );
return *this;
}
friend std::ostream& operator << ( std::ostream& os, const Indenter& indent )
{
os << indent.m_indent;
return os;
}
std::string m_indent;
};
struct TestStats struct TestStats
{ {
std::string element; std::string element;
@ -113,19 +91,14 @@ namespace Catch
virtual void StartGroup( const std::string& groupName ) virtual void StartGroup( const std::string& groupName )
{ {
// m_config.stream() << "\t<testsuite>\n"; m_statsForSuites.push_back( Stats( groupName ) );
// if( !groupName.empty() ) m_currentStats = &m_statsForSuites.back();
{
m_statsForSuites.push_back( Stats( groupName ) );
m_currentStats = &m_statsForSuites.back();
}
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
virtual void EndGroup( const std::string& groupName, std::size_t succeeded, std::size_t failed ) virtual void EndGroup( const std::string&, std::size_t succeeded, std::size_t failed )
{ {
// m_config.stream() << "\t</testsuite>\n"; m_currentStats->testsCount = failed+succeeded;
(groupName, succeeded, failed);
m_currentStats = &m_testSuiteStats; m_currentStats = &m_testSuiteStats;
} }
@ -135,8 +108,6 @@ namespace Catch
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
virtual void StartTestCase( const Catch::TestCaseInfo& testInfo ) virtual void StartTestCase( const Catch::TestCaseInfo& testInfo )
{ {
// m_config.stream() << "\t\t<testcase name='" << testInfo.getName() << "'>\n";
// m_currentTestSuccess = true;
m_currentStats->testCaseStats.push_back( TestCaseStats( testInfo.getName() ) ); m_currentStats->testCaseStats.push_back( TestCaseStats( testInfo.getName() ) );
} }
@ -161,6 +132,7 @@ namespace Catch
{ {
case ResultWas::ThrewException: case ResultWas::ThrewException:
stats.element = "error"; stats.element = "error";
m_currentStats->errorsCount++;
break; break;
case ResultWas::Info: case ResultWas::Info:
stats.element = "info"; // !TBD ? stats.element = "info"; // !TBD ?
@ -170,9 +142,11 @@ namespace Catch
break; break;
case ResultWas::ExplicitFailure: case ResultWas::ExplicitFailure:
stats.element = "failure"; stats.element = "failure";
m_currentStats->failuresCount++;
break; break;
case ResultWas::ExpressionFailed: case ResultWas::ExpressionFailed:
stats.element = "failure"; stats.element = "failure";
m_currentStats->failuresCount++;
break; break;
case ResultWas::Ok: case ResultWas::Ok:
stats.element = "success"; stats.element = "success";
@ -220,6 +194,12 @@ namespace Catch
{ {
XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" ); XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
xml.writeAttribute( "name", it->name ); xml.writeAttribute( "name", it->name );
xml.writeAttribute( "errors", it->errorsCount );
xml.writeAttribute( "failures", it->failuresCount );
xml.writeAttribute( "tests", it->testsCount );
xml.writeAttribute( "hostname", "tbd" );
xml.writeAttribute( "time", "tbd" );
xml.writeAttribute( "timestamp", "tbd" );
OutputTestCases( xml, *it ); OutputTestCases( xml, *it );
} }
@ -277,8 +257,6 @@ namespace Catch
std::vector<Stats> m_statsForSuites; std::vector<Stats> m_statsForSuites;
std::ostringstream m_stdOut; std::ostringstream m_stdOut;
std::ostringstream m_stdErr; std::ostringstream m_stdErr;
Indenter m_indent;
}; };
} // end namespace Catch } // end namespace Catch

10
internal/catch_xmlwriter.hpp
View File

@ -108,6 +108,16 @@ namespace Catch
return *this; return *this;
} }
template<typename T>
XmlWriter& writeAttribute( const std::string& name, const T& attribute )
{
if( !name.empty() )
{
m_os << " " << name << "=\"" << attribute << "\"";
}
return *this;
}
XmlWriter& writeText( const std::string& text ) XmlWriter& writeText( const std::string& text )
{ {
if( !text.empty() ) if( !text.empty() )