Changes to backport to Citadel

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Jul 29, 2021 · 362570b · 362570b
1 parent 9e6f743
commit 362570b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/examples/worlds/plot_3d.sdf b/examples/worlds/plot_3d.sdf
@@ -82,7 +82,7 @@
         <ignition-gui>
           <title>Upper link plot</title>
         </ignition-gui>
-        <entity_name>Double pendulum::upper_link</entity_name>
+        <entity_name>Double_pendulum::upper_link</entity_name>
         <color>0 0 1</color>
         <offset>0 0 1</offset>
         <maximum_points>20</maximum_points>
@@ -94,7 +94,7 @@
         <ignition-gui>
           <title>Lower link plot</title>
         </ignition-gui>
-        <entity_name>Double pendulum::lower_link</entity_name>
+        <entity_name>Double_pendulum::lower_link</entity_name>
         <color>0 1 0</color>
         <offset>0 0 1</offset>
         <maximum_points>40</maximum_points>
@@ -144,7 +144,7 @@
     </model>
 
     <include>
-      <name>Double pendulum</name>
+      <name>Double_pendulum</name>
       <uri>https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Double pendulum with base</uri>
     </include>
 

diff --git a/src/Util_TEST.cc b/src/Util_TEST.cc
@@ -219,7 +219,7 @@ TEST(UtilTest, ScopedName)
 }
 
 /////////////////////////////////////////////////
-TEST_F(UtilTest, EntitiesFromScopedName)
+TEST(UtilTest, EntitiesFromScopedName)
 {
   EntityComponentManager ecm;
 

diff --git a/src/gui/plugins/plot_3d/Plot3D_TEST.cc b/src/gui/plugins/plot_3d/Plot3D_TEST.cc
@@ -40,7 +40,10 @@
 #include "ignition/gazebo/EntityComponentManager.hh"
 #include "ignition/gazebo/test_config.hh"
 
-#include "../../GuiRunner.hh"
+// Use this when forward-porting to v6
+// #include "../../GuiRunner.hh"
+#include "ignition/gazebo/gui/GuiRunner.hh"
+
 #include "Plot3D.hh"
 
 int g_argc = 1;