Skip to content

Commit 919f55c

Browse files
audrowaudrow
authored
Remove ros2interface test dependencies on builtin interface (#579)
* Update tests to avoid using buildin_interfaces Signed-off-by: Audrow <[email protected]> * Create ros2cli_test_msgs package with interfaces Signed-off-by: Audrow Nash <[email protected]> * Update ros2interface show to use ros2cli_test_msgs Signed-off-by: Audrow Nash <[email protected]> * List ros2cli_test_msgs as a test dependency of ros2cli Signed-off-by: Audrow Nash <[email protected]> * Change ros2cli_test_msgs to ros2cli_test_interfaces Signed-off-by: Audrow Nash <[email protected]> * Correct test interfaces dependency in package.xml Signed-off-by: Audrow Nash <[email protected]> * Remove ros2cli_test_interfaces from ros2cli test dependencies Signed-off-by: Audrow Nash <[email protected]>
1 parent 6d9f769 commit 919f55c

File tree

9 files changed

+195
-380
lines changed

9 files changed

+195
-380
lines changed

‎ros2cli_test_interfaces/CMakeLists.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cmake_minimum_required(VERSION 3.5)
2+
project(ros2cli_test_interfaces)
3+
4+
# Default to C++14
5+
if(NOT CMAKE_CXX_STANDARD)
6+
set(CMAKE_CXX_STANDARD 14)
7+
endif()
8+
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
9+
add_compile_options(-Wall -Wextra -Wpedantic)
10+
endif()
11+
12+
find_package(ament_cmake REQUIRED)
13+
find_package(rosidl_default_generators REQUIRED)
14+
15+
rosidl_generate_interfaces(${PROJECT_NAME}
16+
"action/ShortVariedMultiNested.action"
17+
"msg/ShortVaried.msg"
18+
"msg/ShortVariedMultiNested.msg"
19+
"msg/ShortVariedNested.msg"
20+
"srv/ShortVariedMultiNested.srv"
21+
ADD_LINTER_TESTS
22+
)
23+
24+
ament_export_dependencies(rosidl_default_runtime)
25+
26+
ament_package()

‎ros2cli_test_interfaces/action/ShortVariedMultiNested.action‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Goal definition
2+
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
3+
---
4+
# Result definition
5+
bool bool_value # Comment - Nesting Level 3: 2 of 2
6+
---
7+
# Feedback definition
8+
bool[3] bool_values

‎ros2cli_test_interfaces/msg/ShortVaried.msg‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# A constant
2+
bool BOOL_CONST=true # Comment - Nesting Level 1: 1 of 2
3+
4+
# Bool and array of bools
5+
bool bool_value
6+
bool[<=3] bool_values # Comment - Nesting Level 1: 2 of 2
7+
8+
# Trailing comment

‎ros2cli_test_interfaces/msg/ShortVariedMultiNested.msg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# A short, varied, and nested type
2+
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 1
3+
# Trailing comment

‎ros2cli_test_interfaces/msg/ShortVariedNested.msg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# A short, varied type
2+
ShortVaried short_varied # Comment - Nesting Level 2: 1 of 1
3+
# Trailing comment

‎ros2cli_test_interfaces/package.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
3+
<package format="3">
4+
<name>ros2cli_test_interfaces</name>
5+
<version>1.0.1</version>
6+
<description>A package containing interface definitions for testing ros2cli.</description>
7+
<maintainer email="[email protected]">Claire Wang</maintainer>
8+
<maintainer email="[email protected]">Mabel Zhang</maintainer>
9+
<license>Apache License 2.0</license>
10+
<author email="[email protected]">Audrow Nash</author>
11+
12+
<buildtool_depend>ament_cmake</buildtool_depend>
13+
14+
<buildtool_depend>rosidl_default_generators</buildtool_depend>
15+
16+
<depend>action_msgs</depend>
17+
18+
<exec_depend>rosidl_default_runtime</exec_depend>
19+
20+
<test_depend>ament_lint_common</test_depend>
21+
22+
<member_of_group>rosidl_interface_packages</member_of_group>
23+
24+
<export>
25+
<build_type>ament_cmake</build_type>
26+
</export>
27+
</package>

‎ros2cli_test_interfaces/srv/ShortVariedMultiNested.srv‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Request
2+
ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
3+
---
4+
# Response
5+
bool bool_value # Comment - Nesting Level 3: 2 of 2

‎ros2interface/package.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<test_depend>ament_xmllint</test_depend>
2525
<test_depend>python3-pytest</test_depend>
2626
<test_depend>ros_testing</test_depend>
27+
<test_depend>ros2cli_test_interfaces</test_depend>
2728
<test_depend>test_msgs</test_depend>
2829

2930
<export>

0 commit comments

Comments
 (0)