From 9202499373ea7ada6ac1b7e31bf519971226edb7 Mon Sep 17 00:00:00 2001 From: Masaki Baba Date: Thu, 22 Aug 2024 13:03:29 +0900 Subject: [PATCH] refactor(localization_error_monitor)!: prefix package and namespace with autoware (#8423) add autoware_ prefix Signed-off-by: a-maumau --- .github/CODEOWNERS | 2 +- .../localization_error_monitor.launch.xml | 2 +- .../CMakeLists.txt | 6 +-- .../README.md | 6 +-- .../localization_error_monitor.param.yaml | 0 .../localization_error_monitor.launch.xml | 9 ++++ .../media/diagnostics.png | Bin .../package.xml | 2 +- .../localization_error_monitor.schema.json | 0 .../src/diagnostics.cpp | 5 +++ .../src}/diagnostics.hpp | 9 ++-- .../src/localization_error_monitor.cpp | 10 +++-- .../src}/localization_error_monitor.hpp | 10 +++-- .../test/test_diagnostics.cpp | 41 ++++++++++-------- .../localization_error_monitor.launch.xml | 9 ---- 15 files changed, 66 insertions(+), 45 deletions(-) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/CMakeLists.txt (87%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/README.md (74%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/config/localization_error_monitor.param.yaml (100%) create mode 100644 localization/autoware_localization_error_monitor/launch/localization_error_monitor.launch.xml rename localization/{localization_error_monitor => autoware_localization_error_monitor}/media/diagnostics.png (100%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/package.xml (96%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/schema/localization_error_monitor.schema.json (100%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/src/diagnostics.cpp (96%) rename localization/{localization_error_monitor/include/localization_error_monitor => autoware_localization_error_monitor/src}/diagnostics.hpp (86%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/src/localization_error_monitor.cpp (92%) rename localization/{localization_error_monitor/include/localization_error_monitor => autoware_localization_error_monitor/src}/localization_error_monitor.hpp (88%) rename localization/{localization_error_monitor => autoware_localization_error_monitor}/test/test_diagnostics.cpp (73%) delete mode 100644 localization/localization_error_monitor/launch/localization_error_monitor.launch.xml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0f98b3a2ce884..08fa500a8d546 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -88,7 +88,7 @@ localization/autoware_twist2accel/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier localization/ekf_localizer/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp takamasa.horibe@tier4.jp takeshi.ishita@tier4.jp yamato.ando@tier4.jp localization/autoware_geo_pose_projector/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/gyro_odometer/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp -localization/localization_error_monitor/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp +localization/autoware_localization_error_monitor/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/localization_util/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/ndt_scan_matcher/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp localization/pose_estimator_arbiter/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp diff --git a/launch/tier4_localization_launch/launch/localization_error_monitor/localization_error_monitor.launch.xml b/launch/tier4_localization_launch/launch/localization_error_monitor/localization_error_monitor.launch.xml index 4caefed02584a..ceff1f3fdcdb7 100644 --- a/launch/tier4_localization_launch/launch/localization_error_monitor/localization_error_monitor.launch.xml +++ b/launch/tier4_localization_launch/launch/localization_error_monitor/localization_error_monitor.launch.xml @@ -1,7 +1,7 @@ - + diff --git a/localization/localization_error_monitor/CMakeLists.txt b/localization/autoware_localization_error_monitor/CMakeLists.txt similarity index 87% rename from localization/localization_error_monitor/CMakeLists.txt rename to localization/autoware_localization_error_monitor/CMakeLists.txt index c27e51e6e0359..93cfb7ba7a0d9 100644 --- a/localization/localization_error_monitor/CMakeLists.txt +++ b/localization/autoware_localization_error_monitor/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(localization_error_monitor) +project(autoware_localization_error_monitor) find_package(autoware_cmake REQUIRED) autoware_package() @@ -10,7 +10,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED ) rclcpp_components_register_node(${PROJECT_NAME} - PLUGIN "LocalizationErrorMonitor" + PLUGIN "autoware::localization_error_monitor::LocalizationErrorMonitor" EXECUTABLE ${PROJECT_NAME}_node EXECUTOR SingleThreadedExecutor ) @@ -20,7 +20,7 @@ if(BUILD_TESTING) get_filename_component(filename ${filepath} NAME) string(REGEX REPLACE ".cpp" "" test_name ${filename}) ament_add_gtest(${test_name} ${filepath}) - target_include_directories(${test_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_include_directories(${test_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) target_link_libraries(${test_name} ${PROJECT_NAME}) ament_target_dependencies(${test_name} ${${PROJECT_NAME}_FOUND_BUILD_DEPENDS}) endfunction() diff --git a/localization/localization_error_monitor/README.md b/localization/autoware_localization_error_monitor/README.md similarity index 74% rename from localization/localization_error_monitor/README.md rename to localization/autoware_localization_error_monitor/README.md index 8dc82f09f3d07..9ea1eb5b269d9 100644 --- a/localization/localization_error_monitor/README.md +++ b/localization/autoware_localization_error_monitor/README.md @@ -1,4 +1,4 @@ -# localization_error_monitor +# autoware_localization_error_monitor ## Purpose @@ -6,7 +6,7 @@

-localization_error_monitor is a package for diagnosing localization errors by monitoring uncertainty of the localization results. +autoware_localization_error_monitor is a package for diagnosing localization errors by monitoring uncertainty of the localization results. The package monitors the following two values: - size of long radius of confidence ellipse @@ -29,4 +29,4 @@ The package monitors the following two values: ## Parameters -{{ json_to_markdown("localization/localization_error_monitor/schema/localization_error_monitor.schema.json") }} +{{ json_to_markdown("localization/autoware_localization_error_monitor/schema/localization_error_monitor.schema.json") }} diff --git a/localization/localization_error_monitor/config/localization_error_monitor.param.yaml b/localization/autoware_localization_error_monitor/config/localization_error_monitor.param.yaml similarity index 100% rename from localization/localization_error_monitor/config/localization_error_monitor.param.yaml rename to localization/autoware_localization_error_monitor/config/localization_error_monitor.param.yaml diff --git a/localization/autoware_localization_error_monitor/launch/localization_error_monitor.launch.xml b/localization/autoware_localization_error_monitor/launch/localization_error_monitor.launch.xml new file mode 100644 index 0000000000000..3ac61a8b45570 --- /dev/null +++ b/localization/autoware_localization_error_monitor/launch/localization_error_monitor.launch.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/localization/localization_error_monitor/media/diagnostics.png b/localization/autoware_localization_error_monitor/media/diagnostics.png similarity index 100% rename from localization/localization_error_monitor/media/diagnostics.png rename to localization/autoware_localization_error_monitor/media/diagnostics.png diff --git a/localization/localization_error_monitor/package.xml b/localization/autoware_localization_error_monitor/package.xml similarity index 96% rename from localization/localization_error_monitor/package.xml rename to localization/autoware_localization_error_monitor/package.xml index c4fa77ce85a6b..426b0d6b6c432 100644 --- a/localization/localization_error_monitor/package.xml +++ b/localization/autoware_localization_error_monitor/package.xml @@ -1,7 +1,7 @@ - localization_error_monitor + autoware_localization_error_monitor 0.1.0 ros node for monitoring localization error Yamato Ando diff --git a/localization/localization_error_monitor/schema/localization_error_monitor.schema.json b/localization/autoware_localization_error_monitor/schema/localization_error_monitor.schema.json similarity index 100% rename from localization/localization_error_monitor/schema/localization_error_monitor.schema.json rename to localization/autoware_localization_error_monitor/schema/localization_error_monitor.schema.json diff --git a/localization/localization_error_monitor/src/diagnostics.cpp b/localization/autoware_localization_error_monitor/src/diagnostics.cpp similarity index 96% rename from localization/localization_error_monitor/src/diagnostics.cpp rename to localization/autoware_localization_error_monitor/src/diagnostics.cpp index e6b9da8fc4a97..ef7f0faf12373 100644 --- a/localization/localization_error_monitor/src/diagnostics.cpp +++ b/localization/autoware_localization_error_monitor/src/diagnostics.cpp @@ -12,11 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "diagnostics.hpp" + #include #include #include +namespace autoware::localization_error_monitor +{ diagnostic_msgs::msg::DiagnosticStatus check_localization_accuracy( const double ellipse_size, const double warn_ellipse_size, const double error_ellipse_size) { @@ -92,3 +96,4 @@ diagnostic_msgs::msg::DiagnosticStatus merge_diagnostic_status( return merged_stat; } +} // namespace autoware::localization_error_monitor diff --git a/localization/localization_error_monitor/include/localization_error_monitor/diagnostics.hpp b/localization/autoware_localization_error_monitor/src/diagnostics.hpp similarity index 86% rename from localization/localization_error_monitor/include/localization_error_monitor/diagnostics.hpp rename to localization/autoware_localization_error_monitor/src/diagnostics.hpp index b1da87128bee5..bd92c28daad78 100644 --- a/localization/localization_error_monitor/include/localization_error_monitor/diagnostics.hpp +++ b/localization/autoware_localization_error_monitor/src/diagnostics.hpp @@ -12,14 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef LOCALIZATION_ERROR_MONITOR__DIAGNOSTICS_HPP_ -#define LOCALIZATION_ERROR_MONITOR__DIAGNOSTICS_HPP_ +#ifndef DIAGNOSTICS_HPP_ +#define DIAGNOSTICS_HPP_ #include #include #include +namespace autoware::localization_error_monitor +{ diagnostic_msgs::msg::DiagnosticStatus check_localization_accuracy( const double ellipse_size, const double warn_ellipse_size, const double error_ellipse_size); diagnostic_msgs::msg::DiagnosticStatus check_localization_accuracy_lateral_direction( @@ -27,5 +29,6 @@ diagnostic_msgs::msg::DiagnosticStatus check_localization_accuracy_lateral_direc diagnostic_msgs::msg::DiagnosticStatus merge_diagnostic_status( const std::vector & stat_array); +} // namespace autoware::localization_error_monitor -#endif // LOCALIZATION_ERROR_MONITOR__DIAGNOSTICS_HPP_ +#endif // DIAGNOSTICS_HPP_ diff --git a/localization/localization_error_monitor/src/localization_error_monitor.cpp b/localization/autoware_localization_error_monitor/src/localization_error_monitor.cpp similarity index 92% rename from localization/localization_error_monitor/src/localization_error_monitor.cpp rename to localization/autoware_localization_error_monitor/src/localization_error_monitor.cpp index 44223b0fd1670..fb96a55dd0dc1 100644 --- a/localization/localization_error_monitor/src/localization_error_monitor.cpp +++ b/localization/autoware_localization_error_monitor/src/localization_error_monitor.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "localization_error_monitor/localization_error_monitor.hpp" +#include "localization_error_monitor.hpp" -#include "localization_error_monitor/diagnostics.hpp" +#include "diagnostics.hpp" #include @@ -31,7 +31,10 @@ #include #include #include +#include +namespace autoware::localization_error_monitor +{ LocalizationErrorMonitor::LocalizationErrorMonitor(const rclcpp::NodeOptions & options) : Node("localization_error_monitor", options) { @@ -84,6 +87,7 @@ void LocalizationErrorMonitor::on_odom(nav_msgs::msg::Odometry::ConstSharedPtr i diag_msg.status.push_back(diag_merged_status); diag_pub_->publish(diag_msg); } +} // namespace autoware::localization_error_monitor #include -RCLCPP_COMPONENTS_REGISTER_NODE(LocalizationErrorMonitor) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::localization_error_monitor::LocalizationErrorMonitor) diff --git a/localization/localization_error_monitor/include/localization_error_monitor/localization_error_monitor.hpp b/localization/autoware_localization_error_monitor/src/localization_error_monitor.hpp similarity index 88% rename from localization/localization_error_monitor/include/localization_error_monitor/localization_error_monitor.hpp rename to localization/autoware_localization_error_monitor/src/localization_error_monitor.hpp index 0f293e4d31cac..919951bca3998 100644 --- a/localization/localization_error_monitor/include/localization_error_monitor/localization_error_monitor.hpp +++ b/localization/autoware_localization_error_monitor/src/localization_error_monitor.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef LOCALIZATION_ERROR_MONITOR__LOCALIZATION_ERROR_MONITOR_HPP_ -#define LOCALIZATION_ERROR_MONITOR__LOCALIZATION_ERROR_MONITOR_HPP_ +#ifndef LOCALIZATION_ERROR_MONITOR_HPP_ +#define LOCALIZATION_ERROR_MONITOR_HPP_ #include "localization_util/covariance_ellipse.hpp" @@ -27,6 +27,8 @@ #include +namespace autoware::localization_error_monitor +{ class LocalizationErrorMonitor : public rclcpp::Node { private: @@ -50,4 +52,6 @@ class LocalizationErrorMonitor : public rclcpp::Node public: explicit LocalizationErrorMonitor(const rclcpp::NodeOptions & options); }; -#endif // LOCALIZATION_ERROR_MONITOR__LOCALIZATION_ERROR_MONITOR_HPP_ +} // namespace autoware::localization_error_monitor + +#endif // LOCALIZATION_ERROR_MONITOR_HPP_ diff --git a/localization/localization_error_monitor/test/test_diagnostics.cpp b/localization/autoware_localization_error_monitor/test/test_diagnostics.cpp similarity index 73% rename from localization/localization_error_monitor/test/test_diagnostics.cpp rename to localization/autoware_localization_error_monitor/test/test_diagnostics.cpp index 12515687e7a98..1cc5640d78290 100644 --- a/localization/localization_error_monitor/test/test_diagnostics.cpp +++ b/localization/autoware_localization_error_monitor/test/test_diagnostics.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "localization_error_monitor/diagnostics.hpp" +#include "diagnostics.hpp" #include @@ -24,23 +24,28 @@ TEST(TestLocalizationErrorMonitorDiagnostics, CheckLocalizationAccuracy) const double error_ellipse_size = 1.0; double ellipse_size = 0.0; - stat = check_localization_accuracy(ellipse_size, warn_ellipse_size, error_ellipse_size); + stat = autoware::localization_error_monitor::check_localization_accuracy( + ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::OK); ellipse_size = 0.7; - stat = check_localization_accuracy(ellipse_size, warn_ellipse_size, error_ellipse_size); + stat = autoware::localization_error_monitor::check_localization_accuracy( + ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::OK); ellipse_size = 0.8; - stat = check_localization_accuracy(ellipse_size, warn_ellipse_size, error_ellipse_size); + stat = autoware::localization_error_monitor::check_localization_accuracy( + ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); ellipse_size = 0.9; - stat = check_localization_accuracy(ellipse_size, warn_ellipse_size, error_ellipse_size); + stat = autoware::localization_error_monitor::check_localization_accuracy( + ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); ellipse_size = 1.0; - stat = check_localization_accuracy(ellipse_size, warn_ellipse_size, error_ellipse_size); + stat = autoware::localization_error_monitor::check_localization_accuracy( + ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::ERROR); } @@ -52,27 +57,27 @@ TEST(TestLocalizationErrorMonitorDiagnostics, CheckLocalizationAccuracyLateralDi const double error_ellipse_size = 0.3; double ellipse_size = 0.0; - stat = check_localization_accuracy_lateral_direction( + stat = autoware::localization_error_monitor::check_localization_accuracy_lateral_direction( ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::OK); ellipse_size = 0.24; - stat = check_localization_accuracy_lateral_direction( + stat = autoware::localization_error_monitor::check_localization_accuracy_lateral_direction( ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::OK); ellipse_size = 0.25; - stat = check_localization_accuracy_lateral_direction( + stat = autoware::localization_error_monitor::check_localization_accuracy_lateral_direction( ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); ellipse_size = 0.29; - stat = check_localization_accuracy_lateral_direction( + stat = autoware::localization_error_monitor::check_localization_accuracy_lateral_direction( ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); ellipse_size = 0.3; - stat = check_localization_accuracy_lateral_direction( + stat = autoware::localization_error_monitor::check_localization_accuracy_lateral_direction( ellipse_size, warn_ellipse_size, error_ellipse_size); EXPECT_EQ(stat.level, diagnostic_msgs::msg::DiagnosticStatus::ERROR); } @@ -86,7 +91,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "OK"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::OK; stat_array.at(1).message = "OK"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::OK); EXPECT_EQ(merged_stat.message, "OK"); @@ -94,7 +99,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "WARN0"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::OK; stat_array.at(1).message = "OK"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); EXPECT_EQ(merged_stat.message, "WARN0"); @@ -102,7 +107,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "OK"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::WARN; stat_array.at(1).message = "WARN1"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); EXPECT_EQ(merged_stat.message, "WARN1"); @@ -110,7 +115,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "WARN0"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::WARN; stat_array.at(1).message = "WARN1"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::WARN); EXPECT_EQ(merged_stat.message, "WARN0; WARN1"); @@ -118,7 +123,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "OK"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::ERROR; stat_array.at(1).message = "ERROR1"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::ERROR); EXPECT_EQ(merged_stat.message, "ERROR1"); @@ -126,7 +131,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "WARN0"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::ERROR; stat_array.at(1).message = "ERROR1"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::ERROR); EXPECT_EQ(merged_stat.message, "WARN0; ERROR1"); @@ -134,7 +139,7 @@ TEST(TestLocalizationErrorMonitorDiagnostics, MergeDiagnosticStatus) stat_array.at(0).message = "ERROR0"; stat_array.at(1).level = diagnostic_msgs::msg::DiagnosticStatus::ERROR; stat_array.at(1).message = "ERROR1"; - merged_stat = merge_diagnostic_status(stat_array); + merged_stat = autoware::localization_error_monitor::merge_diagnostic_status(stat_array); EXPECT_EQ(merged_stat.level, diagnostic_msgs::msg::DiagnosticStatus::ERROR); EXPECT_EQ(merged_stat.message, "ERROR0; ERROR1"); } diff --git a/localization/localization_error_monitor/launch/localization_error_monitor.launch.xml b/localization/localization_error_monitor/launch/localization_error_monitor.launch.xml deleted file mode 100644 index ad3e8beff92ab..0000000000000 --- a/localization/localization_error_monitor/launch/localization_error_monitor.launch.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -