Address reviewer feedback

Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Mar 22, 2021 · 2631da1 · 2631da1
1 parent b6333b3
commit 2631da1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/include/sdf/Element.hh b/include/sdf/Element.hh
@@ -493,15 +493,15 @@ namespace sdf
 
     /// \brief The <include> element that was used to load this entity. For
     /// example, given the following SDFormat:
-    /// <sdf version = '1.8'>
+    /// <sdf version='1.8'>
     ///   <world name='default'>
     ///     <include>
     ///       <uri>model_uri</uri>
     ///       <pose>1 2 3 0 0 0</pose>
     ///     </include>
     ///   </world>
     /// </sdf>
-    /// The ElementPtr associated with the model loaded from 'model_uri' will
+    /// The ElementPtr associated with the model loaded from `model_uri` will
     /// have the includeElement set to
     ///     <include>
     ///       <uri>model_uri</uri>

diff --git a/test/integration/nested_model.cc b/test/integration/nested_model.cc
@@ -1403,7 +1403,8 @@ TEST(NestedModel, IncludeElements)
   const std::string modelRootPath = sdf::filesystem::append(
       PROJECT_SOURCE_PATH, "test", "integration", "model");
 
-  sdf::setFindCallback(
+  sdf::ParserConfig config;
+  config.SetFindCallback(
       [&](const std::string &_file)
       {
         return sdf::filesystem::append(modelRootPath, _file);
@@ -1445,21 +1446,21 @@ TEST(NestedModel, IncludeElements)
           <name>test_box</name>
           <pose>1 2 3 0 0 0</pose>
           <placement_frame>link</placement_frame>
-          <plugin name="test_plugin" filename="test_plugin_file"/>
+          <plugin name='test_plugin' filename='test_plugin_file'/>
         </include>
-        <model name="test2">
+        <model name='test2'>
           <include>
             <uri>test_model</uri>
             <name>test_model</name>
             <pose>1 2 3 0 0 0</pose>
             <placement_frame>link</placement_frame>
-            <plugin name="test_plugin" filename="test_plugin_file"/>
+            <plugin name='test_plugin' filename='test_plugin_file'/>
           </include>
         </model>
       </world>
     </sdf>)";
     sdf::Root root;
-    sdf::Errors errors = root.LoadSdfString(stream.str());
+    sdf::Errors errors = root.LoadSdfString(stream.str(), config);
     EXPECT_TRUE(errors.empty()) << errors;
 
     auto *world = root.WorldByIndex(0);