Skip to content

Commit 4eef9ee

Browse files
committed
revert test changes
Signed-off-by: Paul Gesel <[email protected]>
1 parent 9b47cde commit 4eef9ee

8 files changed

+4
-322
lines changed

moveit_ros/move_group/src/move_group.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ int main(int argc, char** argv)
289289
// Initialize MoveItCpp
290290
const auto moveit_cpp = std::make_shared<moveit_cpp::MoveItCpp>(nh, moveit_cpp_options);
291291
const auto planning_scene_monitor = moveit_cpp->getPlanningSceneMonitorNonConst();
292+
292293
if (auto ps = planning_scene_monitor->getPlanningScene())
293294
{
294295
if (nh->has_parameter("default_planning_scene"))

moveit_ros/tests/CMakeLists.txt

+3-20
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,18 @@ cmake_minimum_required(VERSION 3.22)
22
project(moveit_ros_tests LANGUAGES CXX)
33

44
# Common cmake code applied to all moveit packages
5-
find_package(ament_cmake_python REQUIRED)
65
find_package(moveit_common REQUIRED)
76
moveit_package()
87

98
if(BUILD_TESTING)
109
find_package(ament_cmake_gtest REQUIRED)
11-
find_package(ament_cmake_ros REQUIRED)
12-
find_package(moveit_ros_planning REQUIRED)
10+
find_package(ament_cmake REQUIRED)
1311
find_package(rclcpp REQUIRED)
1412
find_package(ros_testing REQUIRED)
1513

1614
include_directories(include)
1715
ament_add_gtest_executable(move_group_api_test src/move_group_api_test.cpp)
1816
ament_target_dependencies(move_group_api_test rclcpp)
19-
add_ros_test(launch/move_group_api.py TIMEOUT 30 ENV "ROS_DOMAIN_ID=2")
20-
21-
ament_add_gtest_executable(move_group_default_planning_scene_test
22-
src/move_group_default_planning_scene_test.cpp)
23-
ament_target_dependencies(move_group_default_planning_scene_test rclcpp
24-
moveit_ros_planning)
25-
# run default_planning_scene test isolated test to avoid interference
26-
add_ros_test(launch/move_group_default_planning_scene.py TIMEOUT 30 ENV
27-
"ROS_DOMAIN_ID=2")
28-
29-
# install Python helper script and test
30-
ament_python_install_package(moveit_ros_tests)
31-
install(DIRECTORY data DESTINATION share/${PROJECT_NAME})
32-
install(TARGETS move_group_api_test move_group_default_planning_scene_test
33-
RUNTIME DESTINATION lib/${PROJECT_NAME})
17+
add_ros_test(launch/move_group_api.test.py TIMEOUT 30 ARGS
18+
"test_binary_dir:=${CMAKE_CURRENT_BINARY_DIR}")
3419
endif()
35-
36-
ament_package()

moveit_ros/tests/data/scene.txt

-22
This file was deleted.

moveit_ros/tests/launch/move_group_api.py

-56
This file was deleted.

moveit_ros/tests/launch/move_group_default_planning_scene.py

-58
This file was deleted.

moveit_ros/tests/moveit_ros_tests/__init__.py

Whitespace-only changes.

moveit_ros/tests/moveit_ros_tests/move_group_test_description.py

-92
This file was deleted.

moveit_ros/tests/src/move_group_default_planning_scene_test.cpp

-74
This file was deleted.

0 commit comments

Comments
 (0)