Merge pull request #2191 from azeey/3_to_6

Merge ign-gazebo3 ➡️ ign-gazebo6
gazebosim · Oct 5, 2023 · eaad78f · eaad78f
2 parents 326cef2 + 8511623
commit eaad78f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/SdfGenerator_TEST.cc b/src/SdfGenerator_TEST.cc
@@ -644,13 +644,13 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedNotExpanded)
 TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
 {
   const std::string goodUri =
-      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/2";
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/3";
 
   // These are URIs that are potentially problematic.
   const std::vector<std::string> fuelUris = {
       // Thes following two URIs are valid, but have a trailing '/'
       "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/",
-      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/2/",
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/3/",
       // Thes following two URIs are invalid, and will not be saved
       "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/"
       "notInt",

diff --git a/test/integration/save_world.cc b/test/integration/save_world.cc
@@ -419,7 +419,7 @@ TEST_F(SdfGeneratorFixture, ModelWithNestedIncludes)
   ASSERT_NE(nullptr, uri);
   ASSERT_NE(nullptr, uri->GetText());
   EXPECT_EQ(
-    "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Coke Can/2",
+    "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Coke Can/3",
      std::string(uri->GetText()));
 
   name = include->FirstChildElement("name");