Skip to content

Commit 2e63c93

Browse files
christophfroehlichmergify[bot]
christophfroehlich
authored and
mergify[bot]
committed
Fix preceeding->preceding typos (#1655)
(cherry picked from commit 646b7b3) # Conflicts: # bicycle_steering_controller/test/test_bicycle_steering_controller.hpp # tricycle_steering_controller/test/test_tricycle_steering_controller.hpp
1 parent 0d027aa commit 2e63c93

16 files changed

+65
-49
lines changed

‎ackermann_steering_controller/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ if(BUILD_TESTING)
7878
)
7979

8080
add_rostest_with_parameters_gmock(
81-
test_ackermann_steering_controller_preceeding test/test_ackermann_steering_controller_preceeding.cpp
82-
${CMAKE_CURRENT_SOURCE_DIR}/test/ackermann_steering_controller_preceeding_params.yaml)
83-
target_include_directories(test_ackermann_steering_controller_preceeding PRIVATE include)
84-
target_link_libraries(test_ackermann_steering_controller_preceeding ackermann_steering_controller)
81+
test_ackermann_steering_controller_preceding test/test_ackermann_steering_controller_preceding.cpp
82+
${CMAKE_CURRENT_SOURCE_DIR}/test/ackermann_steering_controller_preceding_params.yaml)
83+
target_include_directories(test_ackermann_steering_controller_preceding PRIVATE include)
84+
target_link_libraries(test_ackermann_steering_controller_preceding ackermann_steering_controller)
8585
ament_target_dependencies(
86-
test_ackermann_steering_controller_preceeding
86+
test_ackermann_steering_controller_preceding
8787
controller_interface
8888
hardware_interface
8989
)

‎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
@@ -288,13 +288,13 @@ class AckermannSteeringControllerFixture : public ::testing::Test
288288
std::vector<std::string> joint_names_ = {
289289
rear_wheels_names_[0], rear_wheels_names_[1], front_wheels_names_[0], front_wheels_names_[1]};
290290

291-
std::vector<std::string> rear_wheels_preceeding_names_ = {
291+
std::vector<std::string> rear_wheels_preceding_names_ = {
292292
"pid_controller/rear_right_wheel_joint", "pid_controller/rear_left_wheel_joint"};
293-
std::vector<std::string> front_wheels_preceeding_names_ = {
293+
std::vector<std::string> front_wheels_preceding_names_ = {
294294
"pid_controller/front_right_steering_joint", "pid_controller/front_left_steering_joint"};
295-
std::vector<std::string> preceeding_joint_names_ = {
296-
rear_wheels_preceeding_names_[0], rear_wheels_preceeding_names_[1],
297-
front_wheels_preceeding_names_[0], front_wheels_preceeding_names_[1]};
295+
std::vector<std::string> preceding_joint_names_ = {
296+
rear_wheels_preceding_names_[0], rear_wheels_preceding_names_[1],
297+
front_wheels_preceding_names_[0], front_wheels_preceding_names_[1]};
298298

299299
double wheelbase_ = 3.24644;
300300
double front_wheel_track_ = 2.12321;
@@ -308,7 +308,7 @@ class AckermannSteeringControllerFixture : public ::testing::Test
308308
std::string steering_interface_name_ = "position";
309309
// defined in setup
310310
std::string traction_interface_name_ = "";
311-
std::string preceeding_prefix_ = "pid_controller";
311+
std::string preceding_prefix_ = "pid_controller";
312312

313313
std::vector<hardware_interface::StateInterface> state_itfs_;
314314
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
@@ -33,10 +33,10 @@ TEST_F(AckermannSteeringControllerTest, all_parameters_set_configure_success)
3333

3434
ASSERT_THAT(
3535
controller_->params_.rear_wheels_names,
36-
testing::ElementsAreArray(rear_wheels_preceeding_names_));
36+
testing::ElementsAreArray(rear_wheels_preceding_names_));
3737
ASSERT_THAT(
3838
controller_->params_.front_wheels_names,
39-
testing::ElementsAreArray(front_wheels_preceeding_names_));
39+
testing::ElementsAreArray(front_wheels_preceding_names_));
4040
ASSERT_EQ(controller_->params_.front_steering, front_steering_);
4141
ASSERT_EQ(controller_->params_.open_loop, open_loop_);
4242
ASSERT_EQ(controller_->params_.velocity_rolling_window_size, velocity_rolling_window_size_);
@@ -58,16 +58,16 @@ TEST_F(AckermannSteeringControllerTest, check_exported_interfaces)
5858
ASSERT_EQ(cmd_if_conf.names.size(), joint_command_values_.size());
5959
EXPECT_EQ(
6060
cmd_if_conf.names[CMD_TRACTION_RIGHT_WHEEL],
61-
preceeding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
61+
preceding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
6262
EXPECT_EQ(
6363
cmd_if_conf.names[CMD_TRACTION_LEFT_WHEEL],
64-
preceeding_prefix_ + "/" + rear_wheels_names_[1] + "/" + traction_interface_name_);
64+
preceding_prefix_ + "/" + rear_wheels_names_[1] + "/" + traction_interface_name_);
6565
EXPECT_EQ(
6666
cmd_if_conf.names[CMD_STEER_RIGHT_WHEEL],
67-
preceeding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
67+
preceding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
6868
EXPECT_EQ(
6969
cmd_if_conf.names[CMD_STEER_LEFT_WHEEL],
70-
preceeding_prefix_ + "/" + front_wheels_names_[1] + "/" + steering_interface_name_);
70+
preceding_prefix_ + "/" + front_wheels_names_[1] + "/" + steering_interface_name_);
7171
EXPECT_EQ(cmd_if_conf.type, controller_interface::interface_configuration_type::INDIVIDUAL);
7272

7373
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
@@ -76,12 +76,12 @@ if(BUILD_TESTING)
7676
)
7777

7878
add_rostest_with_parameters_gmock(
79-
test_bicycle_steering_controller_preceeding test/test_bicycle_steering_controller_preceeding.cpp
80-
${CMAKE_CURRENT_SOURCE_DIR}/test/bicycle_steering_controller_preceeding_params.yaml)
81-
target_include_directories(test_bicycle_steering_controller_preceeding PRIVATE include)
82-
target_link_libraries(test_bicycle_steering_controller_preceeding bicycle_steering_controller)
79+
test_bicycle_steering_controller_preceding test/test_bicycle_steering_controller_preceding.cpp
80+
${CMAKE_CURRENT_SOURCE_DIR}/test/bicycle_steering_controller_preceding_params.yaml)
81+
target_include_directories(test_bicycle_steering_controller_preceding PRIVATE include)
82+
target_link_libraries(test_bicycle_steering_controller_preceding bicycle_steering_controller)
8383
ament_target_dependencies(
84-
test_bicycle_steering_controller_preceeding
84+
test_bicycle_steering_controller_preceding
8585
controller_interface
8686
hardware_interface
8787
)

‎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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,17 @@ class BicycleSteeringControllerFixture : public ::testing::Test
258258
std::vector<std::string> front_wheels_names_ = {"steering_axis_joint"};
259259
std::vector<std::string> joint_names_ = {rear_wheels_names_[0], front_wheels_names_[0]};
260260

261+
<<<<<<< HEAD
261262
std::vector<std::string> rear_wheels_preceeding_names_ = {"pid_controller/rear_wheel_joint"};
262263
std::vector<std::string> front_wheels_preceeding_names_ = {"pid_controller/steering_axis_joint"};
263264
std::vector<std::string> preceeding_joint_names_ = {
264265
rear_wheels_preceeding_names_[0], front_wheels_preceeding_names_[0]};
266+
=======
267+
std::vector<std::string> rear_wheels_preceding_names_ = {{"pid_controller/rear_wheel_joint"}};
268+
std::vector<std::string> front_wheels_preceding_names_ = {{"pid_controller/steering_axis_joint"}};
269+
std::vector<std::string> preceding_joint_names_ = {
270+
rear_wheels_preceding_names_[0], front_wheels_preceding_names_[0]};
271+
>>>>>>> 646b7b3 (Fix preceeding->preceding typos (#1655))
265272

266273
double wheelbase_ = 3.24644;
267274
double front_wheels_radius_ = 0.45;
@@ -274,7 +281,7 @@ class BicycleSteeringControllerFixture : public ::testing::Test
274281

275282
// defined in setup
276283
std::string traction_interface_name_ = "";
277-
std::string preceeding_prefix_ = "pid_controller";
284+
std::string preceding_prefix_ = "pid_controller";
278285

279286
std::vector<hardware_interface::StateInterface> state_itfs_;
280287
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
@@ -33,10 +33,10 @@ TEST_F(BicycleSteeringControllerTest, all_parameters_set_configure_success)
3333

3434
ASSERT_THAT(
3535
controller_->params_.rear_wheels_names,
36-
testing::ElementsAreArray(rear_wheels_preceeding_names_));
36+
testing::ElementsAreArray(rear_wheels_preceding_names_));
3737
ASSERT_THAT(
3838
controller_->params_.front_wheels_names,
39-
testing::ElementsAreArray(front_wheels_preceeding_names_));
39+
testing::ElementsAreArray(front_wheels_preceding_names_));
4040
ASSERT_EQ(controller_->params_.front_steering, front_steering_);
4141
ASSERT_EQ(controller_->params_.open_loop, open_loop_);
4242
ASSERT_EQ(controller_->params_.velocity_rolling_window_size, velocity_rolling_window_size_);
@@ -56,10 +56,10 @@ TEST_F(BicycleSteeringControllerTest, check_exported_interfaces)
5656
ASSERT_EQ(cmd_if_conf.names.size(), joint_command_values_.size());
5757
EXPECT_EQ(
5858
cmd_if_conf.names[CMD_TRACTION_WHEEL],
59-
preceeding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
59+
preceding_prefix_ + "/" + rear_wheels_names_[0] + "/" + traction_interface_name_);
6060
EXPECT_EQ(
6161
cmd_if_conf.names[CMD_STEER_WHEEL],
62-
preceeding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
62+
preceding_prefix_ + "/" + front_wheels_names_[0] + "/" + steering_interface_name_);
6363
EXPECT_EQ(cmd_if_conf.type, controller_interface::interface_configuration_type::INDIVIDUAL);
6464

6565
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
@@ -79,12 +79,12 @@ if(BUILD_TESTING)
7979
)
8080

8181
add_rostest_with_parameters_gmock(
82-
test_mecanum_drive_controller_preceeding test/test_mecanum_drive_controller_preceeding.cpp
83-
${CMAKE_CURRENT_SOURCE_DIR}/test/mecanum_drive_controller_preceeding_params.yaml)
84-
target_include_directories(test_mecanum_drive_controller_preceeding PRIVATE include)
85-
target_link_libraries(test_mecanum_drive_controller_preceeding mecanum_drive_controller)
82+
test_mecanum_drive_controller_preceding test/test_mecanum_drive_controller_preceding.cpp
83+
${CMAKE_CURRENT_SOURCE_DIR}/test/mecanum_drive_controller_preceding_params.yaml)
84+
target_include_directories(test_mecanum_drive_controller_preceding PRIVATE include)
85+
target_link_libraries(test_mecanum_drive_controller_preceding mecanum_drive_controller)
8686
ament_target_dependencies(
87-
test_mecanum_drive_controller_preceeding
87+
test_mecanum_drive_controller_preceding
8888
controller_interface
8989
hardware_interface
9090
)

‎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)