Skip to content

Commit a59d309

Browse files
authored
refactor(fake_test_node): prefix package and namespace with autoware (#9249)
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent b4603fd commit a59d309

File tree

17 files changed

+35
-52
lines changed

17 files changed

+35
-52
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ common/autoware_adapi_specs/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.jp
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
@@ -27,7 +28,6 @@ common/autoware_universe_utils/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp
2728
common/autoware_vehicle_info_utils/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
2829
common/bag_time_manager_rviz_plugin/** taiki.tanaka@tier4.jp
2930
common/component_interface_utils/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp
30-
common/fake_test_node/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp
3131
common/global_parameter_loader/** ryohsuke.mitsudome@tier4.jp
3232
common/glog_component/** takamasa.horibe@tier4.jp
3333
common/tier4_adapi_rviz_plugin/** hiroki.ota@tier4.jp isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp

common/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ nav:
22
- 'Introduction': common
33
- 'Testing Libraries':
44
- 'autoware_testing': common/autoware_testing/design/autoware_testing-design
5-
- 'fake_test_node': common/fake_test_node/design/fake_test_node-design
5+
- 'autoware_fake_test_node': common/autoware_fake_test_node/design/fake_test_node-design
66
- 'Test Utils': common/autoware_test_utils
77
- 'Common Libraries':
88
- 'autoware_auto_common':
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/design/fake_test_node-design.md common/autoware_fake_test_node/design/fake_test_node-design.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ fixture.
1010
This package contains a library that introduces two utility classes that can be used in place of
1111
custom fixtures described above to write integration tests for a node:
1212

13-
- `autoware::tools::testing::FakeTestNode` - to use as a custom test fixture with `TEST_F` tests
14-
- `autoware::tools::testing::FakeTestNodeParametrized` - to use a custom test fixture with the
13+
- `autoware::fake_test_node::FakeTestNode` - to use as a custom test fixture with `TEST_F` tests
14+
- `autoware::fake_test_node::FakeTestNodeParametrized` - to use a custom test fixture with the
1515
parametrized `TEST_P` tests (accepts a template parameter that gets forwarded to
1616
`testing::TestWithParam<T>`)
1717

@@ -30,10 +30,10 @@ Let's say there is a node `NodeUnderTest` that requires testing. It just
3030
subscribes to `std_msgs::msg::Int32` messages and publishes a
3131
`std_msgs::msg::Bool` to indicate that the input is positive. To test such a
3232
node the following code can be used utilizing the
33-
`autoware::tools::testing::FakeTestNode`:
33+
`autoware::fake_test_node::FakeTestNode`:
3434

3535
```cpp
36-
using FakeNodeFixture = autoware::tools::testing::FakeTestNode;
36+
using FakeNodeFixture = autoware::fake_test_node::FakeTestNode;
3737

3838
/// @test Test that we can use a non-parametrized test.
3939
TEST_F(FakeNodeFixture, Test) {

common/fake_test_node/include/fake_test_node/fake_test_node.hpp common/autoware_fake_test_node/include/autoware/fake_test_node/fake_test_node.hpp

+6-12
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
/// \copyright Copyright 2021 Apex.AI, Inc.
1818
/// All rights reserved.
1919

20-
#ifndef FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
21-
#define FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
20+
#ifndef AUTOWARE__FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
21+
#define AUTOWARE__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

244-
#endif // FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_
238+
#endif // AUTOWARE__FAKE_TEST_NODE__FAKE_TEST_NODE_HPP_

common/fake_test_node/include/fake_test_node/visibility_control.hpp common/autoware_fake_test_node/include/autoware/fake_test_node/visibility_control.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
/// \copyright Copyright 2021 Apex.AI, Inc.
1818
/// All rights reserved.
1919

20-
#ifndef FAKE_TEST_NODE__VISIBILITY_CONTROL_HPP_
21-
#define FAKE_TEST_NODE__VISIBILITY_CONTROL_HPP_
20+
#ifndef AUTOWARE__FAKE_TEST_NODE__VISIBILITY_CONTROL_HPP_
21+
#define AUTOWARE__FAKE_TEST_NODE__VISIBILITY_CONTROL_HPP_
2222

2323
////////////////////////////////////////////////////////////////////////////////
2424
#if defined(__WIN32)
@@ -39,4 +39,4 @@
3939
#error "Unsupported Build Configuration"
4040
#endif // defined(__WIN32)
4141

42-
#endif // FAKE_TEST_NODE__VISIBILITY_CONTROL_HPP_
42+
#endif // AUTOWARE__FAKE_TEST_NODE__VISIBILITY_CONTROL_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>0.38.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

+3-14
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
/// \copyright Copyright 2021 Apex.AI, Inc.
1818
/// All rights reserved.
1919

20-
#include <fake_test_node/fake_test_node.hpp>
20+
#include <autoware/fake_test_node/fake_test_node.hpp>
2121

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

common/fake_test_node/test/test_fake_test_node.cpp common/autoware_fake_test_node/test/test_fake_test_node.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/// \copyright Copyright 2021 Apex.AI, Inc.
1818
/// All rights reserved.
1919

20-
#include <fake_test_node/fake_test_node.hpp>
20+
#include <autoware/fake_test_node/fake_test_node.hpp>
2121

2222
#include <std_msgs/msg/bool.hpp>
2323
#include <std_msgs/msg/int32.hpp>
@@ -30,8 +30,8 @@
3030

3131
using bool8_t = bool;
3232

33-
using FakeNodeFixture = autoware::tools::testing::FakeTestNode;
34-
using FakeNodeFixtureParametrized = autoware::tools::testing::FakeTestNodeParametrized<bool8_t>;
33+
using FakeNodeFixture = autoware::fake_test_node::FakeTestNode;
34+
using FakeNodeFixtureParametrized = autoware::fake_test_node::FakeTestNodeParametrized<bool8_t>;
3535
using std_msgs::msg::Bool;
3636
using std_msgs::msg::Int32;
3737

control/autoware_trajectory_follower_node/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(BUILD_TESTING)
3333
test/trajectory_follower_test_utils.hpp
3434
test/test_controller_node.cpp
3535
)
36-
ament_target_dependencies(${TRAJECTORY_FOLLOWER_NODES_TEST} fake_test_node)
36+
ament_target_dependencies(${TRAJECTORY_FOLLOWER_NODES_TEST} autoware_fake_test_node)
3737
target_link_libraries(
3838
${TRAJECTORY_FOLLOWER_NODES_TEST} ${CONTROLLER_NODE})
3939

control/autoware_trajectory_follower_node/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
<test_depend>ament_index_cpp</test_depend>
4141
<test_depend>ament_index_python</test_depend>
4242
<test_depend>ament_lint_auto</test_depend>
43+
<test_depend>autoware_fake_test_node</test_depend>
4344
<test_depend>autoware_lint_common</test_depend>
4445
<test_depend>autoware_testing</test_depend>
45-
<test_depend>fake_test_node</test_depend>
4646
<test_depend>ros_testing</test_depend>
4747

4848
<export>

control/autoware_trajectory_follower_node/test/test_controller_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
// limitations under the License.
1414

1515
#include "ament_index_cpp/get_package_share_directory.hpp"
16+
#include "autoware/fake_test_node/fake_test_node.hpp"
1617
#include "autoware/trajectory_follower_node/controller_node.hpp"
17-
#include "fake_test_node/fake_test_node.hpp"
1818
#include "gtest/gtest.h"
1919
#include "rclcpp/rclcpp.hpp"
2020
#include "rclcpp/time.hpp"
@@ -42,7 +42,7 @@ using SteeringReport = autoware_vehicle_msgs::msg::SteeringReport;
4242
using autoware_adapi_v1_msgs::msg::OperationModeState;
4343
using geometry_msgs::msg::AccelWithCovarianceStamped;
4444

45-
using FakeNodeFixture = autoware::tools::testing::FakeTestNode;
45+
using FakeNodeFixture = autoware::fake_test_node::FakeTestNode;
4646

4747
const rclcpp::Duration one_second(1, 0);
4848

control/autoware_trajectory_follower_node/test/trajectory_follower_test_utils.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef TRAJECTORY_FOLLOWER_TEST_UTILS_HPP_
1616
#define TRAJECTORY_FOLLOWER_TEST_UTILS_HPP_
1717

18-
#include "fake_test_node/fake_test_node.hpp"
18+
#include "autoware/fake_test_node/fake_test_node.hpp"
1919
#include "rclcpp/rclcpp.hpp"
2020
#include "rclcpp/time.hpp"
2121
#include "tf2_ros/static_transform_broadcaster.h"
@@ -27,7 +27,7 @@
2727

2828
namespace test_utils
2929
{
30-
using FakeNodeFixture = autoware::tools::testing::FakeTestNode;
30+
using FakeNodeFixture = autoware::fake_test_node::FakeTestNode;
3131

3232
inline void waitForMessage(
3333
const std::shared_ptr<rclcpp::Node> & node, FakeNodeFixture * fixture, const bool & received_flag,

planning/autoware_path_optimizer/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<test_depend>ament_cmake_ros</test_depend>
3535
<test_depend>ament_index_python</test_depend>
3636
<test_depend>ament_lint_auto</test_depend>
37+
<test_depend>autoware_fake_test_node</test_depend>
3738
<test_depend>autoware_lint_common</test_depend>
3839
<test_depend>autoware_testing</test_depend>
39-
<test_depend>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
@@ -31,9 +31,9 @@
3131
<test_depend>ament_cmake_ros</test_depend>
3232
<test_depend>ament_index_python</test_depend>
3333
<test_depend>ament_lint_auto</test_depend>
34+
<test_depend>autoware_fake_test_node</test_depend>
3435
<test_depend>autoware_lint_common</test_depend>
3536
<test_depend>autoware_testing</test_depend>
36-
<test_depend>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
@@ -34,9 +34,9 @@
3434
<test_depend>ament_cmake_ros</test_depend>
3535
<test_depend>ament_index_python</test_depend>
3636
<test_depend>ament_lint_auto</test_depend>
37+
<test_depend>autoware_fake_test_node</test_depend>
3738
<test_depend>autoware_lint_common</test_depend>
3839
<test_depend>autoware_testing</test_depend>
39-
<test_depend>fake_test_node</test_depend>
4040

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

0 commit comments

Comments
 (0)