diff options
author | William A. Kennington III <wak@google.com> | 2018-02-28 09:54:08 -0800 |
---|---|---|
committer | William A. Kennington III <wak@google.com> | 2018-02-28 15:38:41 -0800 |
commit | d5d14833ca01ffefd2a81a4eacf6eff5fb2ba2ea (patch) | |
tree | 18785f5b6ebf06137e46ef2d5ebfef031ddd1af8 | |
parent | 12926435b6f4880cb178d1d43295f7638a603ab8 (diff) | |
download | phosphor-watchdog-d5d14833ca01ffefd2a81a4eacf6eff5fb2ba2ea.tar.gz phosphor-watchdog-d5d14833ca01ffefd2a81a4eacf6eff5fb2ba2ea.zip |
tests: Convert EXPECT_EQ(bool -> EXPECT_{TRUE,FALSE}
This is more in line with normal gtest code style.
Change-Id: If49f700f756ad8d278927baae4e934ef7aa399d7
Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r-- | test/timer_test.cpp | 8 | ||||
-rw-r--r-- | test/watchdog_test.cpp | 32 | ||||
-rw-r--r-- | test/watchdog_test.hpp | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/test/timer_test.cpp b/test/timer_test.cpp index e9f323b..3deef08 100644 --- a/test/timer_test.cpp +++ b/test/timer_test.cpp @@ -30,11 +30,11 @@ TEST_F(TimerTest, testTimerForExpirationDefaultTimeoutHandler) count++; } } - EXPECT_EQ(true, timer.expired()); + EXPECT_TRUE(timer.expired()); EXPECT_EQ(expireTime.count() - 1, count); // Make sure secondary callback was not called. - EXPECT_EQ(false, expired); + EXPECT_FALSE(expired); } /** @brief Starts the timer and expects it to expire @@ -64,9 +64,9 @@ TEST_F(TimerTest, testTimerForExpirationSecondCallBack) count++; } } - EXPECT_EQ(true, timer.expired()); + EXPECT_TRUE(timer.expired()); EXPECT_EQ(expireTime.count() - 1, count); // This gets set as part of secondary callback - EXPECT_EQ(true, expired); + EXPECT_TRUE(expired); } diff --git a/test/watchdog_test.cpp b/test/watchdog_test.cpp index 57f32e9..a76a914 100644 --- a/test/watchdog_test.cpp +++ b/test/watchdog_test.cpp @@ -5,17 +5,17 @@ using namespace phosphor::watchdog; /** @brief Make sure that watchdog is started and not enabled */ TEST_F(WdogTest, createWdogAndDontEnable) { - EXPECT_EQ(false, wdog.enabled()); + EXPECT_FALSE(wdog.enabled()); EXPECT_EQ(0, wdog.timeRemaining()); - EXPECT_EQ(false, wdog.timerExpired()); + EXPECT_FALSE(wdog.timerExpired()); } /** @brief Make sure that watchdog is started and enabled */ TEST_F(WdogTest, createWdogAndEnable) { // Enable and then verify - EXPECT_EQ(true, wdog.enabled(true)); - EXPECT_EQ(false, wdog.timerExpired()); + EXPECT_TRUE(wdog.enabled(true)); + EXPECT_FALSE(wdog.timerExpired()); // Get the configured interval auto remaining = milliseconds(wdog.timeRemaining()); @@ -25,7 +25,7 @@ TEST_F(WdogTest, createWdogAndEnable) EXPECT_TRUE((remaining >= defaultInterval - defaultDrift) && (remaining <= defaultInterval)); - EXPECT_EQ(false, wdog.timerExpired()); + EXPECT_FALSE(wdog.timerExpired()); } /** @brief Make sure that watchdog is started and enabled. @@ -34,11 +34,11 @@ TEST_F(WdogTest, createWdogAndEnable) TEST_F(WdogTest, createWdogAndEnableThenDisable) { // Enable and then verify - EXPECT_EQ(true, wdog.enabled(true)); + EXPECT_TRUE(wdog.enabled(true)); // Disable and then verify - EXPECT_EQ(false, wdog.enabled(false)); - EXPECT_EQ(false, wdog.enabled()); + EXPECT_FALSE(wdog.enabled(false)); + EXPECT_FALSE(wdog.enabled()); EXPECT_EQ(0, wdog.timeRemaining()); } @@ -49,7 +49,7 @@ TEST_F(WdogTest, createWdogAndEnableThenDisable) TEST_F(WdogTest, enableWdogAndWait5Seconds) { // Enable and then verify - EXPECT_EQ(true, wdog.enabled(true)); + EXPECT_TRUE(wdog.enabled(true)); // Sleep for 5 seconds auto sleepTime = seconds(5s); @@ -64,7 +64,7 @@ TEST_F(WdogTest, enableWdogAndWait5Seconds) // how we get scheduled. So checking a range here. EXPECT_TRUE((remaining >= expected - defaultDrift) && (remaining <= expected)); - EXPECT_EQ(false, wdog.timerExpired()); + EXPECT_FALSE(wdog.timerExpired()); } /** @brief Make sure that watchdog is started and enabled. @@ -74,7 +74,7 @@ TEST_F(WdogTest, enableWdogAndWait5Seconds) TEST_F(WdogTest, enableWdogAndResetTo5Seconds) { // Enable and then verify - EXPECT_EQ(true, wdog.enabled(true)); + EXPECT_TRUE(wdog.enabled(true)); // Sleep for 1 second std::this_thread::sleep_for(1s); @@ -95,11 +95,11 @@ TEST_F(WdogTest, enableWdogAndResetTo5Seconds) count++; } } - EXPECT_EQ(true, wdog.timerExpired()); + EXPECT_TRUE(wdog.timerExpired()); EXPECT_EQ(expireTime.count() - 1 , count); // Make sure secondary callback was not called. - EXPECT_EQ(false, expired); + EXPECT_FALSE(expired); } /** @brief Make sure the Interval can be updated directly. @@ -120,7 +120,7 @@ TEST_F(WdogTest, verifyIntervalUpdateReceived) TEST_F(WdogTest, enableWdogAndWaitTillEnd) { // Enable and then verify - EXPECT_EQ(true, wdog.enabled(true)); + EXPECT_TRUE(wdog.enabled(true)); auto expireTime = duration_cast<seconds>( milliseconds(defaultInterval)); @@ -135,8 +135,8 @@ TEST_F(WdogTest, enableWdogAndWaitTillEnd) count++; } } - EXPECT_EQ(true, wdog.enabled()); + EXPECT_TRUE(wdog.enabled()); EXPECT_EQ(0, wdog.timeRemaining()); - EXPECT_EQ(true, wdog.timerExpired()); + EXPECT_TRUE(wdog.timerExpired()); EXPECT_EQ(expireTime.count() - 1, count); } diff --git a/test/watchdog_test.hpp b/test/watchdog_test.hpp index 0d1d628..e332260 100644 --- a/test/watchdog_test.hpp +++ b/test/watchdog_test.hpp @@ -21,7 +21,7 @@ class WdogTest : public TimerTest EXPECT_GE(rc, 0); // Initially the watchdog would be disabled - EXPECT_EQ(false, wdog.enabled()); + EXPECT_FALSE(wdog.enabled()); } //sdbusplus handle |