From 66edca24d3028a10fe4eae95008f80538f14d0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Fatih=20C=C4=B1r=C4=B1t?= Date: Mon, 19 Jun 2023 14:36:11 +0300 Subject: [PATCH] use slash instead, fix test name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: M. Fatih Cırıt Signed-off-by: M. Fatih Cırıt --- simulator/autoware_auto_msgs_adapter/README.md | 4 ++-- .../config/adapter_control.param.yaml | 2 +- .../src/autoware_auto_msgs_adapter_core.cpp | 2 +- ...rol_command.cpp => test_msg_ackermann_control_command.cpp} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename simulator/autoware_auto_msgs_adapter/test/{test_msg_ackerman_control_command.cpp => test_msg_ackermann_control_command.cpp} (99%) diff --git a/simulator/autoware_auto_msgs_adapter/README.md b/simulator/autoware_auto_msgs_adapter/README.md index fb996ee91aab5..26fadf6cd0b93 100644 --- a/simulator/autoware_auto_msgs_adapter/README.md +++ b/simulator/autoware_auto_msgs_adapter/README.md @@ -27,7 +27,7 @@ in the `autoware_auto_msgs_adapter/config` directory. Example configuration: ```yaml /**: ros__parameters: - msg_type_target: "autoware_auto_control_msgs::msg::AckermannControlCommand" + msg_type_target: "autoware_auto_control_msgs/msg/AckermannControlCommand" topic_name_source: "/control/command/control_cmd" topic_name_target: "/control/command/control_cmd_auto" ``` @@ -86,7 +86,7 @@ To add a new message pair, - Create a new config file by replicating and editing: - [adapter_control.param.yaml](config/adapter_control.param.yaml) - Add a new test file by replicating and editing: - - [test_msg_ackerman_control_command.cpp](test/test_msg_ackerman_control_command.cpp) + - [test_msg_ackermann_control_command.cpp](test/test_msg_ackermann_control_command.cpp) - No need to edit the `CMakeLists.txt` file as it will automatically detect the new test file. Also make sure to test the new adapter with: diff --git a/simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml b/simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml index 614826f148d46..4c6d5f101f380 100644 --- a/simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml +++ b/simulator/autoware_auto_msgs_adapter/config/adapter_control.param.yaml @@ -1,5 +1,5 @@ /**: ros__parameters: - msg_type_target: "autoware_auto_control_msgs::msg::AckermannControlCommand" + msg_type_target: "autoware_auto_control_msgs/msg/AckermannControlCommand" topic_name_source: "/control/command/control_cmd" topic_name_target: "/control/command/control_cmd_auto" diff --git a/simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp b/simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp index e4b0f94455a52..70a48965e8715 100644 --- a/simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp +++ b/simulator/autoware_auto_msgs_adapter/src/autoware_auto_msgs_adapter_core.cpp @@ -31,7 +31,7 @@ AutowareAutoMsgsAdapterNode::AutowareAutoMsgsAdapterNode(const rclcpp::NodeOptio const std::string topic_name_source = declare_parameter("topic_name_source"); const std::string topic_name_target = declare_parameter("topic_name_target"); - if (msg_type_target == "autoware_auto_control_msgs::msg::AckermannControlCommand") { + if (msg_type_target == "autoware_auto_control_msgs/msg/AckermannControlCommand") { AdapterControl::SharedPtr adapter = std::make_shared(*this, topic_name_source, topic_name_target); adapter_ = std::static_pointer_cast(adapter); diff --git a/simulator/autoware_auto_msgs_adapter/test/test_msg_ackerman_control_command.cpp b/simulator/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp similarity index 99% rename from simulator/autoware_auto_msgs_adapter/test/test_msg_ackerman_control_command.cpp rename to simulator/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp index e824e3a39d97c..e33ae07e6aca1 100644 --- a/simulator/autoware_auto_msgs_adapter/test/test_msg_ackerman_control_command.cpp +++ b/simulator/autoware_auto_msgs_adapter/test/test_msg_ackermann_control_command.cpp @@ -45,7 +45,7 @@ autoware_control_msgs::msg::Control generate_control_msg() TEST(AutowareAutoMsgsAdapter, TestMsgAckermannControlCommand) // NOLINT for gtest { - const std::string msg_type_target = "autoware_auto_control_msgs::msg::AckermannControlCommand"; + const std::string msg_type_target = "autoware_auto_control_msgs/msg/AckermannControlCommand"; const std::string topic_name_source = "topic_name_source"; const std::string topic_name_target = "topic_name_target";