Skip to content

Commit fe8bc6b

Browse files
SteveMacenskiruffsl
authored andcommitted
Adding some more test coverage (ros-navigation#1903)
* more tests * removing old cmake
1 parent d418d3a commit fe8bc6b

File tree

5 files changed

+31
-2
lines changed

5 files changed

+31
-2
lines changed

nav2_behavior_tree/test/plugins/action/test_spin_action.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TEST_F(SpinActionTestFixture, test_ports)
109109
R"(
110110
<root main_tree_to_execute = "MainTree" >
111111
<BehaviorTree ID="MainTree">
112-
<Spin />
112+
<Spin server_name="spin"/>
113113
</BehaviorTree>
114114
</root>)";
115115

nav2_core/include/nav2_core/progress_checker.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ProgressChecker
5555
/**
5656
* @brief Reset class state upon calling
5757
*/
58-
virtual void reset() {}
58+
virtual void reset() = 0;
5959
};
6060
} // namespace nav2_core
6161

nav2_util/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ find_package(rclcpp_lifecycle REQUIRED)
1717
find_package(tf2_geometry_msgs REQUIRED)
1818
find_package(bondcpp REQUIRED)
1919
find_package(bond REQUIRED)
20+
find_package(action_msgs REQUIRED)
2021

2122
set(dependencies
2223
nav2_msgs
@@ -32,6 +33,7 @@ set(dependencies
3233
rclcpp_lifecycle
3334
bondcpp
3435
bond
36+
action_msgs
3537
)
3638

3739
nav2_package()

nav2_util/package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<depend>rclcpp_lifecycle</depend>
2929
<depend>launch</depend>
3030
<depend>launch_testing_ament_cmake</depend>
31+
<depend>action_msgs</depend>
3132

3233
<exec_depend>libboost-program-options</exec_depend>
3334

@@ -37,6 +38,7 @@
3738
<test_depend>launch</test_depend>
3839
<test_depend>launch_testing_ament_cmake</test_depend>
3940
<test_depend>std_srvs</test_depend>
41+
<test_depend>action_msgs</test_depend>
4042

4143
<export>
4244
<build_type>ament_cmake</build_type>

nav2_util/test/test_actions.cpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,31 @@ TEST_F(ActionTest, test_handle_goal_deactivated)
516516
SUCCEED();
517517
}
518518

519+
TEST_F(ActionTest, test_handle_cancel)
520+
{
521+
auto goal = Fibonacci::Goal();
522+
goal.order = 14000000;
523+
524+
// Send the goal
525+
auto future_goal_handle = node_->action_client_->async_send_goal(goal);
526+
EXPECT_EQ(
527+
rclcpp::spin_until_future_complete(
528+
node_,
529+
future_goal_handle), rclcpp::FutureReturnCode::SUCCESS);
530+
531+
// Cancel the goal
532+
auto cancel_response = node_->action_client_->async_cancel_goal(future_goal_handle.get());
533+
EXPECT_EQ(
534+
rclcpp::spin_until_future_complete(
535+
node_,
536+
cancel_response), rclcpp::FutureReturnCode::SUCCESS);
537+
538+
// Check cancelled
539+
EXPECT_EQ(future_goal_handle.get()->get_status(), rclcpp_action::GoalStatus::STATUS_CANCELING);
540+
541+
SUCCEED();
542+
}
543+
519544
int main(int argc, char ** argv)
520545
{
521546
rclcpp::init(argc, argv);

0 commit comments

Comments
 (0)