commit 770c556d77cbe2f3a8dfcd42edcce8b8c1aba2ff
author William A. Kennington III <wak@google.com> Thu Feb 13 13:07:42 2020 -0800
committer William A. Kennington III <wak@google.com> Thu Mar 12 14:41:12 2020 -0700
tree 2710b521653789197e43056ad439342f35f43fc5
parent 31422357f1b85bc218bdfad31e1b778832d3c8c2

test/signal: Convert to catch2

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

test/signal.cpp

diff --git a/test/signal.cpp b/test/signal.cpp
index 6389cd8..91c717f 100644
--- a/test/signal.cpp
+++ b/test/signal.cpp
@@ -1,5 +1,5 @@
+#include <catch2/catch.hpp>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <signal.h>
 #include <stdplus/signal.hpp>
 
@@ -10,51 +10,51 @@
 namespace
 {
 
-TEST(SignalTest, BlockSignal)
+TEST_CASE("Signals are blocked", "[signal]")
 {
     constexpr int s = SIGINT;
     constexpr int otherS = SIGTERM;
     constexpr int notBlocked = SIGPROF;
 
     sigset_t expectedSet;
-    EXPECT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
-    EXPECT_EQ(0, sigaddset(&expectedSet, otherS));
-    EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
-    EXPECT_EQ(0, sigismember(&expectedSet, notBlocked));
-    EXPECT_EQ(0, sigismember(&expectedSet, s));
-    EXPECT_EQ(0, sigaddset(&expectedSet, s));
+    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));
 
     block(s);
 
     sigset_t newSet;
-    EXPECT_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));
+    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));
 }
 
-TEST(SignalTest, KeepBlockSignal)
+TEST_CASE("Signals stay blocked if already blocked", "[signal]")
 {
     constexpr int s = SIGINT;
     constexpr int otherS = SIGTERM;
     constexpr int notBlocked = SIGPROF;
 
     sigset_t expectedSet;
-    EXPECT_EQ(0, sigprocmask(SIG_BLOCK, nullptr, &expectedSet));
-    EXPECT_EQ(0, sigaddset(&expectedSet, s));
-    EXPECT_EQ(0, sigaddset(&expectedSet, otherS));
-    EXPECT_EQ(0, sigismember(&expectedSet, notBlocked));
-    EXPECT_EQ(0, sigprocmask(SIG_BLOCK, &expectedSet, nullptr));
+    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));
 
     block(s);
 
     sigset_t newSet;
-    EXPECT_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));
+    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));
 }
 
 } // namespace