Fix some tests

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · May 13, 2020 · 9ecee15 · azeey · May 14, 2020 · chapulina
1 parent 80998c0
commit 9ecee15
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/examples/plugin/gui_system_plugin/CMakeLists.txt b/examples/plugin/gui_system_plugin/CMakeLists.txt
@@ -8,7 +8,7 @@ project(GuiSystemPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(ignition-gazebo2 REQUIRED COMPONENTS gui)
+find_package(ignition-gazebo3 REQUIRED COMPONENTS gui)
 
 QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc)
 
@@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED
   ${resources_RCC}
 )
 target_link_libraries(${PROJECT_NAME}
-  PRIVATE ignition-gazebo2::gui
+  PRIVATE ignition-gazebo3::gui
 )
diff --git a/examples/standalone/custom_server/CMakeLists.txt b/examples/standalone/custom_server/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-gazebo2 REQUIRED)
-  set(IGN_COMMON_VER ${ignition-gazebo2_VERSION_MAJOR})
+  find_package(ignition-gazebo3 REQUIRED)
+  set(IGN_COMMON_VER ${ignition-gazebo3_VERSION_MAJOR})
 
   add_executable(custom_server custom_server.cc)
   target_link_libraries(custom_server

diff --git a/src/SdfGenerator_TEST.cc b/src/SdfGenerator_TEST.cc
@@ -110,14 +110,14 @@ static bool isSubset(const sdf::ElementPtr &_elemA,
 TEST(CompareElements, CompareWithDuplicateElements)
 {
   const std::string m1Sdf = R"(
-  <sdf version="1.6">
+  <sdf version="1.7">
     <model name="M1">
       <pose>0 0 0 0 0 0 0</pose>
     </model>
   </sdf>
   )";
   const std::string m1CompTestSdf = R"(
-  <sdf version="1.6">
+  <sdf version="1.7">
     <model name="M1">
       <pose>0 0 0 0 0 0 0</pose>
       <pose>0 0 0 0 0 0 0</pose>
@@ -159,7 +159,13 @@ class ElementUpdateFixture : public ::testing::Test
 
   public: virtual void LoadWorld(const std::string &_path)
   {
-    this->root.Load(common::joinPaths(PROJECT_SOURCE_PATH, _path));
+    auto errors = this->root.Load(common::joinPaths(PROJECT_SOURCE_PATH,
+        _path));
+    EXPECT_TRUE(errors.empty()) << _path;
+
+    for (auto error : errors)
+      igndbg << error.Message() << std::endl;
+
     ASSERT_EQ(1u, root.WorldCount());
     this->world = root.WorldByIndex(0);
     ASSERT_NE(nullptr, this->world);
@@ -168,7 +174,12 @@ class ElementUpdateFixture : public ::testing::Test
 
   public: virtual void LoadWorldString(const std::string &_worldSdf)
   {
-    this->root.LoadSdfString(_worldSdf);
+    auto errors = this->root.LoadSdfString(_worldSdf);
+    EXPECT_TRUE(errors.empty()) << _worldSdf;
+
+    for (auto error : errors)
+      igndbg << error.Message() << std::endl;
+
     ASSERT_EQ(1u, root.WorldCount());
     this->world = root.WorldByIndex(0);
     ASSERT_NE(nullptr, this->world);
@@ -530,16 +541,11 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
       // Thes following two URIs are valid, but have a trailing '/'
       "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Backpack/",
       "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Backpack/1/",
-      // Thes following two URIs are invalid, and will not be saved
-      "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Backpack/"
-      "notInt",
-      "https://fuel.ignitionrobotics.org/1.0/openrobotics/models/Backpack/"
-      "notInt/",
   };
 
   std::string worldSdf = R"(
 <?xml version="1.0" ?>
-<sdf version="1.6">
+<sdf version="1.7">
   <world name="invalid_uris">
     <include>
       <uri>)" + fuelUris[0] + R"(</uri>
@@ -549,14 +555,6 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
       <uri>)" + fuelUris[1] + R"(</uri>
       <name>backpack2</name>
     </include>
-    <include>
-      <uri>)" + fuelUris[2] + R"(</uri>
-      <name>backpack3</name>
-    </include>
-    <include>
-      <uri>)" + fuelUris[3] + R"(</uri>
-      <name>backpack3</name>
-    </include>
   </world>
 </sdf>
   )";
@@ -594,7 +592,7 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithNonFuelUris)
 
   std::string worldSdf = R"(
 <?xml version="1.0" ?>
-<sdf version="1.6">
+<sdf version="1.7">
   <world name="nonfuel_uris">
     <include>
       <uri>)" + includeUris[0] + R"(</uri>
@@ -604,7 +602,9 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithNonFuelUris)
       <uri>)" + includeUris[1] + R"(</uri>
       <name>model2</name>
     </include>
-    <model name="model3"/>
+    <model name="model3">
+      <link name="link3"/>
+    </model>
   </world>
 </sdf>
   )";
@@ -777,7 +777,7 @@ TEST_F(ElementUpdateFixture, WorldWithModelsUsingRelativeResourceURIs)
 
   std::string worldSdf = R"(
 <?xml version="1.0" ?>
-<sdf version="1.6">
+<sdf version="1.7">
   <world name="test_relative_resource">
     <include>
       <uri>)" + includeUri + R"(</uri>