Skip to content
Prev Previous commit
Next Next commit
folderize
  • Loading branch information
Erwin Lejeune committed May 17, 2022
commit e4543c42abe8458bf6eb0cbf24c9d0b048eaac0a
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#define SIMULATED_DIFFERENTIAL_ROBOT

#include <chrono>
#include "cmr_tests_utils/basic_tf_broadcaster_node_test.hpp"
#include "cmr_tests_utils/basic_subscriber_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_tf_broadcaster_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_subscriber_node_test.hpp"
#include "geometry_msgs/msg/transform_stamped.hpp"
#include "geometry_msgs/msg/twist.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "rclcpp/rclcpp.hpp"
#include <map>
#include "rclcpp_lifecycle/lifecycle_node.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"

namespace cmr_tests_utils {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class BasicServiceServerTest: public rclcpp::Node
}

protected:

virtual void request_callback(
const std::shared_ptr<rmw_request_id_t> request_header,
const std::shared_ptr<typename ServiceT::Request> request,
Expand All @@ -39,10 +40,11 @@ class BasicServiceServerTest: public rclcpp::Node
last_request_ = request;
}

std::shared_ptr<typename ServiceT::Request> last_request_;

private:

typename rclcpp::Service<ServiceT>::SharedPtr server_;
std::shared_ptr<typename ServiceT::Request> last_request_;
};

}
Expand Down
6 changes: 3 additions & 3 deletions test/action_communication_test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_action_server_test.hpp"
#include "cmr_tests_utils/basic_action_client_test.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_action_server_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_action_client_test.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"
#include "example_interfaces/action/fibonacci.hpp"
#include <chrono>
#include <thread>
Expand Down
6 changes: 3 additions & 3 deletions test/pub_sub_communication_test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/basic_subscriber_node_test.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/asynchronous_nodes/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/asynchronous_nodes/basic_subscriber_node_test.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"
#include "std_msgs/msg/int32.hpp"
#include <chrono>
#include <thread>
Expand Down
6 changes: 3 additions & 3 deletions test/service_communication_test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_service_server_test.hpp"
#include "cmr_tests_utils/basic_service_client_test.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_service_server_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_service_client_test.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"
#include "example_interfaces/srv/add_two_ints.hpp"
#include <chrono>
#include <thread>
Expand Down
8 changes: 4 additions & 4 deletions test/simulated_robot_test.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/simulated_differential_robot.hpp"
#include "cmr_tests_utils/basic_tf_listener_node_test.hpp"
#include "cmr_tests_utils/multi_thread_spinner.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/robots/simulated_differential_robot.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_tf_listener_node_test.hpp"
#include "cmr_tests_utils/spinners/multi_thread_spinner.hpp"
#include "geometry_msgs/msg/transform_stamped.hpp"
#include "geometry_msgs/msg/pose_stamped.hpp"
#include "geometry_msgs/msg/twist.hpp"
Expand Down
8 changes: 4 additions & 4 deletions test/spinners_test.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/basic_subscriber_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_publisher_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_subscriber_node_test.hpp"
#include "std_msgs/msg/int32.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/multi_thread_spinner.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"
#include "cmr_tests_utils/spinners/multi_thread_spinner.hpp"
#include <chrono>
#include <thread>

Expand Down
8 changes: 4 additions & 4 deletions test/transforms_test.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "gtest/gtest.h"
#include "rclcpp/rclcpp.hpp"
#include "cmr_tests_utils/basic_tf_listener_node_test.hpp"
#include "cmr_tests_utils/basic_tf_broadcaster_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_tf_listener_node_test.hpp"
#include "cmr_tests_utils/synchronous_nodes/basic_tf_broadcaster_node_test.hpp"
#include "geometry_msgs/msg/transform_stamped.hpp"
#include "geometry_msgs/msg/pose_stamped.hpp"
#include "geometry_msgs/msg/quaternion.hpp"
#include "cmr_tests_utils/single_thread_spinner.hpp"
#include "cmr_tests_utils/multi_thread_spinner.hpp"
#include "cmr_tests_utils/spinners/single_thread_spinner.hpp"
#include "cmr_tests_utils/spinners/multi_thread_spinner.hpp"
#include <chrono>
#include <thread>

Expand Down