refactor(radar_tracks_noise_filter)!: fix namespace and directory str…

…ucture (#7911) feat(radar_tracks_noise_filter): fix namespace and directory structure Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
autowarefoundation · Jul 10, 2024 · 0db8f67 · 0db8f67
1 parent 651d75b
commit 0db8f67
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/sensing/radar_tracks_noise_filter/CMakeLists.txt b/sensing/radar_tracks_noise_filter/CMakeLists.txt
@@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
 autoware_package()
 
 # Targets
-ament_auto_add_library(radar_tracks_noise_filter_node_component SHARED
-  src/radar_tracks_noise_filter_node/radar_tracks_noise_filter_node.cpp
+ament_auto_add_library(${PROJECT_NAME} SHARED
+  src/radar_tracks_noise_filter_node.cpp
 )
 
-rclcpp_components_register_node(radar_tracks_noise_filter_node_component
-  PLUGIN "radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode"
+rclcpp_components_register_node(${PROJECT_NAME}
+  PLUGIN "autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode"
   EXECUTABLE radar_tracks_noise_filter_node
 )
 
@@ -22,10 +22,10 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
   file(GLOB_RECURSE test_files test/**/*.cpp)
-  ament_add_ros_isolated_gtest(radar_tracks_noise_filter ${test_files})
+  ament_add_ros_isolated_gtest(${PROJECT_NAME}_test ${test_files})
 
-  target_link_libraries(radar_tracks_noise_filter
-    radar_tracks_noise_filter_node_component
+  target_link_libraries(${PROJECT_NAME}_test
+    ${PROJECT_NAME}
   )
 endif()
 

diff --git a/...r_node/radar_tracks_noise_filter_node.cpp → ...er/src/radar_tracks_noise_filter_node.cpp b/...r_node/radar_tracks_noise_filter_node.cpp → ...er/src/radar_tracks_noise_filter_node.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp"
+#include "radar_tracks_noise_filter_node.hpp"
 
 #include <memory>
 #include <string>
@@ -38,7 +38,7 @@ bool update_param(
 }
 }  // namespace
 
-namespace radar_tracks_noise_filter
+namespace autoware::radar_tracks_noise_filter
 {
 using radar_msgs::msg::RadarTrack;
 using radar_msgs::msg::RadarTracks;
@@ -116,7 +116,8 @@ bool RadarTrackCrossingNoiseFilterNode::isNoise(const RadarTrack & radar_track)
   }
 }
 
-}  // namespace radar_tracks_noise_filter
+}  // namespace autoware::radar_tracks_noise_filter
 
 #include "rclcpp_components/register_node_macro.hpp"
-RCLCPP_COMPONENTS_REGISTER_NODE(radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode)
+RCLCPP_COMPONENTS_REGISTER_NODE(
+  autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode)
diff --git a/...filter/radar_tracks_noise_filter_node.hpp → ...er/src/radar_tracks_noise_filter_node.hpp b/...filter/radar_tracks_noise_filter_node.hpp → ...er/src/radar_tracks_noise_filter_node.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
-#define RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
+#ifndef RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
+#define RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
 
 #include "rclcpp/rclcpp.hpp"
 
@@ -23,7 +23,7 @@
 #include <memory>
 #include <vector>
 
-namespace radar_tracks_noise_filter
+namespace autoware::radar_tracks_noise_filter
 {
 using radar_msgs::msg::RadarTrack;
 using radar_msgs::msg::RadarTracks;
@@ -62,6 +62,6 @@ class RadarTrackCrossingNoiseFilterNode : public rclcpp::Node
   bool isNoise(const RadarTrack & radar_track);
 };
 
-}  // namespace radar_tracks_noise_filter
+}  // namespace autoware::radar_tracks_noise_filter
 
-#endif  // RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
+#endif  // RADAR_TRACKS_NOISE_FILTER_NODE_HPP_
diff --git a/...s_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp b/...s_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp"
+#include "../../src/radar_tracks_noise_filter_node.hpp"
 
 #include <radar_msgs/msg/radar_scan.hpp>
 
 #include <gtest/gtest.h>
 
-std::shared_ptr<radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode> get_node(
+std::shared_ptr<autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode> get_node(
   float velocity_y_threshold)
 {
   rclcpp::NodeOptions node_options;
@@ -28,7 +28,8 @@ std::shared_ptr<radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode> ge
   });
 
   auto node =
-    std::make_shared<radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode>(node_options);
+    std::make_shared<autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode>(
+      node_options);
   return node;
 }
 
@@ -45,8 +46,8 @@ radar_msgs::msg::RadarTrack getRadarTrack(float velocity_x, float velocity_y)
 
 TEST(RadarTracksNoiseFilter, isNoise)
 {
+  using autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode;
   using radar_msgs::msg::RadarTrack;
-  using radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode;
   rclcpp::init(0, nullptr);
   {
     float velocity_node_threshold = 0.0;