Make sure the deprecated kSdfScopeDelimiter still works (#1305)

The deprecated kSdfScopeDelimiter was initialized to an empty string instead of ::. This PR makes sure kSdfScopeDelimiter and kScopeDelimiter represent the same string. Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Aug 1, 2023 · 57511b8 · 57511b8
1 parent 9fc8150
commit 57511b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Types.cc b/src/Types.cc
@@ -149,7 +149,7 @@ std::string JoinName(
 const std::string &internal::SdfScopeDelimiter()
 {
   static const gz::utils::NeverDestroyed<std::string> delimiter{
-      std::string()};
+      kScopeDelimiter};
   return delimiter.Access();
 }
 }

diff --git a/src/Types_TEST.cc b/src/Types_TEST.cc
@@ -120,6 +120,7 @@ TEST(Types, ErrorsOutputStream)
   EXPECT_EQ(expected, output.str());
 }
 
+/////////////////////////////////////////////////
 TEST(Types, SplitName)
 {
   {
@@ -159,6 +160,7 @@ TEST(Types, SplitName)
   }
 }
 
+/////////////////////////////////////////////////
 TEST(Types, JoinName)
 {
   {
@@ -198,3 +200,11 @@ TEST(Types, JoinName)
     EXPECT_EQ(joinedName, "");
   }
 }
+
+/////////////////////////////////////////////////
+TEST(Types, ScopeDelimiters)
+{
+  GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
+  EXPECT_EQ(sdf::kScopeDelimiter, sdf::kSdfScopeDelimiter);
+  GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
+}