Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
urrsk committed Jun 28, 2023
1 parent a84d86c commit 8a5f6d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/control/trajectory_point_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ bool TrajectoryPointInterface::writeTrajectorySplinePoint(const vector6d_t* posi
}
else
{
throw urcl::UrException("TrajectoryPointInterface::writeTrajectorySplinePoint is only getting a nullptr for positions\n");
throw urcl::UrException("TrajectoryPointInterface::writeTrajectorySplinePoint is only getting a nullptr for "
"positions\n");
}

if (velocities != nullptr)
Expand Down
8 changes: 5 additions & 3 deletions tests/test_trajectory_point_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class TrajectoryPointInterfaceTest : public ::testing::Test
return motion_type;
}

struct TrajData
struct TrajData
{
vector6int32_t pos, vel, acc;
int32_t goal_time, blend_radius_or_spline_type, motion_type;
Expand Down Expand Up @@ -279,7 +279,8 @@ TEST_F(TrajectoryPointInterfaceTest, write_quintic_joint_spline)
EXPECT_EQ(send_goal_time, ((double)received_data.goal_time / traj_point_interface_->MULT_TIME));

// Spline type
EXPECT_EQ(static_cast<int32_t>(control::TrajectorySplineType::SPLINE_QUINTIC), received_data.blend_radius_or_spline_type);
EXPECT_EQ(static_cast<int32_t>(control::TrajectorySplineType::SPLINE_QUINTIC),
received_data.blend_radius_or_spline_type);

// Motion type
EXPECT_EQ(static_cast<int32_t>(control::TrajectoryMotionType::JOINT_POINT_SPLINE), received_data.motion_type);
Expand Down Expand Up @@ -322,7 +323,8 @@ TEST_F(TrajectoryPointInterfaceTest, write_cubic_joint_spline)
EXPECT_EQ(send_goal_time, ((double)received_data.goal_time) / traj_point_interface_->MULT_TIME);

// Spline type
EXPECT_EQ(static_cast<int32_t>(control::TrajectorySplineType::SPLINE_CUBIC), received_data.blend_radius_or_spline_type);
EXPECT_EQ(static_cast<int32_t>(control::TrajectorySplineType::SPLINE_CUBIC),
received_data.blend_radius_or_spline_type);

// Motion type
EXPECT_EQ(static_cast<int32_t>(control::TrajectoryMotionType::JOINT_POINT_SPLINE), received_data.motion_type);
Expand Down

0 comments on commit 8a5f6d8

Please sign in to comment.