commit 0bd1370d9f42c7e83a8f94a5dbf4335c6984abb5
author William A. Kennington III <wak@google.com> Wed Aug 24 13:33:34 2022 -0700
committer William A. Kennington III <wak@google.com> Wed Aug 24 13:48:18 2022 -0700
tree 4a4b305eeef6cb292465288212bf02622cc78099
parent 615b82ac968f9fac1f533aca4fed903d4f7d4688

test/signal: Convert to googletest

Catch2 never really took off and googletest mostly gives us everything
we need.

Change-Id: Ib11edb94470c3b66c3acb2196de52fa03d311923
Signed-off-by: William A. Kennington III <wak@google.com>

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 4ffd1a9..8e17d71 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -3,6 +3,7 @@
   'exception',
   'handle/copyable',
   'handle/managed',
+  'signal',
   'util/cexec',
   'util/string',
 ]
@@ -137,7 +138,6 @@
 endif
 
 catch2_tests = [
-  'signal',
   'raw',
 ]
 

test/signal.cpp

diff --git a/test/signal.cpp b/test/signal.cpp
index 4778dac..d060861 100644
--- a/test/signal.cpp
+++ b/test/signal.cpp
@@ -1,9 +1,5 @@
-#if __has_include(<catch2/catch.hpp>)
-#include <catch2/catch.hpp>
-#else
-#include <catch2/catch_test_macros.hpp>
-#endif
 #include <cstring>
+#include <gtest/gtest.h>
 #include <signal.h>
 #include <stdplus/signal.hpp>
 
@@ -14,51 +10,51 @@
 namespace
 {
 
-TEST_CASE("Signals are blocked", "[signal]")
+TEST(Signal, Block)
 {
     constexpr int s = SIGINT;
     constexpr int otherS = SIGTERM;
     constexpr int notBlocked = SIGPROF;
 
     sigset_t expectedSet;
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
-    REQUIRE(0 == sigaddset(&expectedSet, otherS));
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
-    REQUIRE(0 == sigismember(&expectedSet, notBlocked));
-    REQUIRE(0 == sigismember(&expectedSet, s));
-    REQUIRE(0 == sigaddset(&expectedSet, s));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
+    ASSERT_EQ(0, sigaddset(&expectedSet, otherS));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
+    ASSERT_EQ(0, sigismember(&expectedSet, notBlocked));
+    ASSERT_EQ(0, sigismember(&expectedSet, s));
+    ASSERT_EQ(0, sigaddset(&expectedSet, s));
 
     block(s);
 
     sigset_t newSet;
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, nullptr, &newSet));
-    REQUIRE(sigismember(&expectedSet, s) == sigismember(&newSet, s));
-    REQUIRE(sigismember(&expectedSet, otherS) == sigismember(&newSet, otherS));
-    REQUIRE(sigismember(&expectedSet, notBlocked) ==
-            sigismember(&newSet, notBlocked));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &newSet));
+    EXPECT_EQ(sigismember(&expectedSet, s), sigismember(&newSet, s));
+    EXPECT_EQ(sigismember(&expectedSet, otherS), sigismember(&newSet, otherS));
+    EXPECT_EQ(sigismember(&expectedSet, notBlocked),
+              sigismember(&newSet, notBlocked));
 }
 
-TEST_CASE("Signals stay blocked if already blocked", "[signal]")
+TEST(Signal, StayBlocked)
 {
     constexpr int s = SIGINT;
     constexpr int otherS = SIGTERM;
     constexpr int notBlocked = SIGPROF;
 
     sigset_t expectedSet;
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
-    REQUIRE(0 == sigaddset(&expectedSet, s));
-    REQUIRE(0 == sigaddset(&expectedSet, otherS));
-    REQUIRE(0 == sigismember(&expectedSet, notBlocked));
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
+    ASSERT_EQ(0, sigaddset(&expectedSet, s));
+    ASSERT_EQ(0, sigaddset(&expectedSet, otherS));
+    ASSERT_EQ(0, sigismember(&expectedSet, notBlocked));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
 
     block(s);
 
     sigset_t newSet;
-    REQUIRE(0 == sigprocmask(SIG_BLOCK, nullptr, &newSet));
-    REQUIRE(sigismember(&expectedSet, s) == sigismember(&newSet, s));
-    REQUIRE(sigismember(&expectedSet, otherS) == sigismember(&newSet, otherS));
-    REQUIRE(sigismember(&expectedSet, notBlocked) ==
-            sigismember(&newSet, notBlocked));
+    ASSERT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &newSet));
+    EXPECT_EQ(sigismember(&expectedSet, s), sigismember(&newSet, s));
+    EXPECT_EQ(sigismember(&expectedSet, otherS), sigismember(&newSet, otherS));
+    EXPECT_EQ(sigismember(&expectedSet, notBlocked),
+              sigismember(&newSet, notBlocked));
 }
 
 } // namespace