3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-12-23 03:43:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

TeamCity reporter work

Browse Source 
expanded reporting - includes section headers
This commit is contained in:
Phil Nash 2014-12-20 00:46:02 +00:00
parent 5933d75cdc
commit 8ec959e936
4 changed files with 78 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/reporters/catch_reporter_bases.hpp
View File

@ -198,6 +198,16 @@ namespace Catch {
};
template<char C>
char const* getLineOfChars() {
static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
if( !*line ) {
memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
}
return line;
}
} // end namespace Catch
#endif // TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED

9
include/reporters/catch_reporter_console.hpp
View File

@ -445,15 +445,6 @@ namespace Catch {
void printSummaryDivider() {
stream << getLineOfChars<'-'>() << "\n";
}
template<char C>
static char const* getLineOfChars() {
static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
if( !*line ) {
memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
}
return line;
}
private:
bool m_headerPrinted;

88
include/reporters/catch_reporter_teamcity.hpp
View File

@ -18,7 +18,8 @@ namespace Catch {
struct TeamCityReporter : StreamingReporterBase {
TeamCityReporter( ReporterConfig const& _config )
: StreamingReporterBase( _config )
: StreamingReporterBase( _config ),
m_headerPrintedForThisSection( false )
{}
static std::string escape( std::string const& str ) {
@ -65,23 +66,26 @@ namespace Catch {
AssertionResult const& result = assertionStats.assertionResult;
if( !result.isOk() ) {
std::string message;
std::string details;
std::ostringstream msg;
if( !m_headerPrintedForThisSection )
printTestCaseAndSectionHeader( msg );
m_headerPrintedForThisSection = true;
switch( result.getResultType() ) {
case ResultWas::ExpressionFailed:
message = "expression failed";
msg << "expression failed";
break;
case ResultWas::ThrewException:
message = "unexpected exception";
msg << "unexpected exception";
break;
case ResultWas::FatalErrorCondition:
message = "fatal error condition";
msg << "fatal error condition";
break;
case ResultWas::DidntThrowException:
message = "no exception was thrown where one was expected";
msg << "no exception was thrown where one was expected";
break;
case ResultWas::ExplicitFailure:
message = "explicit failure";
msg << "explicit failure";
break;
// We shouldn't get here because of the isOk() test
@ -96,38 +100,38 @@ namespace Catch {
CATCH_NOT_IMPLEMENTED;
}
if( assertionStats.infoMessages.size() == 1 )
message += " with message:";
msg << " with message:";
if( assertionStats.infoMessages.size() > 1 )
message += " with messages:";
msg << " with messages:";
for( std::vector<MessageInfo>::const_iterator
it = assertionStats.infoMessages.begin(),
itEnd = assertionStats.infoMessages.end();
it != itEnd;
++it )
message += "\n" + it->message;
msg << "\n \"" << it->message << "\"";
if( result.hasExpression() ) {
details =
" " + result.getExpressionInMacro() + "\n"
"with expansion:\n" +
" " + result.getExpandedExpression() + "\n";
msg <<
"\n " << result.getExpressionInMacro() << "\n"
"with expansion:\n" <<
" " << result.getExpandedExpression() << "\n";
}
// !TBD: file/ line
msg << "\n" << result.getSourceInfo() << "\n";
msg << "---------------------------------------";
stream << "##teamcity[testFailed"
<< " name='" << escape( currentTestCaseInfo->name )<< "'"
<< " message='" << escape( message ) << "'"
<< " details='" << escape( details ) << "'"
<< " message='" << escape( msg.str() ) << "'"
<< "]\n";
}
return true;
}
// virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
// // !TBD
// }
virtual void sectionStarting( SectionInfo const& sectionInfo ) {
m_headerPrintedForThisSection = false;
StreamingReporterBase::sectionStarting( sectionInfo );
}
// virtual void sectionEnded( SectionStats const& _sectionStats ) {
// // !TBD
// }
@ -155,6 +159,46 @@ namespace Catch {
// }
private:
void printTestCaseAndSectionHeader( std::ostream& os ) {
assert( !m_sectionStack.empty() );
printOpenHeader( os, currentTestCaseInfo->name );
if( m_sectionStack.size() > 1 ) {
std::vector<SectionInfo>::const_iterator
it = m_sectionStack.begin()+1, // Skip first section (test case)
itEnd = m_sectionStack.end();
for( ; it != itEnd; ++it )
printHeaderString( os, it->name, 2 );
}
SourceLineInfo lineInfo = m_sectionStack.front().lineInfo;
if( !lineInfo.empty() ){
os << getLineOfChars<'-'>() << "\n";
os << lineInfo << "\n";
}
os << getLineOfChars<'.'>() << "\n\n";
}
void printOpenHeader( std::ostream& os, std::string const& _name ) {
os << getLineOfChars<'-'>() << "\n";
printHeaderString( os, _name );
}
// if string has a : in first line will set indent to follow it on
// subsequent lines
void printHeaderString( std::ostream& os, std::string const& _string, std::size_t indent = 0 ) {
std::size_t i = _string.find( ": " );
if( i != std::string::npos )
i+=2;
else
i = 0;
os << Text( _string, TextAttributes()
.setIndent( indent+i)
.setInitialIndent( indent ) ) << "\n";
}
private:
bool m_headerPrintedForThisSection;
};

4
projects/SelfTest/TrickyTests.cpp
View File

@ -81,7 +81,7 @@ struct Opaque
///////////////////////////////////////////////////////////////////////////////
TEST_CASE
(
"A failing expression with a non streamable type is still captured[failing]",
"A failing expression with a non streamable type is still captured",
"[Tricky][failing][.]"
)
{
@ -97,7 +97,7 @@ TEST_CASE
///////////////////////////////////////////////////////////////////////////////
TEST_CASE
(
"string literals of different sizes can be compared[failing]",
"string literals of different sizes can be compared",
"[Tricky][failing][.]"
)
{