Fix two tests (gazebosim#1674)

Signed-off-by: Nate Koenig <[email protected]> Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
srmainwaring · Aug 30, 2022 · 6be61c8 · 6be61c8
1 parent c52e140
commit 6be61c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/test/integration/log_system.cc b/test/integration/log_system.cc
@@ -1523,7 +1523,7 @@ TEST_F(LogSystemTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(LogResources))
   // Recorded models should exist
   EXPECT_GT(entryCount(recordPath), 2);
   EXPECT_TRUE(common::exists(common::joinPaths(recordPath, homeFake,
-      ".ignition", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
+      ".gz", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
       "models", "x2 config 1")));
 
   // Remove artifacts. Recreate new directory
@@ -1558,7 +1558,7 @@ TEST_F(LogSystemTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(LogResources))
   EXPECT_GT(entryCount(recordPath), 1);
 #endif
   EXPECT_TRUE(common::exists(common::joinPaths(recordPath, homeFake,
-      ".ignition", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
+      ".gz", "fuel", "fuel.ignitionrobotics.org", "openrobotics",
       "models", "x2 config 1")));
 
   // Revert environment variable after test is done

diff --git a/test/integration/save_world.cc b/test/integration/save_world.cc
@@ -903,7 +903,7 @@ TEST_F(SdfGeneratorFixture, ModelWithJoints)
   EXPECT_EQ(gz::math::Vector3d::UnitZ, axis->Xyz());
   EXPECT_EQ(gz::math::Vector3d::UnitY, axis2->Xyz());
 
-  EXPECT_EQ("__model__", axis->XyzExpressedIn());
+  EXPECT_EQ("", axis->XyzExpressedIn());
   EXPECT_TRUE(axis2->XyzExpressedIn().empty());
 
   EXPECT_DOUBLE_EQ(-0.5, axis->Lower());

diff --git a/test/worlds/joint_sensor.sdf b/test/worlds/joint_sensor.sdf
@@ -22,7 +22,6 @@
         <axis>
           <xyz>0 0 1</xyz>
           <initial_position>0.5</initial_position>
-          <use_parent_model_frame>true</use_parent_model_frame>
           <limit>
             <lower>-0.5</lower>
             <upper>0.5</upper>
@@ -39,7 +38,6 @@
         <axis2>
           <xyz>0 1 0</xyz>
           <initial_position>1.5</initial_position>
-          <use_parent_model_frame>false</use_parent_model_frame>
           <limit>
             <lower>-1</lower>
             <upper>1</upper>