fix merge

Signed-off-by: Ian Chen <[email protected]>
gazebosim · Jan 30, 2024 · 8e99116 · 8e99116
1 parent 2123ad0
commit 8e99116
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/common_test/Worlds.hh b/test/common_test/Worlds.hh
@@ -48,6 +48,8 @@ const auto kStringPendulumSdf = CommonTestWorld("string_pendulum.sdf");
 const auto kTestWorld = CommonTestWorld("test.world");
 const auto kWorldJointTestSdf = CommonTestWorld("world_joint_test.sdf");
 const auto kWorldUnsortedLinksSdf = CommonTestWorld("world_unsorted_links.sdf");
+const auto kWorldSingleNestedModelSdf =
+  CommonTestWorld("world_single_nested_model.sdf");
 const auto kWorldWithNestedModelSdf =
   CommonTestWorld("world_with_nested_model.sdf");
 }  // namespace common_test::worlds

diff --git a/test/common_test/world_features.cc b/test/common_test/world_features.cc
@@ -381,7 +381,7 @@ class WorldNestedModelTest : public WorldFeaturesTest<WorldNestedModelFeatureLis
 
     sdf::Root root;
     const sdf::Errors errors = root.Load(
-        gz::common::joinPaths(TEST_WORLD_DIR, "world_single_nested_model.sdf"));
+        common_test::worlds::kWorldSingleNestedModelSdf);
     EXPECT_TRUE(errors.empty()) << errors;
     if (errors.empty())
     {