3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-09-17 02:25:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always report the topLevel testcase in JUnit backend

Browse Source
This commit is contained in:
Amaury Chamayou
2018-06-15 08:06:55 +01:00
parent 1dce91d78e
commit d370de63bd
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/reporters/catch_reporter_junit.cpp
View File

@@ -152,19 +152,20 @@ namespace Catch {
if ( !m_config->name().empty() )
className = m_config->name() + "." + className;
writeSection( className, "", rootSection );
writeSection( className, "", rootSection, true);
}
void JunitReporter::writeSection( std::string const& className,
std::string const& rootName,
SectionNode const& sectionNode ) {
SectionNode const& sectionNode,
bool topLevel) {
std::string name = trim( sectionNode.stats.sectionInfo.name );
if( !rootName.empty() )
name = rootName + '/' + name;
if( !sectionNode.assertions.empty() ||
!sectionNode.stdOut.empty() ||
!sectionNode.stdErr.empty() ) {
if (topLevel || (!sectionNode.assertions.empty() ||
!sectionNode.stdOut.empty() ||
!sectionNode.stdErr.empty())) {
XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
if( className.empty() ) {
xml.writeAttribute( "classname", name );
@@ -176,18 +177,20 @@ namespace Catch {
}
xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
writeAssertions( sectionNode );
if( !sectionNode.assertions.empty() )
writeAssertions( sectionNode );
if( !sectionNode.stdOut.empty() )
xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
if( !sectionNode.stdErr.empty() )
xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
}
for( auto const& childNode : sectionNode.childSections )
if( className.empty() )
writeSection( name, "", *childNode );
writeSection( name, "", *childNode, false );
else
writeSection( className, name, *childNode );
writeSection( className, name, *childNode, false );
}
void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {

3
include/reporters/catch_reporter_junit.h
View File

@@ -43,7 +43,8 @@ namespace Catch {
void writeSection(std::string const& className,
std::string const& rootName,
SectionNode const& sectionNode);
SectionNode const& sectionNode,
bool topLevel);
void writeAssertions(SectionNode const& sectionNode);
void writeAssertion(AssertionStats const& stats);