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

summaryrefslogtreecommitdiffhomepage
path: root/tests/SelfTest/UsageTests
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-01-26 23:47:40 +0100
committerMartin Hořeňovský2022-01-27 21:11:51 +0100
commit4ff8b27bb6bed4b8b309e56cd269b4f1fbc24e89 (patch)
treef4186911b20161e359d788bd200614159bea28a5 /tests/SelfTest/UsageTests
parentd861e73f86a7c6c7482337e4194d8f9f3ce1f00e (diff)
downloadcatch3-4ff8b27bb6bed4b8b309e56cd269b4f1fbc24e89.tar.gz
Cleanups output normalization in ApprovalTests
Removed: * NaN normalization * INFINITY normalization * errno normalization * Completely unused duration regex Tests using these macros should be tagged `[approvals]` so they are not run as part of approval tests. Also simplified regex for the test's executable filename, and hidden some tests relying on nullptr normalization.
Diffstat (limited to 'tests/SelfTest/UsageTests')
-rw-r--r--tests/SelfTest/UsageTests/Decomposition.tests.cpp2
-rw-r--r--tests/SelfTest/UsageTests/Misc.tests.cpp9
-rw-r--r--tests/SelfTest/UsageTests/ToStringTuple.tests.cpp3
3 files changed, 9 insertions, 5 deletions
diff --git a/tests/SelfTest/UsageTests/Decomposition.tests.cpp b/tests/SelfTest/UsageTests/Decomposition.tests.cpp
index 15feefc2..1ad5b796 100644
--- a/tests/SelfTest/UsageTests/Decomposition.tests.cpp
+++ b/tests/SelfTest/UsageTests/Decomposition.tests.cpp
@@ -29,7 +29,7 @@ TEST_CASE( "Reconstruction should be based on stringification: #914" , "[Decompo
CHECK(truthy(false));
}
-TEST_CASE("#1005: Comparing pointer to int and long (NULL can be either on various systems)", "[Decomposition]") {
+TEST_CASE("#1005: Comparing pointer to int and long (NULL can be either on various systems)", "[Decomposition][approvals]") {
FILE* fptr = nullptr;
REQUIRE(fptr == 0);
REQUIRE(fptr == 0l);
diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp
index e5409772..f1f7db03 100644
--- a/tests/SelfTest/UsageTests/Misc.tests.cpp
+++ b/tests/SelfTest/UsageTests/Misc.tests.cpp
@@ -472,10 +472,15 @@ TEST_CASE( "# A test name that starts with a #" ) {
SUCCEED( "yay" );
}
-TEST_CASE( "#835 -- errno should not be touched by Catch", "[.][failing][!shouldfail]" ) {
+TEST_CASE( "#835 -- errno should not be touched by Catch2", "[.][failing][!shouldfail]" ) {
errno = 1;
+ // Check that reporting failed test doesn't change errno.
CHECK(f() == 0);
- REQUIRE(errno == 1); // Check that f() doesn't touch errno.
+ // We want to avoid expanding `errno` macro in assertion, because
+ // we capture the expression after macro expansion, and would have
+ // to normalize the ways different platforms spell `errno`.
+ const auto errno_after = errno;
+ REQUIRE(errno_after == 1);
}
TEST_CASE( "#961 -- Dynamically created sections should all be reported", "[.]" ) {
diff --git a/tests/SelfTest/UsageTests/ToStringTuple.tests.cpp b/tests/SelfTest/UsageTests/ToStringTuple.tests.cpp
index 1d1a7ab0..3912285b 100644
--- a/tests/SelfTest/UsageTests/ToStringTuple.tests.cpp
+++ b/tests/SelfTest/UsageTests/ToStringTuple.tests.cpp
@@ -38,8 +38,7 @@ TEST_CASE( "tuple<tuple<int>,tuple<>,float>", "[toString][tuple]" )
CHECK( "{ { 42 }, { }, 1.2f }" == ::Catch::Detail::stringify(value) );
}
-TEST_CASE( "tuple<nullptr,int,const char *>", "[toString][tuple]" )
-{
+TEST_CASE( "tuple<nullptr,int,const char *>", "[approvals][toString][tuple]" ) {
typedef std::tuple<std::nullptr_t,int,const char *> type;
type value { nullptr, 42, "Catch me" };
CHECK( "{ nullptr, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) );