Remove ros2interface test dependencies on builtin interface (#579)

* Update tests to avoid using buildin_interfaces Signed-off-by: Audrow <audrow.nash@gmail.com> * Create ros2cli_test_msgs package with interfaces Signed-off-by: Audrow Nash <audrow.nash@gmail.com> * Update ros2interface show to use ros2cli_test_msgs Signed-off-by: Audrow Nash <audrow.nash@gmail.com> * List ros2cli_test_msgs as a test dependency of ros2cli Signed-off-by: Audrow Nash <audrow.nash@gmail.com> * Change ros2cli_test_msgs to ros2cli_test_interfaces Signed-off-by: Audrow Nash <audrow.nash@gmail.com> * Correct test interfaces dependency in package.xml Signed-off-by: Audrow Nash <audrow.nash@gmail.com> * Remove ros2cli_test_interfaces from ros2cli test dependencies Signed-off-by: Audrow Nash <audrow.nash@gmail.com>
ros2 · Jan 20, 2021 · 919f55c · 919f55c
1 parent 6d9f769
commit 919f55c
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 380 deletions.
diff --git a/ros2cli_test_interfaces/CMakeLists.txt b/ros2cli_test_interfaces/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.5)
+project(ros2cli_test_interfaces)
+
+# Default to C++14
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
+find_package(ament_cmake REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+
+rosidl_generate_interfaces(${PROJECT_NAME}
+  "action/ShortVariedMultiNested.action"
+  "msg/ShortVaried.msg"
+  "msg/ShortVariedMultiNested.msg"
+  "msg/ShortVariedNested.msg"
+  "srv/ShortVariedMultiNested.srv"
+  ADD_LINTER_TESTS
+)
+
+ament_export_dependencies(rosidl_default_runtime)
+
+ament_package()
diff --git a/ros2cli_test_interfaces/action/ShortVariedMultiNested.action b/ros2cli_test_interfaces/action/ShortVariedMultiNested.action
@@ -0,0 +1,8 @@
+# Goal definition
+ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
+---
+# Result definition
+bool bool_value # Comment - Nesting Level 3: 2 of 2
+---
+# Feedback definition
+bool[3] bool_values
diff --git a/ros2cli_test_interfaces/msg/ShortVaried.msg b/ros2cli_test_interfaces/msg/ShortVaried.msg
@@ -0,0 +1,8 @@
+# A constant
+bool BOOL_CONST=true # Comment - Nesting Level 1: 1 of 2
+
+# Bool and array of bools
+bool bool_value
+bool[<=3] bool_values # Comment - Nesting Level 1: 2 of 2
+
+# Trailing comment
diff --git a/ros2cli_test_interfaces/msg/ShortVariedMultiNested.msg b/ros2cli_test_interfaces/msg/ShortVariedMultiNested.msg
@@ -0,0 +1,3 @@
+# A short, varied, and nested type
+ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 1
+# Trailing comment
diff --git a/ros2cli_test_interfaces/msg/ShortVariedNested.msg b/ros2cli_test_interfaces/msg/ShortVariedNested.msg
@@ -0,0 +1,3 @@
+# A short, varied type
+ShortVaried short_varied # Comment - Nesting Level 2: 1 of 1
+# Trailing comment
diff --git a/ros2cli_test_interfaces/package.xml b/ros2cli_test_interfaces/package.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+  <name>ros2cli_test_interfaces</name>
+  <version>1.0.1</version>
+  <description>A package containing interface definitions for testing ros2cli.</description>
+  <maintainer email="clairewang@openrobotics.org">Claire Wang</maintainer>
+  <maintainer email="mabel@openrobotics.org">Mabel Zhang</maintainer>
+  <license>Apache License 2.0</license>
+  <author email="audrow@osrfoundation.org">Audrow Nash</author>
+
+  <buildtool_depend>ament_cmake</buildtool_depend>
+
+  <buildtool_depend>rosidl_default_generators</buildtool_depend>
+
+  <depend>action_msgs</depend>
+
+  <exec_depend>rosidl_default_runtime</exec_depend>
+
+  <test_depend>ament_lint_common</test_depend>
+
+  <member_of_group>rosidl_interface_packages</member_of_group>
+
+  <export>
+    <build_type>ament_cmake</build_type>
+  </export>
+</package>
diff --git a/ros2cli_test_interfaces/srv/ShortVariedMultiNested.srv b/ros2cli_test_interfaces/srv/ShortVariedMultiNested.srv
@@ -0,0 +1,5 @@
+# Request
+ShortVariedNested short_varied_nested # Comment - Nesting Level 3: 1 of 2
+---
+# Response
+bool bool_value # Comment - Nesting Level 3: 2 of 2
diff --git a/ros2interface/package.xml b/ros2interface/package.xml
@@ -24,6 +24,7 @@
   <test_depend>ament_xmllint</test_depend>
   <test_depend>python3-pytest</test_depend>
   <test_depend>ros_testing</test_depend>
+  <test_depend>ros2cli_test_interfaces</test_depend>
   <test_depend>test_msgs</test_depend>
 
   <export>