Add nested model to error messages, update tests

Signed-off-by: Steve Peters <[email protected]>
gazebosim · Jul 24, 2020 · 7353fac · 7353fac
1 parent 384c759
commit 7353fac
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc
@@ -319,7 +319,7 @@ Errors buildFrameAttachedToGraph(
  errors.push_back({ErrorCode::FRAME_ATTACHED_TO_INVALID,
  "attached_to name[" + attachedTo +
  "] specified by frame with name[" + frame->Name() +
- "] does not match a link, joint, or frame name "
+ "] does not match a nested model, link, joint, or frame name "
  "in model with name[" + _model->Name() + "]."});
  continue;
  }
@@ -600,7 +600,7 @@ Errors buildPoseRelativeToGraph(
  errors.push_back({ErrorCode::POSE_RELATIVE_TO_INVALID,
  "relative_to name[" + relativeTo +
  "] specified by link with name[" + link->Name() +
- "] does not match a link, joint, or frame name "
+ "] does not match a nested model, link, joint, or frame name "
  "in model with name[" + _model->Name() + "]."});
  continue;
  }
@@ -635,7 +635,7 @@ Errors buildPoseRelativeToGraph(
  errors.push_back({ErrorCode::POSE_RELATIVE_TO_INVALID,
  "relative_to name[" + relativeTo +
  "] specified by joint with name[" + joint->Name() +
- "] does not match a link, joint, or frame name "
+ "] does not match a nested model, link, joint, or frame name "
  "in model with name[" + _model->Name() + "]."});
  continue;
  }
@@ -684,7 +684,7 @@ Errors buildPoseRelativeToGraph(
  errors.push_back({errorCode,
  typeForErrorMsg + " name[" + relativeTo +
  "] specified by frame with name[" + frame->Name() +
- "] does not match a link, joint, or frame name "
+ "] does not match a nested model, link, joint, or frame name "
  "in model with name[" + _model->Name() + "]."});
  continue;
  }

diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -381,8 +381,8 @@ TEST(check, SDF)
  std::string output =
  custom_exec_str(g_ignCommand + " sdf -k " + path + g_sdfVersion);
  EXPECT_NE(output.find("Error: attached_to name[A] specified by frame with "
- "name[F3] does not match a link, joint, or frame "
- "name in model with "
+ "name[F3] does not match a nested model, link, "
+ "joint, or frame name in model with "
  "name[model_frame_invalid_attached_to]."),
  std::string::npos) << output;
  EXPECT_NE(output.find("Error: attached_to name[F4] is identical to frame "
@@ -455,8 +455,8 @@ TEST(check, SDF)
  std::string output =
  custom_exec_str(g_ignCommand + " sdf -k " + path + g_sdfVersion);
  EXPECT_NE(output.find("Error: relative_to name[A] specified by link with "
- "name[L] does not match a link, joint, or frame "
- "name in model with "
+ "name[L] does not match a nested model, link, "
+ "joint, or frame name in model with "
  "name[model_invalid_link_relative_to]."),
  std::string::npos) << output;
  EXPECT_NE(output.find("Error: relative_to name[self_cycle] is identical to "
@@ -495,8 +495,8 @@ TEST(check, SDF)
  std::string output =
  custom_exec_str(g_ignCommand + " sdf -k " + path + g_sdfVersion);
  EXPECT_NE(output.find("Error: relative_to name[A] specified by joint with "
- "name[J] does not match a link, joint, or frame "
- "name in model with "
+ "name[J] does not match a nested model, link, "
+ "joint, or frame name in model with "
  "name[model_invalid_joint_relative_to]."),
  std::string::npos) << output;
  EXPECT_NE(output.find("Error: relative_to name[Jcycle] is identical to "
@@ -535,8 +535,8 @@ TEST(check, SDF)
  std::string output =
  custom_exec_str(g_ignCommand + " sdf -k " + path + g_sdfVersion);
  EXPECT_NE(output.find("Error: relative_to name[A] specified by frame with "
- "name[F] does not match a link, joint, or frame "
- "name in model with "
+ "name[F] does not match a nested model, link, "
+ "joint, or frame name in model with "
  "name[model_invalid_frame_relative_to]."),
  std::string::npos) << output;
  EXPECT_NE(output.find("Error: relative_to name[cycle] is identical to "

diff --git a/test/integration/frame.cc b/test/integration/frame.cc
@@ -489,7 +489,7 @@ TEST(DOMFrame, LoadModelFramesInvalidAttachedTo)
  EXPECT_NE(std::string::npos,
  errors[0].Message().find(
  "attached_to name[A] specified by frame with name[F3] does not match a "
- "link, joint, or frame name in model"));
+ "nested model, link, joint, or frame name in model"));
  EXPECT_EQ(errors[1].Code(), sdf::ErrorCode::FRAME_ATTACHED_TO_CYCLE);
  EXPECT_NE(std::string::npos,
  errors[1].Message().find(
@@ -502,7 +502,7 @@ TEST(DOMFrame, LoadModelFramesInvalidAttachedTo)
  EXPECT_NE(std::string::npos,
  errors[5].Message().find(
  "attached_to name[A] specified by frame with name[F3] does not match a "
- "link, joint, or frame name in model"));
+ "nested model, link, joint, or frame name in model"));
  EXPECT_EQ(errors[6].Code(), sdf::ErrorCode::POSE_RELATIVE_TO_CYCLE);
  EXPECT_NE(std::string::npos,
  errors[6].Message().find(
@@ -886,7 +886,7 @@ TEST(DOMFrame, LoadModelFramesInvalidRelativeTo)
  EXPECT_NE(std::string::npos,
  errors[0].Message().find(
  "relative_to name[A] specified by frame with name[F] does not match a "
- "link, joint, or frame name in model"));
+ "nested model, link, joint, or frame name in model"));
  EXPECT_EQ(errors[1].Code(), sdf::ErrorCode::POSE_RELATIVE_TO_CYCLE);
  EXPECT_NE(std::string::npos,
  errors[1].Message().find(

diff --git a/test/integration/joint_dom.cc b/test/integration/joint_dom.cc
@@ -343,7 +343,7 @@ TEST(DOMJoint, LoadInvalidJointPoseRelativeTo)
  EXPECT_NE(std::string::npos,
  errors[1].Message().find(
  "relative_to name[A] specified by joint with name[J] does not match a "
- "link, joint, or frame name in model"));
+ "nested model, link, joint, or frame name in model"));
  // errors[2]
  // errors[3]
  // errors[4]

diff --git a/test/integration/link_dom.cc b/test/integration/link_dom.cc
@@ -672,7 +672,7 @@ TEST(DOMLink, LoadInvalidLinkPoseRelativeTo)
  EXPECT_NE(std::string::npos,
  errors[0].Message().find(
  "relative_to name[A] specified by link with name[L] does not match a "
- "link, joint, or frame name in model"));
+ "nested model, link, joint, or frame name in model"));
  EXPECT_EQ(errors[1].Code(), sdf::ErrorCode::POSE_RELATIVE_TO_CYCLE);
  EXPECT_NE(std::string::npos,
  errors[1].Message().find(