Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions joint_state_topic_hardware_interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ install(

if(BUILD_TESTING)
find_package(ament_cmake_gmock REQUIRED)
find_package(ament_cmake_pytest REQUIRED)
find_package(ros2_control_test_assets REQUIRED)
find_package(ros_testing REQUIRED)

ament_add_gmock(joint_state_topic_hardware_interface_test test/joint_state_topic_hardware_interface_test.cpp)
target_link_libraries(joint_state_topic_hardware_interface_test
Expand All @@ -73,13 +71,22 @@ if(BUILD_TESTING)
ros2_control_test_assets::ros2_control_test_assets)

# Integration tests
# TODO(anyone): reactivate if https://github.com/ros-controls/topic_based_hardware_interfaces/issues/21 is fixed
# add_ros_test(
# test/ros2_control.test.py
# TIMEOUT
# 120
# ARGS
# test_file:=${CMAKE_CURRENT_SOURCE_DIR}/test/test_topic_based_robot.py)
find_package(ament_cmake_ros REQUIRED)
find_package(launch_testing_ament_cmake REQUIRED)
find_package(rclcpp_action REQUIRED)
find_package(control_msgs REQUIRED)
add_executable(jtc_client_position test/rrr/jtc_client_position.cpp)
target_link_libraries(jtc_client_position PUBLIC
${control_msgs_TARGETS}
rclcpp::rclcpp
rclcpp_action::rclcpp_action
)
function(add_ros_isolated_launch_test path)
set(RUNNER "${ament_cmake_ros_DIR}/run_test_isolated.py")
add_launch_test("${path}" RUNNER "${RUNNER}" ${ARGN})
endfunction()
add_ros_isolated_launch_test(
test/rrr/position.test.py)
endif()

pluginlib_export_plugin_description_file(hardware_interface joint_state_topic_hardware_interface_plugin_description.xml)
Expand Down
7 changes: 5 additions & 2 deletions joint_state_topic_hardware_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,19 @@
<depend>sensor_msgs</depend>

<test_depend>ament_cmake_gmock</test_depend>
<test_depend>ament_cmake_ros</test_depend>
<test_depend>control_msgs</test_depend>
<test_depend>controller_manager</test_depend>
<test_depend>joint_state_broadcaster</test_depend>
<test_depend>joint_trajectory_controller</test_depend>
<test_depend>launch</test_depend>
<test_depend>launch_ros</test_depend>
<test_depend>launch_testing_ament_cmake</test_depend>
<test_depend>launch_testing</test_depend>
<test_depend>launch</test_depend>
<test_depend>rclpy</test_depend>
<test_depend>robot_state_publisher</test_depend>
<test_depend>ros2_control_test_assets</test_depend>
<test_depend>ros_testing</test_depend>
<test_depend>topic_tools</test_depend>
<test_depend>xacro</test_depend>

<export>
Expand Down

This file was deleted.

76 changes: 0 additions & 76 deletions joint_state_topic_hardware_interface/test/ros2_control.test.py

This file was deleted.

Loading
Loading