Skip to content

Commit 090fd8e

Browse files
committed
fix(autoware_behavior_path_avoidance_by_lane_change_module): fix clang-tidy issues
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 42b7c5f commit 090fd8e

File tree

4 files changed

+14
-23
lines changed

4 files changed

+14
-23
lines changed

planning/behavior_path_avoidance_by_lane_change_module/src/interface.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
#include <memory>
2121
#include <string>
2222

23-
namespace autoware
24-
{
25-
namespace behavior_path_planner
23+
namespace autoware::behavior_path_planner
2624
{
2725
AvoidanceByLaneChangeInterface::AvoidanceByLaneChangeInterface(
2826
const std::string & name, rclcpp::Node & node,
@@ -62,5 +60,4 @@ void AvoidanceByLaneChangeInterface::updateRTCStatus(
6260
rtc_interface_ptr_map_.at(direction)->updateCooperateStatus(
6361
uuid_map_.at(direction), isExecutionReady(), start_distance, finish_distance, clock_->now());
6462
}
65-
} // namespace behavior_path_planner
6663
} // namespace autoware

planning/behavior_path_avoidance_by_lane_change_module/src/manager.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
#include <string>
2626
#include <vector>
2727

28-
namespace autoware
29-
{
30-
namespace behavior_path_planner
28+
namespace autoware::behavior_path_planner
3129
{
3230
void AvoidanceByLaneChangeModuleManager::init(rclcpp::Node * node)
3331
{
@@ -190,7 +188,6 @@ AvoidanceByLaneChangeModuleManager::createNewSceneModuleInstance()
190188
objects_of_interest_marker_interface_ptr_map_);
191189
}
192190

193-
} // namespace behavior_path_planner
194191
} // namespace autoware
195192

196193
#include <pluginlib/class_list_macros.hpp>

planning/behavior_path_avoidance_by_lane_change_module/src/scene.cpp

+1-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
#include <optional>
3333
#include <utility>
3434

35-
namespace autoware
36-
{
37-
namespace behavior_path_planner
35+
namespace autoware::behavior_path_planner
3836
{
3937
using ::behavior_path_planner::utils::lane_change::debug::createExecutionArea;
4038

@@ -303,5 +301,4 @@ double AvoidanceByLaneChange::calcLateralOffset() const
303301
}
304302
return additional_lat_offset;
305303
}
306-
} // namespace behavior_path_planner
307304
} // namespace autoware

planning/behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
using ::behavior_path_planner::BehaviorPathPlannerNode;
2727
using planning_test_utils::PlanningInterfaceTestManager;
2828

29-
std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
29+
std::shared_ptr<PlanningInterfaceTestManager> generate_test_manager()
3030
{
3131
auto test_manager = std::make_shared<PlanningInterfaceTestManager>();
3232

@@ -41,7 +41,7 @@ std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
4141
return test_manager;
4242
}
4343

44-
std::shared_ptr<BehaviorPathPlannerNode> generateNode()
44+
std::shared_ptr<BehaviorPathPlannerNode> generate_node()
4545
{
4646
auto node_options = rclcpp::NodeOptions{};
4747
const auto planning_test_utils_dir =
@@ -75,9 +75,9 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
7575
return std::make_shared<BehaviorPathPlannerNode>(node_options);
7676
}
7777

78-
void publishMandatoryTopics(
79-
std::shared_ptr<PlanningInterfaceTestManager> test_manager,
80-
std::shared_ptr<BehaviorPathPlannerNode> test_target_node)
78+
void publish_mandatory_topics(
79+
const std::shared_ptr<PlanningInterfaceTestManager>& test_manager,
80+
const std::shared_ptr<BehaviorPathPlannerNode>& test_target_node)
8181
{
8282
// publish necessary topics from test_manager
8383
test_manager->publishInitialPose(test_target_node, "behavior_path_planner/input/odometry");
@@ -97,10 +97,10 @@ void publishMandatoryTopics(
9797
TEST(PlanningModuleInterfaceTest, NodeTestWithExceptionRoute)
9898
{
9999
rclcpp::init(0, nullptr);
100-
auto test_manager = generateTestManager();
101-
auto test_target_node = generateNode();
100+
auto test_manager = generate_test_manager();
101+
auto test_target_node = generate_node();
102102

103-
publishMandatoryTopics(test_manager, test_target_node);
103+
publish_mandatory_topics(test_manager, test_target_node);
104104

105105
// test for normal trajectory
106106
ASSERT_NO_THROW_WITH_ERROR_MSG(test_manager->testWithBehaviorNominalRoute(test_target_node));
@@ -115,9 +115,9 @@ TEST(PlanningModuleInterfaceTest, NodeTestWithOffTrackEgoPose)
115115
{
116116
rclcpp::init(0, nullptr);
117117

118-
auto test_manager = generateTestManager();
119-
auto test_target_node = generateNode();
120-
publishMandatoryTopics(test_manager, test_target_node);
118+
auto test_manager = generate_test_manager();
119+
auto test_target_node = generate_node();
120+
publish_mandatory_topics(test_manager, test_target_node);
121121

122122
// test for normal trajectory
123123
ASSERT_NO_THROW_WITH_ERROR_MSG(test_manager->testWithBehaviorNominalRoute(test_target_node));

0 commit comments

Comments
 (0)