mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-05 05:39:53 +01:00
Remove CATCH_CONFIG_DISABLE_MATCHERS
Now that the recommended distribution and usage method is proper library, users can just avoid including the matcher headers to get basically the same effect.
This commit is contained in:
parent
c770a9c8b5
commit
6c3a5ef625
@ -146,7 +146,6 @@ by using `_NO_` in the macro, e.g. `CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS`.
|
|||||||
CATCH_CONFIG_COUNTER // Use __COUNTER__ to generate unique names for test cases
|
CATCH_CONFIG_COUNTER // Use __COUNTER__ to generate unique names for test cases
|
||||||
CATCH_CONFIG_WINDOWS_SEH // Enable SEH handling on Windows
|
CATCH_CONFIG_WINDOWS_SEH // Enable SEH handling on Windows
|
||||||
CATCH_CONFIG_FAST_COMPILE // Sacrifices some (rather minor) features for compilation speed
|
CATCH_CONFIG_FAST_COMPILE // Sacrifices some (rather minor) features for compilation speed
|
||||||
CATCH_CONFIG_DISABLE_MATCHERS // Do not compile Matchers in this compilation unit
|
|
||||||
CATCH_CONFIG_POSIX_SIGNALS // Enable handling POSIX signals
|
CATCH_CONFIG_POSIX_SIGNALS // Enable handling POSIX signals
|
||||||
CATCH_CONFIG_WINDOWS_CRTDBG // Enable leak checking using Windows's CRT Debug Heap
|
CATCH_CONFIG_WINDOWS_CRTDBG // Enable leak checking using Windows's CRT Debug Heap
|
||||||
CATCH_CONFIG_DISABLE_STRINGIFICATION // Disable stringifying the original expression
|
CATCH_CONFIG_DISABLE_STRINGIFICATION // Disable stringifying the original expression
|
||||||
@ -183,11 +182,6 @@ should not lead to false negatives.
|
|||||||
`CATCH_CONFIG_FAST_COMPILE` has to be either defined, or not defined,
|
`CATCH_CONFIG_FAST_COMPILE` has to be either defined, or not defined,
|
||||||
in all translation units that are linked into single test binary.
|
in all translation units that are linked into single test binary.
|
||||||
|
|
||||||
### `CATCH_CONFIG_DISABLE_MATCHERS`
|
|
||||||
When `CATCH_CONFIG_DISABLE_MATCHERS` is defined, all mentions of Catch's Matchers are ifdef-ed away from the translation unit. Doing so will speed up compilation of that TU.
|
|
||||||
|
|
||||||
_Note: If you define `CATCH_CONFIG_DISABLE_MATCHERS` in the same file as Catch's main is implemented, your test executable will fail to link if you use Matchers anywhere._
|
|
||||||
|
|
||||||
### `CATCH_CONFIG_DISABLE_STRINGIFICATION`
|
### `CATCH_CONFIG_DISABLE_STRINGIFICATION`
|
||||||
This toggle enables a workaround for VS 2017 bug. For details see [known limitations](limitations.md#visual-studio-2017----raw-string-literal-in-assert-fails-to-compile).
|
This toggle enables a workaround for VS 2017 bug. For details see [known limitations](limitations.md#visual-studio-2017----raw-string-literal-in-assert-fails-to-compile).
|
||||||
|
|
||||||
|
@ -50,11 +50,14 @@
|
|||||||
* You can still write `SECTION("ShortName", "Long and wordy description")`, but the description is thrown away
|
* You can still write `SECTION("ShortName", "Long and wordy description")`, but the description is thrown away
|
||||||
* The description type now must be a `const char*` or implicitly convertible to it
|
* The description type now must be a `const char*` or implicitly convertible to it
|
||||||
|
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
* The `INFO` macro no longer contains superfluous semicolon (#1456)
|
* The `INFO` macro no longer contains superfluous semicolon (#1456)
|
||||||
* The `--list*` family of command line flags now return 0 on success (#1410, #1146)
|
* The `--list*` family of command line flags now return 0 on success (#1410, #1146)
|
||||||
|
|
||||||
|
### Other changes
|
||||||
|
* `CATCH_CONFIG_DISABLE_MATCHERS` no longer exists.
|
||||||
|
* If you do not want to use Matchers in a TU, do not include their header.
|
||||||
|
|
||||||
|
|
||||||
## 2.10.2
|
## 2.10.2
|
||||||
|
|
||||||
|
@ -26,9 +26,7 @@
|
|||||||
#include <catch2/catch_compiler_capabilities.h>
|
#include <catch2/catch_compiler_capabilities.h>
|
||||||
#include <catch2/catch_string_manip.h>
|
#include <catch2/catch_string_manip.h>
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#include <catch2/catch_capture_matchers.h>
|
#include <catch2/catch_capture_matchers.h>
|
||||||
#endif
|
|
||||||
#include <catch2/catch_generators.hpp>
|
#include <catch2/catch_generators.hpp>
|
||||||
#include <catch2/catch_generators_generic.hpp>
|
#include <catch2/catch_generators_generic.hpp>
|
||||||
#include <catch2/catch_generators_specific.hpp>
|
#include <catch2/catch_generators_specific.hpp>
|
||||||
|
@ -103,7 +103,6 @@ namespace Catch {
|
|||||||
return noTestMethods;
|
return noTestMethods;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
|
|
||||||
namespace Matchers {
|
namespace Matchers {
|
||||||
namespace Impl {
|
namespace Impl {
|
||||||
@ -193,8 +192,6 @@ namespace Catch {
|
|||||||
|
|
||||||
using namespace Matchers;
|
using namespace Matchers;
|
||||||
|
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
} // namespace Catch
|
} // namespace Catch
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -24,9 +24,7 @@
|
|||||||
#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
|
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
|
||||||
#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
|
#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
|
#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
|
||||||
#endif// CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
|
|
||||||
#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
@ -38,16 +36,12 @@
|
|||||||
#define CATCH_CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CATCH_CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
|
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
|
||||||
#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
|
#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
|
||||||
|
|
||||||
#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
|
#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
|
#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
|
||||||
#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
|
#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
|
||||||
@ -120,9 +114,7 @@
|
|||||||
#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
|
#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
|
||||||
#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
|
#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
|
#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
|
||||||
|
|
||||||
#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
@ -134,17 +126,13 @@
|
|||||||
#define CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CHECK_THROWS( ... ) INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
|
#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
|
||||||
#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
|
||||||
|
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
|
#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
|
||||||
|
|
||||||
#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
|
#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
|
#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
|
||||||
#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
|
#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
|
||||||
@ -228,9 +216,7 @@
|
|||||||
#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
|
#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
|
||||||
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
|
#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
||||||
#endif// CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
|
#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
#define CATCH_CHECK( ... ) (void)(0)
|
#define CATCH_CHECK( ... ) (void)(0)
|
||||||
@ -242,16 +228,12 @@
|
|||||||
#define CATCH_CHECK_THROWS( ... ) (void)(0)
|
#define CATCH_CHECK_THROWS( ... ) (void)(0)
|
||||||
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
#define CATCH_CHECK_THROWS_WITH( expr, matcher ) (void)(0)
|
#define CATCH_CHECK_THROWS_WITH( expr, matcher ) (void)(0)
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
|
#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CATCH_CHECK_THAT( arg, matcher ) (void)(0)
|
#define CATCH_CHECK_THAT( arg, matcher ) (void)(0)
|
||||||
|
|
||||||
#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
|
#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#define CATCH_INFO( msg ) (void)(0)
|
#define CATCH_INFO( msg ) (void)(0)
|
||||||
#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
|
#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
|
||||||
@ -310,9 +292,7 @@
|
|||||||
#define REQUIRE_THROWS( ... ) (void)(0)
|
#define REQUIRE_THROWS( ... ) (void)(0)
|
||||||
#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
|
#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define REQUIRE_NOTHROW( ... ) (void)(0)
|
#define REQUIRE_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
#define CHECK( ... ) (void)(0)
|
#define CHECK( ... ) (void)(0)
|
||||||
@ -324,17 +304,12 @@
|
|||||||
#define CHECK_THROWS( ... ) (void)(0)
|
#define CHECK_THROWS( ... ) (void)(0)
|
||||||
#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
|
||||||
#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
|
#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
#define CHECK_NOTHROW( ... ) (void)(0)
|
#define CHECK_NOTHROW( ... ) (void)(0)
|
||||||
|
|
||||||
|
|
||||||
#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
|
|
||||||
#define CHECK_THAT( arg, matcher ) (void)(0)
|
#define CHECK_THAT( arg, matcher ) (void)(0)
|
||||||
|
|
||||||
#define REQUIRE_THAT( arg, matcher ) (void)(0)
|
#define REQUIRE_THAT( arg, matcher ) (void)(0)
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#define INFO( msg ) (void)(0)
|
#define INFO( msg ) (void)(0)
|
||||||
#define UNSCOPED_INFO( msg ) (void)(0)
|
#define UNSCOPED_INFO( msg ) (void)(0)
|
||||||
|
@ -4,7 +4,6 @@ yet:
|
|||||||
CATCH_CONFIG_COUNTER // Use __COUNTER__ to generate unique names for test cases
|
CATCH_CONFIG_COUNTER // Use __COUNTER__ to generate unique names for test cases
|
||||||
CATCH_CONFIG_WINDOWS_SEH // Enable SEH handling on Windows
|
CATCH_CONFIG_WINDOWS_SEH // Enable SEH handling on Windows
|
||||||
CATCH_CONFIG_FAST_COMPILE // Sacrifices some (rather minor) features for compilation speed
|
CATCH_CONFIG_FAST_COMPILE // Sacrifices some (rather minor) features for compilation speed
|
||||||
CATCH_CONFIG_DISABLE_MATCHERS // Do not compile Matchers in this compilation unit
|
|
||||||
CATCH_CONFIG_POSIX_SIGNALS // Enable handling POSIX signals
|
CATCH_CONFIG_POSIX_SIGNALS // Enable handling POSIX signals
|
||||||
CATCH_CONFIG_WINDOWS_CRTDBG // Enable leak checking using Windows's CRT Debug Heap
|
CATCH_CONFIG_WINDOWS_CRTDBG // Enable leak checking using Windows's CRT Debug Heap
|
||||||
CATCH_CONFIG_DEFAULT_REPORTER
|
CATCH_CONFIG_DEFAULT_REPORTER
|
||||||
|
@ -286,9 +286,7 @@ TEST_CASE( "Parse test names and tags" ) {
|
|||||||
|
|
||||||
TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
|
TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
using namespace Catch::Matchers;
|
using namespace Catch::Matchers;
|
||||||
#endif
|
|
||||||
|
|
||||||
Catch::ConfigData config;
|
Catch::ConfigData config;
|
||||||
auto cli = Catch::makeCommandLineParser(config);
|
auto cli = Catch::makeCommandLineParser(config);
|
||||||
@ -367,9 +365,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
|
|||||||
auto result = cli.parse({"test", "--reporter", "unsupported"});
|
auto result = cli.parse({"test", "--reporter", "unsupported"});
|
||||||
CHECK(!result);
|
CHECK(!result);
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
REQUIRE_THAT(result.errorMessage(), Contains("Unrecognized reporter"));
|
REQUIRE_THAT(result.errorMessage(), Contains("Unrecognized reporter"));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -401,10 +397,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
|
|||||||
SECTION("-x must be numeric") {
|
SECTION("-x must be numeric") {
|
||||||
auto result = cli.parse({"test", "-x", "oops"});
|
auto result = cli.parse({"test", "-x", "oops"});
|
||||||
CHECK(!result);
|
CHECK(!result);
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
REQUIRE_THAT(result.errorMessage(), Contains("convert") && Contains("oops"));
|
REQUIRE_THAT(result.errorMessage(), Contains("convert") && Contains("oops"));
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -476,9 +469,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
|
|||||||
SECTION( "error" ) {
|
SECTION( "error" ) {
|
||||||
auto result = cli.parse({"test", "--use-colour", "wrong"});
|
auto result = cli.parse({"test", "--use-colour", "wrong"});
|
||||||
CHECK( !result );
|
CHECK( !result );
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
CHECK_THAT( result.errorMessage(), Contains( "colour mode must be one of" ) );
|
CHECK_THAT( result.errorMessage(), Contains( "colour mode must be one of" ) );
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,14 +22,12 @@ TEST_CASE( "Tag alias can be registered against tag patterns" ) {
|
|||||||
FAIL( "expected exception" );
|
FAIL( "expected exception" );
|
||||||
}
|
}
|
||||||
catch( std::exception& ex ) {
|
catch( std::exception& ex ) {
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
std::string what = ex.what();
|
std::string what = ex.what();
|
||||||
using namespace Catch::Matchers;
|
using namespace Catch::Matchers;
|
||||||
CHECK_THAT( what, Contains( "[@zzz]" ) );
|
CHECK_THAT( what, Contains( "[@zzz]" ) );
|
||||||
CHECK_THAT( what, Contains( "file" ) );
|
CHECK_THAT( what, Contains( "file" ) );
|
||||||
CHECK_THAT( what, Contains( "2" ) );
|
CHECK_THAT( what, Contains( "2" ) );
|
||||||
CHECK_THAT( what, Contains( "10" ) );
|
CHECK_THAT( what, Contains( "10" ) );
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,9 +79,7 @@ namespace { namespace CompilationTests {
|
|||||||
REQUIRE_THROWS(throws_int(true));
|
REQUIRE_THROWS(throws_int(true));
|
||||||
CHECK_THROWS_AS(throws_int(true), int);
|
CHECK_THROWS_AS(throws_int(true), int);
|
||||||
REQUIRE_NOTHROW(throws_int(false));
|
REQUIRE_NOTHROW(throws_int(false));
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
|
REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
|
||||||
#endif
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,8 +162,6 @@ TEST_CASE("thrown std::strings are translated", "[.][failing][!throws]") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
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" )
|
||||||
@ -178,8 +176,6 @@ TEST_CASE( "Exception messages can be tested for", "[!throws]" ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!throws]" ) {
|
TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!throws]" ) {
|
||||||
REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
|
REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
|
||||||
REQUIRE_THROWS_WITH( thisThrows(), "should fail" );
|
REQUIRE_THROWS_WITH( thisThrows(), "should fail" );
|
||||||
|
@ -22,8 +22,6 @@
|
|||||||
|
|
||||||
namespace { namespace MatchersTests {
|
namespace { namespace MatchersTests {
|
||||||
|
|
||||||
#ifndef CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#ifndef MATCHERS_TEST_HELPERS_INCLUDED // Don't compile this more than once per TU
|
#ifndef MATCHERS_TEST_HELPERS_INCLUDED // Don't compile this more than once per TU
|
||||||
#define MATCHERS_TEST_HELPERS_INCLUDED
|
#define MATCHERS_TEST_HELPERS_INCLUDED
|
||||||
|
|
||||||
@ -558,8 +556,6 @@ namespace { namespace MatchersTests {
|
|||||||
|
|
||||||
} } // namespace MatchersTests
|
} } // namespace MatchersTests
|
||||||
|
|
||||||
#endif // CATCH_CONFIG_DISABLE_MATCHERS
|
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user