Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 273653d

Browse files
committedNov 6, 2024
refactor(fake_test_node): prefix package and namespace with autoware
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent d0ed04e commit 273653d

File tree

12 files changed

+15
-32
lines changed

12 files changed

+15
-32
lines changed
 

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ common/autoware_ad_api_specs/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.j
33
common/autoware_auto_common/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
44
common/autoware_component_interface_specs/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp
55
common/autoware_component_interface_tools/** isamu.takagi@tier4.jp
6+
common/autoware_fake_test_node/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
67
common/autoware_geography_utils/** koji.minoda@tier4.jp
78
common/autoware_goal_distance_calculator/** taiki.tanaka@tier4.jp
89
common/autoware_grid_map_utils/** maxime.clement@tier4.jp
@@ -26,7 +27,6 @@ common/autoware_universe_utils/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp
2627
common/autoware_vehicle_info_utils/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
2728
common/bag_time_manager_rviz_plugin/** taiki.tanaka@tier4.jp
2829
common/component_interface_utils/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp
29-
common/fake_test_node/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
3030
common/global_parameter_loader/** ryohsuke.mitsudome@tier4.jp
3131
common/glog_component/** takamasa.horibe@tier4.jp
3232
common/tier4_adapi_rviz_plugin/** hiroki.ota@tier4.jp isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(fake_test_node)
2+
project(autoware_fake_test_node)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
66

7-
ament_auto_add_library(fake_test_node SHARED src/fake_test_node.cpp)
7+
ament_auto_add_library(${PROJECT_NAME} SHARED src/fake_test_node.cpp)
88

99
if(BUILD_TESTING)
1010
ament_add_ros_isolated_gtest(test_fake_test_node
1111
test/test_fake_test_node.cpp
1212
)
13-
add_dependencies(test_fake_test_node fake_test_node)
14-
target_link_libraries(test_fake_test_node fake_test_node)
13+
add_dependencies(test_fake_test_node ${PROJECT_NAME})
14+
target_link_libraries(test_fake_test_node ${PROJECT_NAME})
1515
endif()
1616

1717
ament_auto_package()

‎common/fake_test_node/include/fake_test_node/fake_test_node.hpp ‎common/autoware_fake_test_node/include/fake_test_node/fake_test_node.hpp

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
2121
#define FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
2222

23-
#include <fake_test_node/visibility_control.hpp>
23+
#include <autoware/fake_test_node/visibility_control.hpp>
2424
#include <rclcpp/rclcpp.hpp>
2525

2626
#include <gtest/gtest.h>
@@ -30,11 +30,7 @@
3030
#include <string>
3131
#include <type_traits>
3232

33-
namespace autoware
34-
{
35-
namespace tools
36-
{
37-
namespace testing
33+
namespace autoware::fake_test_node
3834
{
3935

4036
///
@@ -237,8 +233,6 @@ class FAKE_TEST_NODE_PUBLIC FakeTestNode : public detail::FakeNodeCore, public :
237233
void TearDown() override;
238234
};
239235

240-
} // namespace testing
241-
} // namespace tools
242-
} // namespace autoware
236+
} // namespace autoware::fake_test_node
243237

244238
#endif // FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_

‎common/fake_test_node/package.xml ‎common/autoware_fake_test_node/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>fake_test_node</name>
4+
<name>autoware_fake_test_node</name>
55
<version>1.0.0</version>
66
<description>A fake node that we can use in the integration-like cpp tests.</description>
77
<maintainer email="opensource@apex.ai">Apex.AI, Inc.</maintainer>

‎common/fake_test_node/src/fake_test_node.cpp ‎common/autoware_fake_test_node/src/fake_test_node.cpp

+2-13
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <memory>
2323
#include <string>
2424

25-
namespace
25+
namespace autoware::fake_test_node
2626
{
2727
constexpr auto kSpinThread = false;
2828
constexpr auto kArgc = 0;
@@ -34,15 +34,6 @@ std::string sanitize_test_name(const std::string & name)
3434
return sanitize_test_name;
3535
}
3636

37-
} // namespace
38-
39-
namespace autoware
40-
{
41-
namespace tools
42-
{
43-
namespace testing
44-
{
45-
4637
void detail::FakeNodeCore::set_up(const std::string & test_name)
4738
{
4839
ASSERT_FALSE(rclcpp::ok());
@@ -76,6 +67,4 @@ void FakeTestNode::TearDown()
7667
tear_down();
7768
}
7869

79-
} // namespace testing
80-
} // namespace tools
81-
} // namespace autoware
70+
} // namespace autoware::fake_test_node

‎control/autoware_trajectory_follower_node/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
<test_depend>ament_cmake_ros</test_depend>
4040
<test_depend>ament_index_python</test_depend>
4141
<test_depend>ament_lint_auto</test_depend>
42+
<test_depend>autoware_fake_test_node</test_depend>
4243
<test_depend>autoware_lint_common</test_depend>
4344
<test_depend>autoware_testing</test_depend>
44-
<test_depend>fake_test_node</test_depend>
4545
<test_depend>ros_testing</test_depend>
4646

4747
<export>

‎planning/autoware_path_optimizer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<test_depend>ament_lint_auto</test_depend>
3737
<test_depend>autoware_lint_common</test_depend>
3838
<test_depend>autoware_testing</test_depend>
39-
<test_depend>fake_test_node</test_depend>
39+
<test_depend>autoware_fake_test_node</test_depend>
4040

4141
<export>
4242
<build_type>ament_cmake</build_type>

‎planning/autoware_path_smoother/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<test_depend>ament_lint_auto</test_depend>
3434
<test_depend>autoware_lint_common</test_depend>
3535
<test_depend>autoware_testing</test_depend>
36-
<test_depend>fake_test_node</test_depend>
36+
<test_depend>autoware_fake_test_node</test_depend>
3737

3838
<export>
3939
<build_type>ament_cmake</build_type>

‎planning/sampling_based_planner/autoware_path_sampler/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<test_depend>ament_lint_auto</test_depend>
3737
<test_depend>autoware_lint_common</test_depend>
3838
<test_depend>autoware_testing</test_depend>
39-
<test_depend>fake_test_node</test_depend>
39+
<test_depend>autoware_fake_test_node</test_depend>
4040

4141
<export>
4242
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)
Please sign in to comment.