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

Moved all AssertionHandler logic into RunContext and de-virtualised interface

Browse Source 
This makes the assertion handling much less "chatty". AssertionHandler is now just a thin shim over RunContext
This commit is contained in:
Phil Nash
2017-11-27 22:21:47 +03:00
parent 5461242ffe
commit 4b614ee1d1
5 changed files with 179 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/internal/catch_run_context.h
View File

@@ -75,11 +75,41 @@ namespace Catch {
IConfigPtr config() const;
IStreamingReporter& reporter() const;
private: // IResultCapture
// Assertion handlers
void handleExpr
( AssertionInfo const& info,
ITransientExpression const& expr,
AssertionReaction& reaction );
void handleMessage
( AssertionInfo const& info,
ResultWas::OfType resultType,
StringRef const &message,
AssertionReaction& reaction );
void handleUnexpectedExceptionNotThrown
( AssertionInfo const& info,
AssertionReaction& reaction );
void handleUnexpectedInflightException
( AssertionInfo const& info,
std::string const& message,
AssertionReaction& reaction );
void handleIncomplete
( AssertionInfo const& info );
void handleNonExpr
( AssertionInfo const &info,
ResultWas::OfType resultType,
AssertionReaction &reaction );
void reportExpr
(AssertionInfo const &info,
ResultWas::OfType resultType,
ITransientExpression const *expr,
bool negated );
void assertionStarting(AssertionInfo const& info) override;
void assertionEnded(AssertionResult const& result) override;
void populateReaction( AssertionReaction& reaction );
public: // IResultCapture
void assertionEnded(AssertionResult const& result); // devirt
bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
bool testForMissingAssertions(Counts& assertions);
@@ -103,9 +133,9 @@ namespace Catch {
bool lastAssertionPassed() override;
void assertionPassed() override;
void assertionPassed() override; // devirt
void assertionRun() override;
void assertionRun() override; // devirt
public:
// !TBD We need to do this another way!
@@ -138,6 +168,7 @@ namespace Catch {
TrackerContext m_trackerContext;
std::size_t m_prevPassed = 0;
bool m_shouldReportUnexpected = true;
bool m_includeSuccessfulResults;
};
IResultCapture& getResultCapture();