Merge branch 'main' into arjo/feat/remove_systems_with_entities

gazebosim · Jul 9, 2024 · 8e12607 · 8e12607
2 parents 26aa106 + 0d89949
commit 8e12607
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/src/network/NetworkConfig_TEST.cc b/src/network/NetworkConfig_TEST.cc
@@ -15,6 +15,7 @@
  *
  */
 
+
 #include <gtest/gtest.h>
 
 #include <gz/common/Console.hh>
@@ -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);
   }
 }