From 5af9056ac4763c8ea0a9a0ec6514bd968c7b2d5b Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Tue, 9 Jul 2024 17:54:08 +0800 Subject: [PATCH] Fix warnings generated by NetworkConfigTest (#2469) This test was generating a warning about unused vairables. Unless built in debug mode, `aserts`are often optimized out we should be using the `ASSERT` macros from `gtest` instead. Signed-off-by: Arjo Chakravarty --- src/network/NetworkConfig_TEST.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/network/NetworkConfig_TEST.cc b/src/network/NetworkConfig_TEST.cc index af6baffc61..4014518033 100644 --- a/src/network/NetworkConfig_TEST.cc +++ b/src/network/NetworkConfig_TEST.cc @@ -15,6 +15,7 @@ * */ + #include #include @@ -30,38 +31,33 @@ TEST(NetworkManager, ValueConstructor) { // Primary without number of secondaries is invalid auto config = NetworkConfig::FromValues("PRIMARY", 0); - assert(config.role == NetworkRole::None); - assert(config.numSecondariesExpected == 0); + ASSERT_EQ(config.role, NetworkRole::None); + ASSERT_EQ(config.numSecondariesExpected, 0); // Expect console warning as well - (void) config; } { // Primary with number of secondaries is valid auto config = NetworkConfig::FromValues("PRIMARY", 3); - assert(config.role == NetworkRole::SimulationPrimary); - assert(config.numSecondariesExpected == 3); - (void) config; + ASSERT_EQ(config.role, NetworkRole::SimulationPrimary); + ASSERT_EQ(config.numSecondariesExpected, 3); } { // Secondary is always valid auto config = NetworkConfig::FromValues("SECONDARY", 0); - assert(config.role == NetworkRole::SimulationSecondary); - (void) config; + ASSERT_EQ(config.role, NetworkRole::SimulationSecondary); } { // Readonly is always valid auto config = NetworkConfig::FromValues("READONLY"); - assert(config.role == NetworkRole::ReadOnly); - (void) config; + ASSERT_EQ(config.role, NetworkRole::ReadOnly); } { // Anything else is invalid auto config = NetworkConfig::FromValues("READ_WRITE"); - assert(config.role == NetworkRole::None); - (void) config; + ASSERT_EQ(config.role, NetworkRole::None); } }