Cleanup more main functions

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jan 25, 2024 · 7d7655e · 7d7655e
1 parent 769f9c4
commit 7d7655e
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 101 deletions.
diff --git a/src/CIface_TEST.cc b/src/CIface_TEST.cc
@@ -20,9 +20,12 @@
 
 #include "gz/transport/CIface.h"
 
-#include "test_utils.hh"
 #include <gz/utils/Environment.hh>
 
+#include "test_utils.hh"
+
+using CIfaceTest = testing::PartitionedTransportTest;
+
 static int count;
 
 //////////////////////////////////////////////////
@@ -58,7 +61,7 @@ void cbNonConst(char *_data, size_t _size, char *_msgType, void *_userData)
 }
 
 //////////////////////////////////////////////////
-TEST(CIfaceTest, PubSub)
+TEST_F(CIfaceTest, PubSub)
 {
   count = 0;
   GzTransportNode *node = gzTransportNodeCreate(nullptr);
@@ -114,7 +117,7 @@ TEST(CIfaceTest, PubSub)
 }
 
 //////////////////////////////////////////////////
-TEST(CIfaceTest, PubSubPartitions)
+TEST_F(CIfaceTest, PubSubPartitions)
 {
   count = 0;
   GzTransportNode *node = gzTransportNodeCreate(nullptr);
@@ -175,19 +178,3 @@ TEST(CIfaceTest, PubSubPartitions)
   gzTransportNodeDestroy(&nodeBar);
   EXPECT_EQ(nullptr, nodeBar);
 }
-
-//////////////////////////////////////////////////
-int main(int argc, char **argv)
-{
-  // Get a random partition name.
-  std::string partition = testing::getRandomNumber();
-
-  // Set the partition name for this process.
-  gz::utils::setenv("GZ_PARTITION", partition);
-
-  // Enable verbose mode.
-  // gz::utils::setenv("GZ_VERBOSE", "1");
-
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/src/Clock_TEST.cc b/src/Clock_TEST.cc
@@ -24,6 +24,7 @@
 #include "gz/transport/Clock.hh"
 #include "gz/transport/Node.hh"
 #include "gz/transport/TransportTypes.hh"
+
 #include "gtest/gtest.h"
 
 using namespace gz;