Cast paths to string before passing them to testFixture

robotology · May 13, 2024 · 2fff1f0 · 2fff1f0
1 parent 4efdb15
commit 2fff1f0
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 27 deletions.
diff --git a/tests/camera/CameraTest.cc b/tests/camera/CameraTest.cc
@@ -24,7 +24,7 @@ TEST(CameraTest, PluginTest)
 
     // Instantiate test fixture
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf";
-    gz::sim::TestFixture fixture(modelPath);
+    gz::sim::TestFixture fixture(modelPath.string());
 
     int iterations = 1000;
 
@@ -229,7 +229,7 @@ TEST(CameraTest, HorizontalVerticalFlip)
 
     // Instantiate test fixture
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model_hor_ver_flip.sdf";
-    gz::sim::TestFixture fixture(modelPath);
+    gz::sim::TestFixture fixture(modelPath.string());
 
     int iterations = 1000;
     fixture.Server()->Run(/*_blocking=*/true, iterations, /*_paused=*/false);

diff --git a/tests/clock/ClockTest.cc b/tests/clock/ClockTest.cc
@@ -19,7 +19,7 @@ TEST(ClockTest, GetSimulationTimeFromClockPort)
     gz::common::Console::SetVerbosity(4);
     // Instantiate test fixture
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf";
-    gz::sim::TestFixture fixture(modelPath);
+    gz::sim::TestFixture fixture(modelPath.string());
 
     const int iterations = 1000;
     const int deltaTns = 1e6; // 1ms

diff --git a/tests/commons/ConcurrentInstancesTest.cc b/tests/commons/ConcurrentInstancesTest.cc
@@ -13,10 +13,10 @@ TEST(ConcurrentInstancesTest, StartConcurrentGazeboInstancesOfDifferentModels)
 {
     auto plannedIterations = 1'000;
 
-    gz::sim::TestFixture fixture1(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                                  / "dummy_sphere.sdf");
-    gz::sim::TestFixture fixture2(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                                  / "dummy_box.sdf");
+    gz::sim::TestFixture fixture1(
+        (std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "dummy_sphere.sdf").string());
+    gz::sim::TestFixture fixture2(
+        (std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "dummy_box.sdf").string());
     gz::common::Console::SetVerbosity(4);
 
     fixture1.Finalize();

diff --git a/tests/commons/ConfigurationParsingFromFileTest.cc b/tests/commons/ConfigurationParsingFromFileTest.cc
@@ -29,7 +29,7 @@ TEST(ConfigurationParsingTest, LoadPluginsWithYarpConfigurationFile)
 
     auto modelPath
         = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model_configuration_file.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
 
     yarp::os::NetworkBase::setLocalMode(true);
     gz::common::Console::SetVerbosity(4);

diff --git a/tests/commons/ConfigurationParsingFromStringTest.cc b/tests/commons/ConfigurationParsingFromStringTest.cc
@@ -26,7 +26,7 @@ TEST(ConfigurationParsingTest, LoadPluginsWithYarpConfigurationString)
 {
     auto modelPath
         = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model_configuration_string.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
     yarp::os::NetworkBase::setLocalMode(true);
     gz::common::Console::SetVerbosity(4);
 

diff --git a/tests/controlboard/ControlBoardCommonsTest.cc b/tests/controlboard/ControlBoardCommonsTest.cc
@@ -38,7 +38,7 @@ TEST(ControlBoardCommonsTest, ConfigureControlBoardWithoutInitialCondition)
 {
     auto modelPath
         = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "pendulum_no_initial_configuration.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
 
     gz::common::Console::SetVerbosity(4);
 
@@ -50,7 +50,7 @@ TEST(ControlBoardCommonsTest, ConfigureControlBoardWithInitialCondition)
 {
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
                      / "pendulum_with_initial_configuration.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
 
     gz::common::Console::SetVerbosity(4);
 
@@ -62,7 +62,7 @@ TEST(ControlBoardCommonsTest, ConfigureMultipleControlBoards)
 {
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
                      / "coupled_pendulum_two_controlboards.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
 
     bool configured = false;
     std::vector<std::string> deviceIds;
@@ -107,7 +107,7 @@ TEST(ControlBoardCommonsTest, JointPositionLimitsForMultipleJoints)
 {
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
                      / "coupled_pendulum_two_joints_single_controlboard.sdf";
-    gz::sim::TestFixture testFixture(modelPath);
+    gz::sim::TestFixture testFixture(modelPath.string());
 
     std::string deviceScopedName = "model/coupled_pendulum/controlboard_plugin_device";
     yarp::dev::PolyDriver* driver;

diff --git a/tests/controlboard/ControlBoardOnMultipleGazeboInstancesTest.cc b/tests/controlboard/ControlBoardOnMultipleGazeboInstancesTest.cc
@@ -60,10 +60,12 @@ TEST(ControlBoardOnMultipleGazeboInstances, StartConcurrentGazeboInstances)
     unsigned int iterationsToCompleteMotion1 = 0;
     unsigned int iterationsToCompleteMotion2 = 0;
 
-    gz::sim::TestFixture fixture1(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                                  / "pendulum_multiple_gz_instances.sdf");
-    gz::sim::TestFixture fixture2(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                                  / "pendulum_multiple_gz_instances.sdf");
+    gz::sim::TestFixture fixture1(
+        (std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "pendulum_multiple_gz_instances.sdf")
+            .string());
+    gz::sim::TestFixture fixture2(
+        (std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "pendulum_multiple_gz_instances.sdf")
+            .string());
     gz::common::Console::SetVerbosity(4);
 
     fixture1

diff --git a/tests/controlboard/ControlBoardPositionControlTest.cc b/tests/controlboard/ControlBoardPositionControlTest.cc
@@ -46,8 +46,9 @@ class ControlBoardPositionFixture : public testing::Test
 protected:
     // void SetUp() override
     ControlBoardPositionFixture()
-        : testFixture{std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                      / "pendulum_joint_relative_to_parent_link.sdf"}
+        : testFixture{(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
+                       / "pendulum_joint_relative_to_parent_link.sdf")
+                          .string()}
     {
         gz::common::Console::SetVerbosity(4);
 

diff --git a/tests/controlboard/ControlBoardPositionDirectControlTest.cc b/tests/controlboard/ControlBoardPositionDirectControlTest.cc
@@ -49,8 +49,9 @@ class ControlBoardPositionDirectFixture : public ::testing::Test
 protected:
     // void SetUp() override
     ControlBoardPositionDirectFixture()
-        : testFixture{std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
-                      / "pendulum_joint_relative_to_parent_link.sdf"}
+        : testFixture{(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR)
+                       / "pendulum_joint_relative_to_parent_link.sdf")
+                          .string()}
     {
         gz::common::Console::SetVerbosity(4);
 

diff --git a/tests/controlboard/ControlBoardTorqueControlTest.cc b/tests/controlboard/ControlBoardTorqueControlTest.cc
@@ -40,13 +40,11 @@ class ControlBoardTorqueControlFixture : public testing::TestWithParam<std::stri
 protected:
     // void SetUp() override
     ControlBoardTorqueControlFixture()
-        : testFixture{std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / GetParam()}
+        : testFixture{(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / GetParam()).string()}
     {
         std::cerr << "========== Test Parameter: " << GetParam() << std::endl;
         gz::common::Console::SetVerbosity(4);
 
-        // testFixture = gz::sim::TestFixture{"../../../tests/controlboard/" + GetParam()};
-
         testFixture.
             // Use configure callback to get values at startup
             OnConfigure([&](const gz::sim::Entity& _worldEntity,

diff --git a/tests/forcetorque/ForceTorqueTest.cc b/tests/forcetorque/ForceTorqueTest.cc
@@ -24,7 +24,7 @@ TEST(ForceTorqueTest, PluginTest)
 
     // Instantiate test fixture
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf";
-    gz::sim::TestFixture fixture(modelPath);
+    gz::sim::TestFixture fixture(modelPath.string());
 
     int iterations = 1000;
     fixture.Server()->Run(/*_blocking=*/true, iterations, /*_paused=*/false);

diff --git a/tests/imu/ImuTest.cc b/tests/imu/ImuTest.cc
@@ -27,7 +27,7 @@ class ImuFixture : public testing::Test
 {
 protected:
     ImuFixture()
-        : testFixture{std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf"}
+        : testFixture{(std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf").string()}
     {
         gz::common::Console::SetVerbosity(4);
 

diff --git a/tests/laser/LaserTest.cc b/tests/laser/LaserTest.cc
@@ -24,7 +24,7 @@ TEST(LaserTest, PluginTest)
 
     // Instantiate test fixture
     auto modelPath = std::filesystem::path(CMAKE_CURRENT_SOURCE_DIR) / "model.sdf";
-    gz::sim::TestFixture fixture(modelPath);
+    gz::sim::TestFixture fixture(modelPath.string());
 
     int iterations = 1000;
     fixture.Server()->Run(/*_blocking=*/true, iterations, /*_paused=*/false);