diff options
| author | Phil Nash | 2017-08-09 00:52:20 +0100 |
|---|---|---|
| committer | Phil Nash | 2017-08-09 00:52:20 +0100 |
| commit | 201028d6ec787aa92ae12656804b807d2ec849a2 (patch) | |
| tree | b8fcbc119f3b0da342a89f80090ea510078e4dab /include | |
| parent | 27fd8f80bd883df36c243bc355429977fd665c50 (diff) | |
| download | catch3-201028d6ec787aa92ae12656804b807d2ec849a2.tar.gz | |
Integrated INTERNAL_CATCH_THROWS with new AssertionHandler
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_capture.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp index 6615edf1..6c51a3b1 100644 --- a/include/internal/catch_capture.hpp +++ b/include/internal/catch_capture.hpp @@ -98,18 +98,18 @@ /////////////////////////////////////////////////////////////////////////////// #define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \ do { \ - Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, #__VA_ARGS__, resultDisposition); \ - if( __catchResult.allowThrows() ) \ + Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, #__VA_ARGS__, resultDisposition); \ + if( catchAssertionHandler.allowThrows() ) \ try { \ static_cast<void>(__VA_ARGS__); \ - __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ + catchAssertionHandler.handle( Catch::ResultWas::DidntThrowException ); \ } \ catch( ... ) { \ - __catchResult.captureExpectedException( "" ); \ + catchAssertionHandler.handle( Catch::ResultWas::Ok ); \ } \ else \ - __catchResult.captureResult( Catch::ResultWas::Ok ); \ - INTERNAL_CATCH_REACT( __catchResult ) \ + catchAssertionHandler.handle( Catch::ResultWas::Ok ); \ + INTERNAL_CATCH_REACT2( catchAssertionHandler ) \ } while( Catch::alwaysFalse() ) /////////////////////////////////////////////////////////////////////////////// |