Skip to content

Commit b93c7bf

Browse files
authored
Refactor tests (#89)
* Refactor tests Use test_interface_files for more systematic test coverage. Continue to use StringArrays.msg from this package for cases not covered by test_interface_files. Signed-off-by: Jacob Perron <[email protected]> * Remove old test files Signed-off-by: Jacob Perron <[email protected]>
1 parent 660872f commit b93c7bf

23 files changed

+720
-350
lines changed

rosidl_generator_py/CMakeLists.txt

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,7 @@ if(BUILD_TESTING)
2222
find_package(ament_lint_auto REQUIRED)
2323
ament_lint_auto_find_test_dependencies()
2424

25-
set(message_files
26-
#"msg/Bool.msg"
27-
#"msg/Byte.msg"
28-
#"msg/Char.msg"
29-
"msg/Constants.msg"
30-
"msg/Empty.msg"
31-
#"msg/Float32.msg"
32-
#"msg/Float64.msg"
33-
#"msg/Int16.msg"
34-
#"msg/Int32.msg"
35-
#"msg/Int64.msg"
36-
#"msg/Int8.msg"
37-
"msg/Nested.msg"
38-
"msg/Primitives.msg"
39-
"msg/StringArrays.msg"
40-
"msg/Strings.msg"
41-
#"msg/Uint16.msg"
42-
#"msg/Uint32.msg"
43-
#"msg/Uint64.msg"
44-
#"msg/Uint8.msg"
45-
"msg/Various.msg"
46-
"msg/WStrings.msg"
47-
)
25+
find_package(test_interface_files REQUIRED)
4826

4927
include(cmake/register_py.cmake)
5028
include(cmake/rosidl_generator_py_get_typesupports.cmake)
@@ -68,7 +46,10 @@ if(BUILD_TESTING)
6846
# Use a custom suffix for the target name here to detect regressions of this:
6947
# https://github.com/ros2/rosidl_python/issues/11
7048
# The alternative style (just using ${PROJECT_NAME}) is used by most interface packages.
71-
rosidl_generate_interfaces(${PROJECT_NAME}_custom ${message_files}
49+
rosidl_generate_interfaces(${PROJECT_NAME}_custom
50+
${test_interface_files_MSG_FILES}
51+
# Cases not covered by test_interface_files
52+
msg/StringArrays.msg
7253
ADD_LINTER_TESTS
7354
SKIP_INSTALL
7455
)

rosidl_generator_py/msg/Bool.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Byte.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Char.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Constants.msg

Lines changed: 0 additions & 7 deletions
This file was deleted.

rosidl_generator_py/msg/Empty.msg

Whitespace-only changes.

rosidl_generator_py/msg/Float32.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Float64.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Int16.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

rosidl_generator_py/msg/Int32.msg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)