Skip to content

Commit

Permalink
thrift and ros tests moved
Browse files Browse the repository at this point in the history
  • Loading branch information
@randaz81
randaz81 committed Apr 14, 2023
1 parent 026a4f3 commit c60e584
Show file tree
Hide file tree
Showing 31 changed files with 100 additions and 93 deletions.
48 changes: 2 additions & 46 deletions src/yarpidl_rosmsg/tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,5 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

macro(add_yarpidl_rosmsg_test name wd file check_file)
# Run the test
add_test(
NAME idl::rosmsg::${name}::run
COMMAND yarpidl_rosmsg --verbose --no-ros true --out "${CMAKE_CURRENT_BINARY_DIR}/${name}" "${file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::run PROPERTIES FIXTURES_SETUP yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::run PROPERTIES LABELS "yarp::idl::rosmsg")

# Check if the file was generated by trying to generate md5sum
add_test(
NAME idl::rosmsg::${name}::check
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_CURRENT_BINARY_DIR}/${name}/${check_file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::check PROPERTIES FIXTURES_REQUIRED yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::check PROPERTIES LABELS "yarp::idl::rosmsg")

# Cleanup
add_test(
NAME idl::rosmsg::${name}::cleanup
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::cleanup PROPERTIES FIXTURES_CLEANUP yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::cleanup PROPERTIES LABELS "yarp::idl::rosmsg")

set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}")
endmacro()


# Try generating the files using different combinations of current working
# directory and path to the file
add_yarpidl_rosmsg_test(test1 "${CMAKE_CURRENT_SOURCE_DIR}/demo" Demo.msg yarp/rosmsg/Demo.h)
add_yarpidl_rosmsg_test(test2 "${CMAKE_CURRENT_SOURCE_DIR}" demo/Demo.msg yarp/rosmsg/demo/Demo.h)

if(YARP_ENABLE_BROKEN_TESTS)
add_yarpidl_rosmsg_test(test3 "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/demo/Demo.msg" yarp/rosmsg/demo/Demo.h)
endif()

# Try using the type name
if(YARP_ENABLE_BROKEN_TESTS)
add_yarpidl_rosmsg_test(test6 "${CMAKE_CURRENT_SOURCE_DIR}/demo" Demo yarp/rosmsg/.h)
add_yarpidl_rosmsg_test(test7 "${CMAKE_CURRENT_SOURCE_DIR}" demo/Demo yarp/rosmsg/demo/Demo.h)
endif()
add_subdirectory(test1_catch)
add_subdirectory(test2_generation)
0 tests/yarpidl_rosmsg/CMakeLists.txt → ...l_rosmsg/tests/test1_catch/CMakeLists.txt
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/CMakeLists.txt → ...msg/tests/test1_catch/demo/CMakeLists.txt
View file
File renamed without changes.
0 src/yarpidl_rosmsg/tests/demo/Demo.msg → ...dl_rosmsg/tests/test1_catch/demo/Demo.msg
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/HeaderTest.msg → ...msg/tests/test1_catch/demo/HeaderTest.msg
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/HeaderTest2.srv → ...sg/tests/test1_catch/demo/HeaderTest2.srv
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/Rpc.srv → ...idl_rosmsg/tests/test1_catch/demo/Rpc.srv
View file
File renamed without changes.
0 src/yarpidl_rosmsg/tests/demo/SharedData.msg → ...msg/tests/test1_catch/demo/SharedData.msg
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/Tennis.srv → ..._rosmsg/tests/test1_catch/demo/Tennis.srv
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/foo/bar/Demo2.msg → .../tests/test1_catch/demo/foo/bar/Demo2.msg
View file
File renamed without changes.
0 ...rpidl_rosmsg/demo/foo/bar/SharedData2.msg → .../test1_catch/demo/foo/bar/SharedData2.msg
View file
File renamed without changes.
0 ...s/yarpidl_rosmsg/demo/foo/bar/Tennis2.srv → ...ests/test1_catch/demo/foo/bar/Tennis2.srv
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/main.cpp → ...dl_rosmsg/tests/test1_catch/demo/main.cpp
View file
File renamed without changes.
49 changes: 49 additions & 0 deletions src/yarpidl_rosmsg/tests/test2_generation/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

macro(add_yarpidl_rosmsg_test name wd file check_file)
# Run the test
add_test(
NAME idl::rosmsg::${name}::run
COMMAND yarpidl_rosmsg --verbose --no-ros true --out "${CMAKE_CURRENT_BINARY_DIR}/${name}" "${file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::run PROPERTIES FIXTURES_SETUP yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::run PROPERTIES LABELS "yarp::idl::rosmsg")

# Check if the file was generated by trying to generate md5sum
add_test(
NAME idl::rosmsg::${name}::check
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_CURRENT_BINARY_DIR}/${name}/${check_file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::check PROPERTIES FIXTURES_REQUIRED yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::check PROPERTIES LABELS "yarp::idl::rosmsg")

# Cleanup
add_test(
NAME idl::rosmsg::${name}::cleanup
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::rosmsg::${name}::cleanup PROPERTIES FIXTURES_CLEANUP yarpidl_rosmsg_${name}_run)
set_tests_properties(idl::rosmsg::${name}::cleanup PROPERTIES LABELS "yarp::idl::rosmsg")

set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}")
endmacro()


# Try generating the files using different combinations of current working
# directory and path to the file
add_yarpidl_rosmsg_test(test1 "${CMAKE_CURRENT_SOURCE_DIR}/demo" Demo.msg yarp/rosmsg/Demo.h)
add_yarpidl_rosmsg_test(test2 "${CMAKE_CURRENT_SOURCE_DIR}" demo/Demo.msg yarp/rosmsg/demo/Demo.h)

if(YARP_ENABLE_BROKEN_TESTS)
add_yarpidl_rosmsg_test(test3 "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/demo/Demo.msg" yarp/rosmsg/demo/Demo.h)
endif()

# Try using the type name
if(YARP_ENABLE_BROKEN_TESTS)
add_yarpidl_rosmsg_test(test6 "${CMAKE_CURRENT_SOURCE_DIR}/demo" Demo yarp/rosmsg/.h)
add_yarpidl_rosmsg_test(test7 "${CMAKE_CURRENT_SOURCE_DIR}" demo/Demo yarp/rosmsg/demo/Demo.h)
endif()
0 tests/yarpidl_rosmsg/demo/Demo.msg → ...smsg/tests/test2_generation/demo/Demo.msg
View file
File renamed without changes.
0 tests/yarpidl_rosmsg/demo/SharedData.msg → ...ests/test2_generation/demo/SharedData.msg
View file
File renamed without changes.
46 changes: 2 additions & 44 deletions src/yarpidl_thrift/tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,5 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

macro(add_yarpidl_thrift_test name wd file check_file)
# FIXME directory is not created automatically by yarpidl_thrift
add_test(
NAME idl::thrift::${name}::setup
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
)
set_tests_properties(idl::thrift::${name}::setup PROPERTIES FIXTURES_SETUP yarpidl_thrift_${name}_setup)

# Run the test
add_test(
NAME idl::thrift::${name}::run
COMMAND yarpidl_thrift --out "${CMAKE_CURRENT_BINARY_DIR}/${name}" --gen yarp "${file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::thrift::${name}::run PROPERTIES FIXTURES_REQUIRED yarpidl_thrift_${name}_setup)
set_tests_properties(idl::thrift::${name}::run PROPERTIES FIXTURES_SETUP yarpidl_thrift_${name}_run)
set_tests_properties(idl::thrift::${name}::run PROPERTIES LABELS "yarp::idl::thrift")

# Check if the file was generated by trying to generate md5sum
add_test(
NAME idl::thrift::${name}::check
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_CURRENT_BINARY_DIR}/${name}/${check_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/demo"
)
set_tests_properties(idl::thrift::${name}::check PROPERTIES FIXTURES_REQUIRED yarpidl_thrift_${name}_run)
set_tests_properties(idl::thrift::${name}::check PROPERTIES LABELS "yarp::idl::thrift")

# Cleanup
add_test(
NAME idl::thrift::${name}::cleanup
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
)
set_tests_properties(idl::thrift::${name}::cleanup PROPERTIES FIXTURES_CLEANUP "yarpidl_thrift_${name}_setup;yarpidl_thrift_${name}_run")
set_tests_properties(idl::thrift::${name}::cleanup PROPERTIES LABELS "yarp::idl::thrift")

set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}")
endmacro()


# Try generating the files using different combinations of current working
# directory and path to the file
add_yarpidl_thrift_test(test1 "${CMAKE_CURRENT_SOURCE_DIR}/demo" demo.thrift Demo.h)
add_yarpidl_thrift_test(test2 "${CMAKE_CURRENT_SOURCE_DIR}" demo/demo.thrift Demo.h)
add_yarpidl_thrift_test(test3 "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/demo/demo.thrift" Demo.h)
add_subdirectory(test1_catch)
add_subdirectory(test2_generation)
0 tests/yarpidl_thrift/CMakeLists.txt → ...l_thrift/tests/test1_catch/CMakeLists.txt
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/CMakeLists.txt → ...ift/tests/test1_catch/demo/CMakeLists.txt
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/annotated.thrift → ...t/tests/test1_catch/demo/annotated.thrift
View file
File renamed without changes.
0 src/yarpidl_thrift/tests/demo/demo.thrift → ...thrift/tests/test1_catch/demo/demo.thrift
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/main.cpp → ...dl_thrift/tests/test1_catch/demo/main.cpp
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/mapOfLists.thrift → .../tests/test1_catch/demo/mapOfLists.thrift
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/namespaced.thrift → .../tests/test1_catch/demo/namespaced.thrift
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/objects3D.thrift → ...t/tests/test1_catch/demo/objects3D.thrift
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/settings.thrift → ...ft/tests/test1_catch/demo/settings.thrift
View file
File renamed without changes.
0 ...hrift/demo/sub/directory/clock_rpc.thrift → ...catch/demo/sub/directory/clock_rpc.thrift
View file
File renamed without changes.
0 tests/yarpidl_thrift/demo/wrapping.thrift → ...ft/tests/test1_catch/demo/wrapping.thrift
View file
File renamed without changes.
47 changes: 47 additions & 0 deletions src/yarpidl_thrift/tests/test2_generation/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT)
# SPDX-License-Identifier: BSD-3-Clause

macro(add_yarpidl_thrift_test name wd file check_file)
# FIXME directory is not created automatically by yarpidl_thrift
add_test(
NAME idl::thrift::${name}::setup
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
)
set_tests_properties(idl::thrift::${name}::setup PROPERTIES FIXTURES_SETUP yarpidl_thrift_${name}_setup)

# Run the test
add_test(
NAME idl::thrift::${name}::run
COMMAND yarpidl_thrift --out "${CMAKE_CURRENT_BINARY_DIR}/${name}" --gen yarp "${file}"
WORKING_DIRECTORY "${wd}"
)
set_tests_properties(idl::thrift::${name}::run PROPERTIES FIXTURES_REQUIRED yarpidl_thrift_${name}_setup)
set_tests_properties(idl::thrift::${name}::run PROPERTIES FIXTURES_SETUP yarpidl_thrift_${name}_run)
set_tests_properties(idl::thrift::${name}::run PROPERTIES LABELS "yarp::idl::thrift")

# Check if the file was generated by trying to generate md5sum
add_test(
NAME idl::thrift::${name}::check
COMMAND ${CMAKE_COMMAND} -E md5sum "${CMAKE_CURRENT_BINARY_DIR}/${name}/${check_file}"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/demo"
)
set_tests_properties(idl::thrift::${name}::check PROPERTIES FIXTURES_REQUIRED yarpidl_thrift_${name}_run)
set_tests_properties(idl::thrift::${name}::check PROPERTIES LABELS "yarp::idl::thrift")

# Cleanup
add_test(
NAME idl::thrift::${name}::cleanup
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${name}"
)
set_tests_properties(idl::thrift::${name}::cleanup PROPERTIES FIXTURES_CLEANUP "yarpidl_thrift_${name}_setup;yarpidl_thrift_${name}_run")
set_tests_properties(idl::thrift::${name}::cleanup PROPERTIES LABELS "yarp::idl::thrift")

set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}")
endmacro()


# Try generating the files using different combinations of current working
# directory and path to the file
add_yarpidl_thrift_test(test1 "${CMAKE_CURRENT_SOURCE_DIR}/demo" demo.thrift Demo.h)
add_yarpidl_thrift_test(test2 "${CMAKE_CURRENT_SOURCE_DIR}" demo/demo.thrift Demo.h)
add_yarpidl_thrift_test(test3 "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/demo/demo.thrift" Demo.h)
0 tests/yarpidl_thrift/demo/demo.thrift → ...t/tests/test2_generation/demo/demo.thrift
View file
File renamed without changes.
3 changes: 0 additions & 3 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ set_property(TARGET YARP_harness_no_network PROPERTY FOLDER "Test")

add_subdirectory(misc)

add_subdirectory(yarpidl_thrift)
add_subdirectory(yarpidl_rosmsg)

add_subdirectory(devices)

add_subdirectory(integration)

0 comments on commit c60e584

Please sign in to comment.