Skip to content

Commit 5fa9bcb

Browse files
rjoomenclaude
andcommitted
Simplify redundant explicit ids to implicit conversions in tests
Drop 8 explicit JointId(...) wrappers where the target type is already fixed by context; test TUs enable implicit string->id conversion. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XnQ84NASLsf6oQ2kGqXdnk
1 parent 9df955e commit 5fa9bcb

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

command_language/test/command_language_utils_unit.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ TEST(TesseractCommandLanguageUtilsUnit, getJointPositionFormatedTests) // NOLIN
272272
TEST(TesseractCommandLanguageUtilsUnit, formatJointPositionByIdTests) // NOLINT
273273
{
274274
using tesseract::common::JointId;
275-
std::vector<JointId> joint_ids = { JointId("joint_1"), JointId("joint_2") };
276-
std::vector<JointId> format_joint_ids = { JointId("joint_2"), JointId("joint_1") };
275+
std::vector<JointId> joint_ids = { "joint_1", "joint_2" };
276+
std::vector<JointId> format_joint_ids = { "joint_2", "joint_1" };
277277
Eigen::VectorXd position0 = Eigen::Vector2d(1, 2);
278278
Eigen::VectorXd position00 = Eigen::Vector2d(3, 4);
279279
Eigen::VectorXd format_position0 = Eigen::Vector2d(2, 1);
@@ -315,9 +315,9 @@ TEST(TesseractCommandLanguageUtilsUnit, formatJointPositionByIdTests) // NOLINT
315315
WaypointPoly wp2_poly{ wp2 };
316316
EXPECT_FALSE(formatJointPosition(format_joint_ids, wp2_poly)); // NOLINT
317317

318-
EXPECT_ANY_THROW(formatJointPosition(std::vector<JointId>{ JointId("joint_1") }, wp0_poly)); // NOLINT
318+
EXPECT_ANY_THROW(formatJointPosition(std::vector<JointId>{ "joint_1" }, wp0_poly)); // NOLINT
319319
EXPECT_ANY_THROW(
320-
formatJointPosition(std::vector<JointId>{ JointId("joint_3"), JointId("joint_1") }, wp0_poly)); // NOLINT
320+
formatJointPosition(std::vector<JointId>{ "joint_3", "joint_1" }, wp0_poly)); // NOLINT
321321

322322
WaypointPoly error_poly;
323323
EXPECT_ANY_THROW(formatJointPosition(format_joint_ids, error_poly)); // NOLINT

motion_planners/core/test/planner_unit.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Eigen::VectorXd values()
3333

3434
TEST(TesseractMotionPlannersCoreUnit, AssignSolutionIdsCreatesStateWaypoint) // NOLINT
3535
{
36-
const std::vector<JointId> joint_ids{ JointId("j1"), JointId("j2") };
36+
const std::vector<JointId> joint_ids{ "j1", "j2" };
3737
MoveInstructionPoly mi(
3838
MoveInstruction(CartesianWaypoint(Eigen::Isometry3d::Identity()), MoveInstructionType::FREESPACE));
3939

@@ -47,7 +47,7 @@ TEST(TesseractMotionPlannersCoreUnit, AssignSolutionIdsCreatesStateWaypoint) //
4747

4848
TEST(TesseractMotionPlannersCoreUnit, AssignSolutionIdsSeedsCartesianWaypoint) // NOLINT
4949
{
50-
const std::vector<JointId> joint_ids{ JointId("j1"), JointId("j2") };
50+
const std::vector<JointId> joint_ids{ "j1", "j2" };
5151
MoveInstructionPoly mi(
5252
MoveInstruction(CartesianWaypoint(Eigen::Isometry3d::Identity()), MoveInstructionType::FREESPACE));
5353

motion_planners/simple/test/interpolation_unit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ MoveInstruction baseInstruction(const std::vector<JointId>& joint_ids)
3535

3636
TEST(TesseractMotionPlannersSimpleInterpolationUnit, GetInterpolatedInstructionsIds) // NOLINT
3737
{
38-
const std::vector<JointId> joint_ids{ JointId("j1"), JointId("j2") };
38+
const std::vector<JointId> joint_ids{ "j1", "j2" };
3939

4040
const auto mis = getInterpolatedInstructions(joint_ids, states(), baseInstruction(joint_ids));
4141

motion_planners/trajopt/test/trajopt_utils_unit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TEST(TesseractMotionPlannersTrajoptUtilsUnit, CreateNearJointStateTermInfoIds)
1414
{
1515
Eigen::VectorXd target(2);
1616
target << 0.1, 0.2;
17-
const std::vector<JointId> joint_ids{ JointId("j1"), JointId("j2") };
17+
const std::vector<JointId> joint_ids{ "j1", "j2" };
1818
const Eigen::VectorXd coeffs = Eigen::VectorXd::Constant(1, 5.0);
1919

2020
const auto term = createNearJointStateTermInfo(target, joint_ids, 3, coeffs, trajopt::TermType::TT_COST);

0 commit comments

Comments
 (0)