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

Moved Catch NotImplementedException out of the common include path

Browse Source 
We could probably toss it away completely, currently it is used
only by TeamCity reporter.
This commit is contained in:
Martin Hořeňovský 2017-07-12 15:05:01 +02:00
parent 4332b84c9b
commit 91c1556078
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reporters.md
View File

@ -22,7 +22,7 @@ Because of the way the junit format is structured the run must complete before a
* `xml` writes an xml format tailored to Catch. Unlike `junit` this is a streaming format so results are delivered progressively. * `xml` writes an xml format tailored to Catch. Unlike `junit` this is a streaming format so results are delivered progressively.
There are a few additional reporters, for specific build systems, in the Catch repository (in `include\reporters`) which you can `#include` in your project if you would like to make use of them. There are a few additional reporters, for specific build systems, in the Catch repository (in `include\reporters`) which you can `#include` in your project if you would like to make use of them.
Do this in one source file - typically the same one you have `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`. Do this in one source file - the same one you have `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`.
* `teamcity` writes the native, streaming, format that [TeamCity](https://www.jetbrains.com/teamcity/) understands. * `teamcity` writes the native, streaming, format that [TeamCity](https://www.jetbrains.com/teamcity/) understands.
Use this when building as part of a TeamCity build to see results as they happen. Use this when building as part of a TeamCity build to see results as they happen.

1
include/catch.hpp
View File

@ -28,7 +28,6 @@
# endif # endif
#endif #endif
#include "internal/catch_notimplemented_exception.h"
#include "internal/catch_context.h" #include "internal/catch_context.h"
#include "internal/catch_test_registry.hpp" #include "internal/catch_test_registry.hpp"
#include "internal/catch_capture.hpp" #include "internal/catch_capture.hpp"

4
include/internal/catch_impl.hpp
View File

@ -16,6 +16,10 @@
#pragma clang diagnostic ignored "-Wweak-vtables" #pragma clang diagnostic ignored "-Wweak-vtables"
#endif #endif
#include "internal/catch_notimplemented_exception.h"
// Temporary hack to fix separately provided reporters // Temporary hack to fix separately provided reporters
#include "../reporters/catch_reporter_bases.hpp" #include "../reporters/catch_reporter_bases.hpp"
#include "catch_reporter_registrars.hpp" #include "catch_reporter_registrars.hpp"

9
projects/SelfTest/ExceptionTests.cpp
View File

@ -181,15 +181,6 @@ TEST_CASE( "Unexpected exceptions can be translated", "[.][failing][!throws]" )
throw double( 3.14 ); throw double( 3.14 );
} }
inline int thisFunctionNotImplemented( int ) {
CATCH_NOT_IMPLEMENTED;
}
TEST_CASE( "NotImplemented exception", "[!throws]" )
{
REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) );
}
TEST_CASE( "Exception messages can be tested for", "[!throws]" ) { TEST_CASE( "Exception messages can be tested for", "[!throws]" ) {
using namespace Catch::Matchers; using namespace Catch::Matchers;
SECTION( "exact match" ) SECTION( "exact match" )