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

Replaced all file/ line pairings with SourceLineInfo

Browse Source
This commit is contained in:
Phil Nash
2012-05-08 19:16:18 +01:00
parent 81a122e66a
commit 5d1c8f2c6d
9 changed files with 73 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_runner_impl.hpp
View File

@@ -147,8 +147,7 @@ namespace Catch
do
{
m_reporter->StartGroup( "test case run" );
m_currentResult.setFileAndLine( m_runningTest->getTestCaseInfo().getFilename(),
m_runningTest->getTestCaseInfo().getLine() );
m_currentResult.setLineInfo( m_runningTest->getTestCaseInfo().getLineInfo() );
runCurrentTest( redirectedCout, redirectedCerr );
m_reporter->EndGroup( "test case run", m_totals - prevTotals );
}
@@ -247,18 +246,17 @@ namespace Catch
(
const std::string& name,
const std::string& description,
const std::string& filename,
std::size_t line,
const SourceLineInfo& lineInfo,
Counts& assertions
)
{
std::ostringstream oss;
oss << name << "@" << SourceLineInfo( filename, line );
oss << name << "@" << lineInfo;
if( !m_runningTest->addSection( oss.str() ) )
return false;
m_currentResult.setFileAndLine( filename, line );
m_currentResult.setLineInfo( lineInfo );
m_reporter->StartSection( name, description );
assertions = m_totals.assertions;