update throwOrPrintError and fix test

Signed-off-by: Marco A. Gutierrez <marco@openrobotics.org>
gazebosim · Mar 16, 2023 · a4fd3be · a4fd3be
1 parent dcf6bb4
commit a4fd3be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/include/sdf/Element.hh b/include/sdf/Element.hh
@@ -25,6 +25,7 @@
 #include <utility>
 #include <vector>
 
+#include "sdf/Error.hh"
 #include "sdf/Param.hh"
 #include "sdf/PrintConfig.hh"
 #include "sdf/sdf_config.h"
@@ -1016,7 +1017,7 @@ namespace sdf
     std::pair<T, bool> result = this->Get<T>(errors, _key, _defaultValue);
     for(auto& error : errors)
     {
-      error.ThrowOrPrintError(sdferr);
+      internal::throwOrPrintError(sdferr, error);
     }
     return result;
   }
@@ -1069,7 +1070,7 @@ namespace sdf
     bool result = this->Set<T>(errors, _value);
     for(auto& error : errors)
     {
-      error.ThrowOrPrintError(sdferr);
+      internal::throwOrPrintError(sdferr, error);
     }
     return result;
   }

diff --git a/test/integration/error_output.cc b/test/integration/error_output.cc
@@ -233,12 +233,14 @@ TEST(ErrorOutput, ElementErrorOutput)
   ASSERT_EQ(errors.size(), 1u);
   EXPECT_NE(std::string::npos, errors[0].Message().find(
       "Missing element description for [nonExistentElement]"));
-
-  elem->RemoveChild(sdf::ElementPtr(), errors);
-  ASSERT_EQ(errors.size(), 1u);
-  EXPECT_NE(std::string::npos, errors[0].Message().find(
-      "Cannot remove a nullptr child pointer"));
   errors.clear();
+  // Check nothing has been printed
+  EXPECT_TRUE(buffer.str().empty()) << buffer.str();
+
+  ASSERT_THROW(elem->RemoveChild(sdf::ElementPtr(), errors),
+               sdf::AssertionInternalError);
+  ASSERT_EQ(errors.size(), 0u);
+  buffer.str(std::string());
 
   elem->AddAttribute("key", "std::string", "test", true, errors, "");
   ASSERT_EQ(errors.size(), 0u);