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

Refactored internal interfaces to use Totals instead of success/ fail

Browse Source
This commit is contained in:
Phil Nash
2012-02-23 18:51:21 +00:00
parent 8d93949b19
commit 9bbaeba3ae
7 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/catch_runner.hpp
View File

@@ -57,7 +57,7 @@ namespace Catch
{
config.getReporter()->StartGroup( "" );
runner.runAll();
config.getReporter()->EndGroup( "", runner.getSuccessCount(), runner.getFailureCount() );
config.getReporter()->EndGroup( "", runner.getTotals().assertions.passed, runner.getTotals().assertions.failed );
}
else
{
@@ -67,19 +67,19 @@ namespace Catch
std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end();
for(; it != itEnd; ++it )
{
size_t prevSuccess = runner.getSuccessCount();
size_t prevFail = runner.getFailureCount();
Totals prevTotals = runner.getTotals();
config.getReporter()->StartGroup( *it );
if( runner.runMatching( *it ) == 0 )
{
// Use reporter?
// std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl;
}
config.getReporter()->EndGroup( *it, runner.getSuccessCount()-prevSuccess, runner.getFailureCount()-prevFail );
Totals diffTotals = runner.getTotals() - prevTotals;
config.getReporter()->EndGroup( *it, diffTotals.assertions.passed, diffTotals.assertions.failed );
}
}
return static_cast<int>( runner.getFailureCount() );
return static_cast<int>( runner.getTotals().assertions.failed );
}
//////////////////////////////////////////////////////////////////////////

7
include/internal/catch_interfaces_runner.h
View File

@@ -12,6 +12,8 @@
#ifndef TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
#define TWOBLUECUBES_INTERNAL_CATCH_INTERFACES_RUNNER_H_INCLUDED
#include "catch_totals.hpp"
#include <string>
namespace Catch
@@ -32,10 +34,7 @@ namespace Catch
( const std::string& rawTestSpec
) = 0;
virtual std::size_t getSuccessCount
() const = 0;
virtual std:: size_t getFailureCount
virtual Totals getTotals
() const = 0;
};

12
include/internal/catch_runner_impl.hpp
View File

@@ -391,21 +391,13 @@ namespace Catch
}
///////////////////////////////////////////////////////////////////////////
virtual std::size_t getSuccessCount
virtual Totals getTotals
()
const
{
return m_totals.assertions.passed;
return m_totals;
}
///////////////////////////////////////////////////////////////////////////
virtual std:: size_t getFailureCount
()
const
{
return m_totals.assertions.failed;
}
private: // IResultCapture
///////////////////////////////////////////////////////////////////////////

16
include/internal/catch_totals.hpp
View File

@@ -21,6 +21,14 @@ namespace Catch
: passed( 0 ),
failed( 0 )
{}
Counts operator - ( const Counts& other ) const
{
Counts diff;
diff.passed = passed - other.passed;
diff.failed = failed - other.failed;
return diff;
}
std::size_t passed;
std::size_t failed;
@@ -28,6 +36,14 @@ namespace Catch
struct Totals
{
Totals operator - ( const Totals& other ) const
{
Totals diff;
diff.assertions = assertions - other.assertions;
diff.testCases = testCases - other.testCases;
return diff;
}
Counts assertions;
Counts testCases;
};