Skip to content

Commit 646b7b3

Browse files
christophfroehlichchristophfroehlich
authored
Fix preceeding->preceding typos (#1655)
1 parent 263aa9e commit 646b7b3

16 files changed

+58
-59
lines changed

‎ackermann_steering_controller/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ if(BUILD_TESTING)
7474
)
7575

7676
add_rostest_with_parameters_gmock(
77-
test_ackermann_steering_controller_preceeding test/test_ackermann_steering_controller_preceeding.cpp
78-
${CMAKE_CURRENT_SOURCE_DIR}/test/ackermann_steering_controller_preceeding_params.yaml)
79-
target_include_directories(test_ackermann_steering_controller_preceeding PRIVATE include)
80-
target_link_libraries(test_ackermann_steering_controller_preceeding ackermann_steering_controller)
77+
test_ackermann_steering_controller_preceding test/test_ackermann_steering_controller_preceding.cpp
78+
${CMAKE_CURRENT_SOURCE_DIR}/test/ackermann_steering_controller_preceding_params.yaml)
79+
target_include_directories(test_ackermann_steering_controller_preceding PRIVATE include)
80+
target_link_libraries(test_ackermann_steering_controller_preceding ackermann_steering_controller)
8181
ament_target_dependencies(
82-
test_ackermann_steering_controller_preceeding
82+
test_ackermann_steering_controller_preceding
8383
controller_interface
8484
hardware_interface
8585
)

‎ackermann_steering_controller/test/ackermann_steering_controller_preceeding_params.yaml renamed to ‎ackermann_steering_controller/test/ackermann_steering_controller_preceding_params.yaml

File renamed without changes.

‎ackermann_steering_controller/test/test_ackermann_steering_controller.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,13 @@ class AckermannSteeringControllerFixture : public ::testing::Test
287287
std::vector<std::string> joint_names_ = {
288288
rear_wheels_names_[0], rear_wheels_names_[1], front_wheels_names_[0], front_wheels_names_[1]};
289289

290-
std::vector<std::string> rear_wheels_preceeding_names_ = {
290+
std::vector<std::string> rear_wheels_preceding_names_ = {
291291
"pid_controller/rear_right_wheel_joint", "pid_controller/rear_left_wheel_joint"};
292-
std::vector<std::string> front_wheels_preceeding_names_ = {
292+
std::vector<std::string> front_wheels_preceding_names_ = {
293293
"pid_controller/front_right_steering_joint", "pid_controller/front_left_steering_joint"};
294-
std::vector<std::string> preceeding_joint_names_ = {
295-
rear_wheels_preceeding_names_[0], rear_wheels_preceeding_names_[1],
296-
front_wheels_preceeding_names_[0], front_wheels_preceeding_names_[1]};
294+
std::vector<std::string> preceding_joint_names_ = {
295+
rear_wheels_preceding_names_[0], rear_wheels_preceding_names_[1],
296+
front_wheels_preceding_names_[0], front_wheels_preceding_names_[1]};
297297

298298
double wheelbase_ = 3.24644;
299299
double front_wheel_track_ = 2.12321;
@@ -307,7 +307,7 @@ class AckermannSteeringControllerFixture : public ::testing::Test
307307
std::string steering_interface_name_ = "position";
308308
// defined in setup
309309
std::string traction_interface_name_ = "";
310-
std::string preceeding_prefix_ = "pid_controller";
310+
std::string preceding_prefix_ = "pid_controller";
311311

312312
std::vector<hardware_interface::StateInterface> state_itfs_;
313313
std::vector<hardware_interface::CommandInterface> command_itfs_;

‎ackermann_steering_controller/test/test_ackermann_steering_controller_preceeding.cpp renamed to ‎ackermann_steering_controller/test/test_ackermann_steering_controller_preceding.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ TEST_F(AckermannSteeringControllerTest, all_parameters_set_configure_success)
3232

3333
ASSERT_THAT(
3434
controller_->params_.rear_wheels_names,
35-
testing::ElementsAreArray(rear_wheels_preceeding_names_));
35+
testing::ElementsAreArray(rear_wheels_preceding_names_));
3636
ASSERT_THAT(
3737
controller_->params_.front_wheels_names,
38-
testing::ElementsAreArray(front_wheels_preceeding_names_));
38+
testing::ElementsAreArray(front_wheels_preceding_names_));
3939
ASSERT_EQ(controller_->params_.front_steering, front_steering_);
4040
ASSERT_EQ(controller_->params_.open_loop, open_loop_);
4141
ASSERT_EQ(controller_->params_.velocity_rolling_window_size, velocity_rolling_window_size_);
@@ -57,16 +57,16 @@ TEST_F(AckermannSteeringControllerTest, check_exported_interfaces)
5757
ASSERT_EQ(cmd_if_conf.names.size(), joint_command_values_.size());
5858
EXPECT_EQ(
5959
cmd_if_conf.names[CMD_TRACTION_RIGHT_WHEEL],
60-
preceeding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
60+
preceding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
6161
EXPECT_EQ(
6262
cmd_if_conf.names[CMD_TRACTION_LEFT_WHEEL],
63-
preceeding_prefix_ + "/" + rear_wheels_names_[1] + "/" + traction_interface_name_);
63+
preceding_prefix_ + "/" + rear_wheels_names_[1] + "/" + traction_interface_name_);
6464
EXPECT_EQ(
6565
cmd_if_conf.names[CMD_STEER_RIGHT_WHEEL],
66-
preceeding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
66+
preceding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
6767
EXPECT_EQ(
6868
cmd_if_conf.names[CMD_STEER_LEFT_WHEEL],
69-
preceeding_prefix_ + "/" + front_wheels_names_[1] + "/" + steering_interface_name_);
69+
preceding_prefix_ + "/" + front_wheels_names_[1] + "/" + steering_interface_name_);
7070
EXPECT_EQ(cmd_if_conf.type, controller_interface::interface_configuration_type::INDIVIDUAL);
7171

7272
auto state_if_conf = controller_->state_interface_configuration();

‎bicycle_steering_controller/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ if(BUILD_TESTING)
7272
)
7373

7474
add_rostest_with_parameters_gmock(
75-
test_bicycle_steering_controller_preceeding test/test_bicycle_steering_controller_preceeding.cpp
76-
${CMAKE_CURRENT_SOURCE_DIR}/test/bicycle_steering_controller_preceeding_params.yaml)
77-
target_include_directories(test_bicycle_steering_controller_preceeding PRIVATE include)
78-
target_link_libraries(test_bicycle_steering_controller_preceeding bicycle_steering_controller)
75+
test_bicycle_steering_controller_preceding test/test_bicycle_steering_controller_preceding.cpp
76+
${CMAKE_CURRENT_SOURCE_DIR}/test/bicycle_steering_controller_preceding_params.yaml)
77+
target_include_directories(test_bicycle_steering_controller_preceding PRIVATE include)
78+
target_link_libraries(test_bicycle_steering_controller_preceding bicycle_steering_controller)
7979
ament_target_dependencies(
80-
test_bicycle_steering_controller_preceeding
80+
test_bicycle_steering_controller_preceding
8181
controller_interface
8282
hardware_interface
8383
)

‎bicycle_steering_controller/test/bicycle_steering_controller_preceeding_params.yaml renamed to ‎bicycle_steering_controller/test/bicycle_steering_controller_preceding_params.yaml

File renamed without changes.

‎bicycle_steering_controller/test/test_bicycle_steering_controller.hpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,10 @@ class BicycleSteeringControllerFixture : public ::testing::Test
257257
std::vector<std::string> front_wheels_names_ = {{"steering_axis_joint"}};
258258
std::vector<std::string> joint_names_ = {{rear_wheels_names_[0], front_wheels_names_[0]}};
259259

260-
std::vector<std::string> rear_wheels_preceeding_names_ = {{"pid_controller/rear_wheel_joint"}};
261-
std::vector<std::string> front_wheels_preceeding_names_ = {
262-
{"pid_controller/steering_axis_joint"}};
263-
std::vector<std::string> preceeding_joint_names_ = {
264-
rear_wheels_preceeding_names_[0], front_wheels_preceeding_names_[0]};
260+
std::vector<std::string> rear_wheels_preceding_names_ = {{"pid_controller/rear_wheel_joint"}};
261+
std::vector<std::string> front_wheels_preceding_names_ = {{"pid_controller/steering_axis_joint"}};
262+
std::vector<std::string> preceding_joint_names_ = {
263+
rear_wheels_preceding_names_[0], front_wheels_preceding_names_[0]};
265264

266265
double wheelbase_ = 3.24644;
267266
double front_wheels_radius_ = 0.45;
@@ -274,7 +273,7 @@ class BicycleSteeringControllerFixture : public ::testing::Test
274273

275274
// defined in setup
276275
std::string traction_interface_name_ = "";
277-
std::string preceeding_prefix_ = "pid_controller";
276+
std::string preceding_prefix_ = "pid_controller";
278277

279278
std::vector<hardware_interface::StateInterface> state_itfs_;
280279
std::vector<hardware_interface::CommandInterface> command_itfs_;

‎bicycle_steering_controller/test/test_bicycle_steering_controller_preceeding.cpp renamed to ‎bicycle_steering_controller/test/test_bicycle_steering_controller_preceding.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ TEST_F(BicycleSteeringControllerTest, all_parameters_set_configure_success)
3232

3333
ASSERT_THAT(
3434
controller_->params_.rear_wheels_names,
35-
testing::ElementsAreArray(rear_wheels_preceeding_names_));
35+
testing::ElementsAreArray(rear_wheels_preceding_names_));
3636
ASSERT_THAT(
3737
controller_->params_.front_wheels_names,
38-
testing::ElementsAreArray(front_wheels_preceeding_names_));
38+
testing::ElementsAreArray(front_wheels_preceding_names_));
3939
ASSERT_EQ(controller_->params_.front_steering, front_steering_);
4040
ASSERT_EQ(controller_->params_.open_loop, open_loop_);
4141
ASSERT_EQ(controller_->params_.velocity_rolling_window_size, velocity_rolling_window_size_);
@@ -55,10 +55,10 @@ TEST_F(BicycleSteeringControllerTest, check_exported_interfaces)
5555
ASSERT_EQ(cmd_if_conf.names.size(), joint_command_values_.size());
5656
EXPECT_EQ(
5757
cmd_if_conf.names[CMD_TRACTION_WHEEL],
58-
preceeding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
58+
preceding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
5959
EXPECT_EQ(
6060
cmd_if_conf.names[CMD_STEER_WHEEL],
61-
preceeding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
61+
preceding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
6262
EXPECT_EQ(cmd_if_conf.type, controller_interface::interface_configuration_type::INDIVIDUAL);
6363

6464
auto state_if_conf = controller_->state_interface_configuration();

‎mecanum_drive_controller/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ if(BUILD_TESTING)
7575
)
7676

7777
add_rostest_with_parameters_gmock(
78-
test_mecanum_drive_controller_preceeding test/test_mecanum_drive_controller_preceeding.cpp
79-
${CMAKE_CURRENT_SOURCE_DIR}/test/mecanum_drive_controller_preceeding_params.yaml)
80-
target_include_directories(test_mecanum_drive_controller_preceeding PRIVATE include)
81-
target_link_libraries(test_mecanum_drive_controller_preceeding mecanum_drive_controller)
78+
test_mecanum_drive_controller_preceding test/test_mecanum_drive_controller_preceding.cpp
79+
${CMAKE_CURRENT_SOURCE_DIR}/test/mecanum_drive_controller_preceding_params.yaml)
80+
target_include_directories(test_mecanum_drive_controller_preceding PRIVATE include)
81+
target_link_libraries(test_mecanum_drive_controller_preceding mecanum_drive_controller)
8282
ament_target_dependencies(
83-
test_mecanum_drive_controller_preceeding
83+
test_mecanum_drive_controller_preceding
8484
controller_interface
8585
hardware_interface
8686
)

‎mecanum_drive_controller/test/mecanum_drive_controller_preceeding_params.yaml renamed to ‎mecanum_drive_controller/test/mecanum_drive_controller_preceding_params.yaml

File renamed without changes.

0 commit comments

Comments
 (0)