3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move exception's translation into AssertionResultData message

Browse Source
This commit is contained in:
Martin Hořeňovský 2023-03-11 16:14:06 +01:00
parent 3220ae6d4a
commit 13fae1e2ff
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/interfaces/catch_interfaces_capture.hpp
View File

@ -84,7 +84,7 @@ namespace Catch {
AssertionReaction& reaction ) = 0; AssertionReaction& reaction ) = 0;
virtual void handleUnexpectedInflightException virtual void handleUnexpectedInflightException
( AssertionInfo const& info, ( AssertionInfo const& info,
std::string const& message, std::string&& message,
AssertionReaction& reaction ) = 0; AssertionReaction& reaction ) = 0;
virtual void handleIncomplete virtual void handleIncomplete
( AssertionInfo const& info ) = 0; ( AssertionInfo const& info ) = 0;

4
src/catch2/internal/catch_run_context.cpp
View File

@ -619,13 +619,13 @@ namespace Catch {
void RunContext::handleUnexpectedInflightException( void RunContext::handleUnexpectedInflightException(
AssertionInfo const& info, AssertionInfo const& info,
std::string const& message, std::string&& message,
AssertionReaction& reaction AssertionReaction& reaction
) { ) {
m_lastAssertionInfo = info; m_lastAssertionInfo = info;
AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) ); AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
data.message = message; data.message = CATCH_MOVE(message);
AssertionResult assertionResult{ info, CATCH_MOVE(data) }; AssertionResult assertionResult{ info, CATCH_MOVE(data) };
assertionEnded( assertionResult ); assertionEnded( assertionResult );
populateReaction( reaction ); populateReaction( reaction );

2
src/catch2/internal/catch_run_context.hpp
View File

@ -59,7 +59,7 @@ namespace Catch {
AssertionReaction& reaction ) override; AssertionReaction& reaction ) override;
void handleUnexpectedInflightException void handleUnexpectedInflightException
( AssertionInfo const& info, ( AssertionInfo const& info,
std::string const& message, std::string&& message,
AssertionReaction& reaction ) override; AssertionReaction& reaction ) override;
void handleIncomplete void handleIncomplete
( AssertionInfo const& info ) override; ( AssertionInfo const& info ) override;