Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-06-16 12:12:31 +0200
committerMartin Hořeňovský2019-10-29 14:07:18 +0100
commit141761745a4a8fe84414364f043e25ee00bc834f (patch)
treebfc465ab954a82cfd38bf5a1b00e26bd5ba79945
parent3136c4fb6aeba965f0a6700eff60fa29d9b8c326 (diff)
downloadcatch3-141761745a4a8fe84414364f043e25ee00bc834f.tar.gz
Remove ANON_TEST_CASE
It can be fully replaced with `TEST_CASE` without any arguments, so there is no need to keep it around. Closes #1220
-rw-r--r--docs/deprecations.md6
-rw-r--r--docs/release-notes.md6
-rw-r--r--include/catch.hpp6
-rw-r--r--projects/ExtraTests/X01-PrefixedMacros.cpp3
4 files changed, 6 insertions, 15 deletions
diff --git a/docs/deprecations.md b/docs/deprecations.md
index c2b178e2..bf7a71fa 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -23,12 +23,6 @@ it will be 0 for success and non-zero for failure.
`--list-test-names-only` command line argument will be removed.
-### `ANON_TEST_CASE`
-
-`ANON_TEST_CASE` is scheduled for removal, as it can be fully replaced
-by a `TEST_CASE` with no arguments.
-
-
### Secondary description amongst tags
Currently, the tags part of `TEST_CASE` (and others) macro can also
diff --git a/docs/release-notes.md b/docs/release-notes.md
index aef09bf0..c49ddefa 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -30,6 +30,11 @@
[Older versions](#older-versions)<br>
[Even Older versions](#even-older-versions)<br>
+## 3.0.0 (in progress)
+
+### Breaking changes
+* `ANON_TEST_CASE` has been removed, use `TEST_CASE` with no arguments instead.
+
## 2.10.2
@@ -147,6 +152,7 @@
### Fixes
* Fix benchmarking compilation failure in files without `CATCH_CONFIG_EXTERNAL_INTERFACES` (or implementation)
+
## 2.9.0
### Improvements
diff --git a/include/catch.hpp b/include/catch.hpp
index 805939ae..422f8a53 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -151,8 +151,6 @@
#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
@@ -249,7 +247,6 @@
#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
@@ -360,8 +357,6 @@ using Catch::Detail::Approx;
#define CATCH_FAIL_CHECK( ... ) (void)(0)
#define CATCH_SUCCEED( ... ) (void)(0)
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
@@ -444,7 +439,6 @@ using Catch::Detail::Approx;
#define FAIL( ... ) (void)(0)
#define FAIL_CHECK( ... ) (void)(0)
#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
diff --git a/projects/ExtraTests/X01-PrefixedMacros.cpp b/projects/ExtraTests/X01-PrefixedMacros.cpp
index 3d2ab9c1..c9b16ebc 100644
--- a/projects/ExtraTests/X01-PrefixedMacros.cpp
+++ b/projects/ExtraTests/X01-PrefixedMacros.cpp
@@ -60,9 +60,6 @@ CATCH_TEST_CASE("PrefixedMacros") {
CATCH_STATIC_REQUIRE( std::is_void<void>::value );
CATCH_STATIC_REQUIRE_FALSE( std::is_void<int>::value );
-}
-
-CATCH_ANON_TEST_CASE() {
CATCH_FAIL("");
}