Skip to content

Commit 3671ab3

Browse files
shulanbushangshuxmfcx
authored andcommitted
rebase commom tools
Signed-off-by: jack.song <jack.song@autocore.ai>
1 parent d288276 commit 3671ab3

File tree

3 files changed

+36
-27
lines changed

3 files changed

+36
-27
lines changed

common/autoware_component_interface_tools/CMakeLists.txt

+11-13
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,20 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
88
src/service_log_checker.cpp
99
)
1010

11-
if(BUILD_TESTING)
12-
ament_add_ros_isolated_gtest(test_service_log_checker
13-
test/test_service_log_checker.cpp
14-
)
15-
16-
ament_target_dependencies(test_service_log_checker
17-
tier4_system_msgs
18-
yaml_cpp_vendor
19-
diagnostic_updater
20-
)
21-
target_include_directories(test_service_log_checker PRIVATE src)
22-
endif()
23-
2411
rclcpp_components_register_node(${PROJECT_NAME}
2512
PLUGIN "autoware::component_interface_tools::ServiceLogChecker"
2613
EXECUTABLE service_log_checker_node
2714
)
2815

16+
17+
if(BUILD_TESTING)
18+
ament_add_ros_isolated_gtest(test_${PROJECT_NAME}
19+
test/test_autoware_component_interface_tools.cpp
20+
)
21+
target_link_libraries(test_${PROJECT_NAME}
22+
${PROJECT_NAME}
23+
)
24+
target_include_directories(test_${PROJECT_NAME} PRIVATE src)
25+
endif()
26+
2927
ament_auto_package(INSTALL_TO_SHARE launch)

common/autoware_component_interface_tools/package.xml

+9
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,20 @@
1919
<depend>yaml_cpp_vendor</depend>
2020

2121
<test_depend>ament_cmake_ros</test_depend>
22+
<test_depend>rclcpp_components</test_depend>
23+
<test_depend>rclcpp</test_depend>
2224
<test_depend>ament_lint_auto</test_depend>
25+
<test_depend>autoware_test_utils</test_depend>
2326
<test_depend>autoware_lint_common</test_depend>
2427
<test_depend>tier4_system_msgs</test_depend>
2528
<test_depend>yaml_cpp_vendor</test_depend>
2629
<test_depend>diagnostic_updater</test_depend>
30+
<test_depend>autoware_testing</test_depend>
31+
<test_depend>ament_index_python</test_depend>
32+
<test_depend>fake_test_node</test_depend>
33+
<test_depend>ament_cmake_gtest</test_depend>
34+
35+
2736

2837
<export>
2938
<build_type>ament_cmake</build_type>

common/autoware_component_interface_tools/test/test_service_log_checker.cpp common/autoware_component_interface_tools/test/test_autoware_component_interface_tools.cpp

+16-14
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,23 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
15-
#include "gtest/gtest.h"
14+
#include <gtest/gtest.h>
15+
1616
#include "service_log_checker.hpp"
17-
17+
#include <rclcpp/node_options.hpp>
1818
#include <yaml-cpp/yaml.h>
19-
19+
#include <ament_index_cpp/get_package_share_directory.hpp>
20+
#include <rclcpp_components/register_node_macro.hpp>
2021
#include <memory>
2122
#include <string>
23+
using ServiceLog = tier4_system_msgs::msg::ServiceLog;
24+
using DiagnosticArray = diagnostic_msgs::msg::DiagnosticArray;
25+
using ServiceLogChecker = autoware::component_interface_tools::ServiceLogChecker;
26+
using namespace rclcpp;
2227

23-
TEST(service, checker)
28+
TEST(ServiceCheckerTest, ServiceChecker)
2429
{
25-
{
26-
using ServiceLog = tier4_system_msgs::msg::ServiceLog;
27-
using DiagnosticArray = diagnostic_msgs::msg::DiagnosticArray;
28-
30+
2931
class PubManager : public rclcpp::Node
3032
{
3133
public:
@@ -47,11 +49,11 @@ TEST(service, checker)
4749
}
4850
}
4951
};
52+
53+
rclcpp::init(0, nullptr);
5054
auto node_options = rclcpp::NodeOptions{};
51-
std::shared_ptr<ServiceLogChecker> checker;
52-
checker = std::make_shared<ServiceLogChecker>(node_options);
53-
54-
auto test_log = std::make_shared<PubManager>();
55+
auto test_target_node = std::make_shared<ServiceLogChecker>(node_options);
56+
auto test_log = std::make_shared<PubManager>();
5557
ServiceLog log;
5658
log.type = 6;
5759
log.name = "test";
@@ -60,5 +62,5 @@ TEST(service, checker)
6062

6163
while (!test_log->flag) {
6264
}
63-
}
65+
6466
}

0 commit comments

Comments
 (0)