Merge branch 'gz-transport13' into port/13_to_14

Signed-off-by: Michael Carroll <[email protected]>

include/gz/transport/Node.hh

@@ -198,9 +198,11 @@ namespace gz
 #endif
       };
 
+      public: Node();
+
       /// \brief Constructor.
       /// \param[in] _options Node options.
-      public: explicit Node(const NodeOptions &_options = NodeOptions());
+      public: explicit Node(const NodeOptions &_options);
 
       /// \brief Destructor.
       public: virtual ~Node();

log/test/integration/playback.cc

@@ -21,6 +21,8 @@
 #include <gz/transport/log/Playback.hh>
 #include <gz/transport/log/Recorder.hh>
 #include <gz/transport/Node.hh>
+
+#include <gz/utils/Environment.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
 #include "ChirpParams.hh"
@@ -800,13 +802,13 @@ int main(int argc, char **argv)
   partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", partition);
 
-  setenv("GZ_TRANSPORT_LOG_SQL_PATH",
-         GZ_TRANSPORT_LOG_SQL_PATH, 1);
+  gz::utils::setenv("GZ_TRANSPORT_LOG_SQL_PATH",
+                    GZ_TRANSPORT_LOG_SQL_PATH);
 
-  setenv(gz::transport::log::SchemaLocationEnvVar.c_str(),
-         GZ_TRANSPORT_LOG_SQL_PATH, 1);
+  gz::utils::setenv(gz::transport::log::SchemaLocationEnvVar,
+                    GZ_TRANSPORT_LOG_SQL_PATH);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

log/test/integration/recorder.cc

@@ -24,6 +24,8 @@
 #include <gz/transport/log/Log.hh>
 #include <gz/transport/log/Recorder.hh>
 #include <gz/transport/Node.hh>
+
+#include <gz/utils/Environment.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
 #include "ChirpParams.hh"
@@ -538,13 +540,13 @@ int main(int argc, char **argv)
   partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", partition);
 
-  setenv("GZ_TRANSPORT_LOG_SQL_PATH",
-         GZ_TRANSPORT_LOG_SQL_PATH, 1);
+  gz::utils::setenv("GZ_TRANSPORT_LOG_SQL_PATH",
+                    GZ_TRANSPORT_LOG_SQL_PATH);
 
-  setenv(gz::transport::log::SchemaLocationEnvVar.c_str(),
-         GZ_TRANSPORT_LOG_SQL_PATH, 1);
+  gz::utils::setenv(gz::transport::log::SchemaLocationEnvVar,
+                    GZ_TRANSPORT_LOG_SQL_PATH);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

log/test/integration/topicChirp_aux.cc

@@ -22,6 +22,8 @@
 
 #include <gz/transport/Node.hh>
 
+#include <gz/utils/Environment.hh>
+
 #include "ChirpParams.hh"
 
 //////////////////////////////////////////////////
@@ -90,7 +92,7 @@ int main(int argc, char **argv)
     return -2;
   }
 
-  setenv("GZ_PARTITION", argv[1], 1);
+  gz::utils::setenv("GZ_PARTITION", argv[1]);
 
   const int chirps = atoi(argv[2]);
 

src/CIface_TEST.cc

@@ -16,8 +16,11 @@
 */
 #include <gz/msgs/stringmsg.pb.h>
 
-#include "gtest/gtest.h"
 #include "gz/transport/CIface.h"
+
+#include <gz/utils/Environment.hh>
+
+#include "gtest/gtest.h"
 #include "test_config.hh"
 
 static int count;
@@ -180,10 +183,10 @@ int main(int argc, char **argv)
   std::string partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", partition);
 
   // Enable verbose mode.
-  // setenv("GZ_VERBOSE", "1", 1);
+  // gz::utils::setenv("GZ_VERBOSE", "1");
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

src/Discovery_TEST.cc

@@ -27,20 +27,11 @@
 #include "gz/transport/Publisher.hh"
 #include "gz/transport/TransportTypes.hh"
 #include "gz/transport/Uuid.hh"
-#include "test_config.hh"
 
-// Temporarily introduce a "DISABLED_ON_LINUX" macro.
-// It currently does not exist upstream.
-// This can be removed when it is in upstream gz-utils
-// or the discovery WrongGzIp test passes on linux
-#include <gz/utils/detail/ExtraTestMacros.hh>
-#if defined __linux__
-  #define GZ_UTILS_TEST_DISABLED_ON_LINUX(TestName) \
-      DETAIL_GZ_UTILS_ADD_DISABLED_PREFIX(TestName)
-#else
-  #define GZ_UTILS_TEST_DISABLED_ON_LINUX(TestName) \
-      TestName
-#endif  // defined __linux__
+#include "gz/utils/Environment.hh"
+#include "gz/utils/ExtraTestMacros.hh"
+
+#include "test_config.hh"
 
 using namespace gz;
 using namespace transport;
@@ -540,31 +531,24 @@ TEST(DiscoveryTest, TestActivity)
   discovery1.TestActivity(proc2Uuid, false);
 }
 
-/// Logic to disable the following test via Linux
-#if defined __linux__
-  #define TEST_NAME DISABLED_WrongIgnIp
-#else
-  #define TEST_NAME WrongIgnIp
-#endif  // defined __linux__
-
 //////////////////////////////////////////////////
 /// \brief Check that a wrong GZ_IP value makes HostAddr() to return 127.0.0.1
-TEST(DiscoveryTest, TEST_NAME)
+TEST(DiscoveryTest, GZ_UTILS_TEST_DISABLED_ON_LINUX(WrongGzIp))
 {
   // Save the current value of GZ_IP environment variable.
   std::string gzIp;
-  env("GZ_IP", gzIp);
+  gz::utils::env("GZ_IP", gzIp);
 
   // Incorrect value for GZ_IP
-  setenv("GZ_IP", "127.0.0.0", 1);
+  ASSERT_TRUE(gz::utils::setenv("GZ_IP", "127.0.0.0"));
 
   transport::Discovery<MessagePublisher> discovery1(pUuid1, g_ip, g_msgPort);
   EXPECT_EQ(discovery1.HostAddr(), "127.0.0.1");
 
   // Unset GZ_IP.
-  unsetenv("GZ_IP");
+  ASSERT_TRUE(gz::utils::unsetenv("GZ_IP"));
 
   // Restore GZ_IP.
   if (!gzIp.empty())
-    setenv("GZ_IP", gzIp.c_str(), 1);
+    gz::utils::setenv("GZ_IP", gzIp);
 }

src/Helpers_TEST.cc

@@ -16,6 +16,9 @@
 */
 
 #include "gz/transport/Helpers.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "test_config.hh"
 #include "gtest/gtest.h"
 
@@ -33,7 +36,7 @@ TEST(HelpersTest, env)
   EXPECT_FALSE(transport::env(name, value));
 
   // Create a random environment variable and give it its name as value.
-  setenv(name.c_str(), name.c_str(), 1);
+  ASSERT_TRUE(gz::utils::setenv(name, name));
 
   // Check that we find the environment variable and the value is correct.
   EXPECT_TRUE(transport::env(name, value));

src/Node.cc

@@ -514,6 +514,12 @@ Node::Node(const NodeOptions &_options)
   this->dataPtr->options = _options;
 }
 
+//////////////////////////////////////////////////
+Node::Node():
+  Node(gz::transport::NodeOptions())
+{
+}
+
 //////////////////////////////////////////////////
 Node::~Node()
 {

src/NodeOptions_TEST.cc

@@ -19,6 +19,9 @@
 
 #include "gz/transport/NetUtils.hh"
 #include "gz/transport/NodeOptions.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "test_config.hh"
 #include "gtest/gtest.h"
 
@@ -30,7 +33,7 @@ TEST(NodeOptionsTest, ignPartition)
 {
   // Set GZ_PARTITION
   std::string aPartition = "customPartition";
-  setenv("GZ_PARTITION", aPartition.c_str(), 1);
+  ASSERT_TRUE(gz::utils::setenv("GZ_PARTITION", aPartition));
 
   transport::NodeOptions opts;
   EXPECT_EQ(opts.Partition(), aPartition);
@@ -53,7 +56,7 @@ TEST(NodeOptionsTest, ignPartition)
 TEST(NodeOptionsTest, accessors)
 {
   // Check the default values.
-  unsetenv("GZ_PARTITION");
+  gz::utils::unsetenv("GZ_PARTITION");
   transport::NodeOptions opts;
   EXPECT_TRUE(opts.NameSpace().empty());
   auto defaultPartition = transport::hostname() + ":" + transport::username();

src/Node_TEST.cc

@@ -26,14 +26,17 @@
 #include <string>
 #include <thread>
 
-#include "gtest/gtest.h"
 #include "gz/transport/AdvertiseOptions.hh"
 #include "gz/transport/MessageInfo.hh"
 #include "gz/transport/Node.hh"
 #include "gz/transport/NodeOptions.hh"
 #include "gz/transport/TopicStatistics.hh"
 #include "gz/transport/TopicUtils.hh"
 #include "gz/transport/TransportTypes.hh"
+
+#include <gz/utils/Environment.hh>
+
+#include "gtest/gtest.h"
 #include "test_config.hh"
 
 using namespace gz;
@@ -2324,10 +2327,10 @@ int main(int argc, char **argv)
   g_FQNPartition = std::string("/") + partition;
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", partition);
 
   // Enable verbose mode.
-  setenv("GZ_VERBOSE", "1", 1);
+  gz::utils::setenv("GZ_VERBOSE", "1");
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

src/cmd/gz_TEST.cc

@@ -22,6 +22,8 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+
+#include <gz/utils/Environment.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 
 #include "gtest/gtest.h"
@@ -615,7 +617,7 @@ int main(int argc, char **argv)
   g_partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", g_partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", g_partition);
 
   // Make sure that we load the library recently built and not the one installed
   // in your system.
@@ -624,7 +626,7 @@ int main(int argc, char **argv)
   transport::env("LD_LIBRARY_PATH", value);
   // Add the directory where Gazebo Transport has been built.
   value = std::string(GZ_TEST_LIBRARY_PATH) + ":" + value;
-  setenv("LD_LIBRARY_PATH", value.c_str(), 1);
+  gz::utils::setenv("LD_LIBRARY_PATH", value);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

src/cmd/gz_src_TEST.cc

@@ -28,10 +28,13 @@
 #pragma warning(pop)
 #endif
 
-#include "gtest/gtest.h"
 #include "gz.hh"
 #include "gz/transport/Node.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "test_config.hh"
+#include "gtest/gtest.h"
 
 using namespace gz;
 
@@ -299,7 +302,7 @@ int main(int argc, char **argv)
   g_partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", g_partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", g_partition);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

test/integration/authPubSub.cc

@@ -29,6 +29,9 @@
 #include "gtest/gtest.h"
 #include "gz/transport/Node.hh"
 #include "gz/transport/TransportTypes.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "test_config.hh"
 
 using namespace gz;
@@ -40,8 +43,8 @@ static std::string g_topic = "/foo"; // NOLINT(*)
 TEST(authPubSub, InvalidAuth)
 {
   // Setup the username and password for this test
-  setenv("GZ_TRANSPORT_USERNAME", "admin", 1);
-  setenv("GZ_TRANSPORT_PASSWORD", "test", 1);
+  ASSERT_TRUE(gz::utils::setenv("GZ_TRANSPORT_USERNAME", "admin"));
+  ASSERT_TRUE(gz::utils::setenv("GZ_TRANSPORT_PASSWORD", "test"));
 
   transport::Node node;
   auto pub = node.Advertise<msgs::Int32>(g_topic);
@@ -86,7 +89,7 @@ int main(int argc, char **argv)
   partition = testing::getRandomNumber();
 
   // Set the partition name for this process.
-  setenv("GZ_PARTITION", partition.c_str(), 1);
+  gz::utils::setenv("GZ_PARTITION", partition);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

test/integration/authPubSubSubscriberInvalid_aux.cc

@@ -30,6 +30,9 @@
 #endif
 
 #include "gz/transport/Node.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "gtest/gtest.h"
 #include "test_config.hh"
 
@@ -81,13 +84,13 @@ int main(int argc, char **argv)
   }
 
   // Set the partition name for this test.
-  setenv("GZ_PARTITION", argv[1], 1);
+  gz::utils::setenv("GZ_PARTITION", argv[1]);
 
   // Set the username for this test.
-  setenv("GZ_TRANSPORT_USERNAME", argv[2], 1);
+  gz::utils::setenv("GZ_TRANSPORT_USERNAME", argv[2]);
 
   // Set the password for this test.
-  setenv("GZ_TRANSPORT_PASSWORD", argv[3], 1);
+  gz::utils::setenv("GZ_TRANSPORT_PASSWORD", argv[3]);
 
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();

test/integration/fastPub_aux.cc

@@ -26,6 +26,9 @@
 #endif
 
 #include "gz/transport/Node.hh"
+
+#include <gz/utils/Environment.hh>
+
 #include "test_config.hh"
 
 using namespace gz;
@@ -58,7 +61,7 @@ int main(int argc, char **argv)
   }
 
   // Set the partition name for this test.
-  setenv("GZ_PARTITION", argv[1], 1);
+  gz::utils::setenv("GZ_PARTITION", argv[1]);
 
   advertiseAndPublish();
 }