catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Cleanup in exception matchers
- Commit
a6baa6dda6dd06c1024d20b82c9fa400bacf4cac- Author
- Martin Hořeňovský ·
- Parents
5c9367d4f179
Changes
src/catch2/matchers/catch_matchers_exception.cpp | 7 ++----- src/catch2/matchers/catch_matchers_exception.hpp | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/catch2/matchers/catch_matchers_exception.cpp b/src/catch2/matchers/catch_matchers_exception.cpp index eec08f88..c8e8110d 100644 --- a/src/catch2/matchers/catch_matchers_exception.cpp +++ b/src/catch2/matchers/catch_matchers_exception.cpp @@ -10,7 +10,6 @@ namespace Catch { namespace Matchers { -namespace Exception { bool ExceptionMessageMatcher::match(std::exception const& ex) const { return ex.what() == m_message; @@ -20,11 +19,9 @@ std::string ExceptionMessageMatcher::describe() const { return "exception message matches \"" + m_message + "\""; } -} -Exception::ExceptionMessageMatcher Message(std::string const& message) { - return Exception::ExceptionMessageMatcher(message); +ExceptionMessageMatcher Message(std::string const& message) { + return ExceptionMessageMatcher(message); } -// namespace Exception } // namespace Matchers } // namespace Catch diff --git a/src/catch2/matchers/catch_matchers_exception.hpp b/src/catch2/matchers/catch_matchers_exception.hpp index 74355cd8..5688218f 100644 --- a/src/catch2/matchers/catch_matchers_exception.hpp +++ b/src/catch2/matchers/catch_matchers_exception.hpp @@ -11,7 +11,6 @@ namespace Catch { namespace Matchers { -namespace Exception { class ExceptionMessageMatcher final : public MatcherBase<std::exception> { std::string m_message; @@ -26,9 +25,8 @@ public: std::string describe() const override; }; -} // namespace Exception - -Exception::ExceptionMessageMatcher Message(std::string const& message); +//! Creates a matcher that checks whether a std derived exception has the provided message +ExceptionMessageMatcher Message(std::string const& message); } // namespace Matchers } // namespace Catch