From c6dd4a799ae7a8fb95b8805ff288de8bb7d88c1b Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Wed, 2 Sep 2026 12:10:27 +0200 Subject: [PATCH] rclcpp tests: Granular includes and include what you use Signed-off-by: Alejandro Hernandez Cordero --- rclcpp/include/rclcpp/create_subscription.hpp | 1 + rclcpp/test/benchmark/benchmark_client.cpp | 7 +++++- rclcpp/test/benchmark/benchmark_executor.cpp | 25 ++++++++++++++++++- .../benchmark/benchmark_init_shutdown.cpp | 2 +- rclcpp/test/benchmark/benchmark_node.cpp | 3 ++- .../benchmark_node_parameters_interface.cpp | 5 +++- .../benchmark/benchmark_parameter_client.cpp | 15 +++++++++-- rclcpp/test/benchmark/benchmark_service.cpp | 6 ++++- .../rclcpp/exceptions/test_exceptions.cpp | 4 ++- .../executors/test_entities_collector.cpp | 9 +++++-- .../test_events_cbg_executor_reentrant.cpp | 7 +++++- .../test_executor_notify_waitable.cpp | 5 +++- .../test/rclcpp/executors/test_executors.cpp | 15 ++++++++++- .../executors/test_executors_busy_waiting.cpp | 5 +++- .../executors/test_executors_warmup.cpp | 9 ++++++- .../test_multi_threaded_executor.cpp | 13 +++++++--- .../executors/test_reinitialized_timers.cpp | 4 ++- .../rclcpp/node_interfaces/node_wrapper.hpp | 12 ++++++++- ...topics_interface_const_ptr_rclcpp_node.cpp | 3 ++- ...opics_interface_const_ptr_wrapped_node.cpp | 2 +- ...topics_interface_const_ref_rclcpp_node.cpp | 3 ++- ...opics_interface_const_ref_wrapped_node.cpp | 2 +- .../test_get_node_interfaces.cpp | 6 ++++- .../rclcpp/node_interfaces/test_node_base.cpp | 4 ++- .../node_interfaces/test_node_graph.cpp | 8 +++++- .../node_interfaces/test_node_services.cpp | 8 +++++- .../node_interfaces/test_node_timers.cpp | 7 +++++- .../node_interfaces/test_node_topics.cpp | 16 +++++++++++- .../node_interfaces/test_node_waitables.cpp | 9 ++++++- .../test_add_callback_groups_to_executor.cpp | 14 +++++++++-- rclcpp/test/rclcpp/test_client.cpp | 8 ++++-- rclcpp/test/rclcpp/test_client_common.cpp | 19 ++++++++++++-- rclcpp/test/rclcpp/test_clock_conditional.cpp | 7 +++++- rclcpp/test/rclcpp/test_context.cpp | 4 ++- .../rclcpp/test_copy_all_parameter_values.cpp | 8 +++++- rclcpp/test/rclcpp/test_duration.cpp | 3 ++- rclcpp/test/rclcpp/test_executor.cpp | 15 +++++++++-- .../test_externally_defined_services.cpp | 8 +++--- rclcpp/test/rclcpp/test_find_weak_nodes.cpp | 2 +- rclcpp/test/rclcpp/test_generic_client.cpp | 9 +++++-- rclcpp/test/rclcpp/test_generic_pubsub.cpp | 9 ++++++- rclcpp/test/rclcpp/test_generic_service.cpp | 13 +++++++++- rclcpp/test/rclcpp/test_graph_listener.cpp | 8 +++++- rclcpp/test/rclcpp/test_guard_condition.cpp | 12 +++++++-- .../test/rclcpp/test_intra_process_buffer.cpp | 3 ++- ..._intra_process_manager_with_allocators.cpp | 14 ++++++++++- rclcpp/test/rclcpp/test_loaned_message.cpp | 6 ++++- rclcpp/test/rclcpp/test_logger_service.cpp | 9 +++++-- rclcpp/test/rclcpp/test_node.cpp | 16 +++++++++++- rclcpp/test/rclcpp/test_node_global_args.cpp | 2 +- rclcpp/test/rclcpp/test_parameter.cpp | 4 ++- rclcpp/test/rclcpp/test_parameter_client.cpp | 13 +++++++++- .../rclcpp/test_parameter_event_handler.cpp | 11 +++++++- rclcpp/test/rclcpp/test_parameter_service.cpp | 7 +++++- rclcpp/test/rclcpp/test_publisher.cpp | 21 ++++++++++++++-- .../test_publisher_subscription_count_api.cpp | 6 ++++- .../test_publisher_with_type_adapter.cpp | 12 ++++++++- rclcpp/test/rclcpp/test_qos_event.cpp | 15 ++++++++++- rclcpp/test/rclcpp/test_qos_parameters.cpp | 11 ++++++-- .../test/rclcpp/test_rosout_subscription.cpp | 10 +++++++- .../test/rclcpp/test_serialized_message.cpp | 2 +- .../test_serialized_message_allocator.cpp | 5 +++- rclcpp/test/rclcpp/test_service.cpp | 15 +++++++++-- .../rclcpp/test_service_introspection.cpp | 15 ++++++++++- rclcpp/test/rclcpp/test_subscription.cpp | 13 +++++++++- .../test_subscription_content_filter.cpp | 10 +++++++- .../test_subscription_publisher_count_api.cpp | 8 ++++-- ...ption_publisher_with_same_type_adapter.cpp | 7 +++++- .../test_subscription_with_type_adapter.cpp | 10 +++++++- rclcpp/test/rclcpp/test_time.cpp | 7 +++++- rclcpp/test/rclcpp/test_time_source.cpp | 18 ++++++++++++- rclcpp/test/rclcpp/test_timer.cpp | 9 ++++++- rclcpp/test/rclcpp/test_type_support.cpp | 6 ++++- rclcpp/test/rclcpp/test_wait_set.cpp | 17 ++++++++++++- .../test_subscription_topic_statistics.cpp | 11 +++++++- .../test_dynamic_storage.cpp | 17 +++++++++++-- .../wait_set_policies/test_static_storage.cpp | 14 +++++++++-- .../test_storage_policy_common.cpp | 14 +++++++++-- .../test_thread_safe_synchronization.cpp | 17 +++++++++++-- .../waitables/test_intra_process_waitable.cpp | 6 ++++- .../test/utils/test_rclcpp_gtest_macros.cpp | 4 ++- 81 files changed, 638 insertions(+), 101 deletions(-) diff --git a/rclcpp/include/rclcpp/create_subscription.hpp b/rclcpp/include/rclcpp/create_subscription.hpp index 0bf9a7c19a..3a1e4b1a13 100644 --- a/rclcpp/include/rclcpp/create_subscription.hpp +++ b/rclcpp/include/rclcpp/create_subscription.hpp @@ -30,6 +30,7 @@ #include "rclcpp/node_interfaces/node_topics_interface.hpp" #include "rclcpp/create_publisher.hpp" +#include "rclcpp/create_timer.hpp" #include "rclcpp/qos.hpp" #include "rclcpp/subscription_factory.hpp" #include "rclcpp/subscription_options.hpp" diff --git a/rclcpp/test/benchmark/benchmark_client.cpp b/rclcpp/test/benchmark/benchmark_client.cpp index 26ee58b633..e7540f5c68 100644 --- a/rclcpp/test/benchmark/benchmark_client.cpp +++ b/rclcpp/test/benchmark/benchmark_client.cpp @@ -12,11 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/srv/empty.hpp" using performance_test_fixture::PerformanceTest; diff --git a/rclcpp/test/benchmark/benchmark_executor.cpp b/rclcpp/test/benchmark/benchmark_executor.cpp index ab931d1756..85974d0da3 100644 --- a/rclcpp/test/benchmark/benchmark_executor.cpp +++ b/rclcpp/test/benchmark/benchmark_executor.cpp @@ -12,15 +12,38 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors.hpp" #include "rclcpp/executors/events_cbg_executor/events_cbg_executor.hpp" +#include "rclcpp/executors/multi_threaded_executor.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/waitable.hpp" #include "rcpputils/scope_exit.hpp" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/benchmark/benchmark_init_shutdown.cpp b/rclcpp/test/benchmark/benchmark_init_shutdown.cpp index c2a60f693a..b76c294c92 100644 --- a/rclcpp/test/benchmark/benchmark_init_shutdown.cpp +++ b/rclcpp/test/benchmark/benchmark_init_shutdown.cpp @@ -14,7 +14,7 @@ #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" using performance_test_fixture::PerformanceTest; diff --git a/rclcpp/test/benchmark/benchmark_node.cpp b/rclcpp/test/benchmark/benchmark_node.cpp index a5d7f4c80f..e51caf3d84 100644 --- a/rclcpp/test/benchmark/benchmark_node.cpp +++ b/rclcpp/test/benchmark/benchmark_node.cpp @@ -16,7 +16,8 @@ #include #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" using performance_test_fixture::PerformanceTest; diff --git a/rclcpp/test/benchmark/benchmark_node_parameters_interface.cpp b/rclcpp/test/benchmark/benchmark_node_parameters_interface.cpp index 04c7071d64..459b107f66 100644 --- a/rclcpp/test/benchmark/benchmark_node_parameters_interface.cpp +++ b/rclcpp/test/benchmark/benchmark_node_parameters_interface.cpp @@ -18,7 +18,10 @@ #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" class NodeParametersInterfaceTest : public performance_test_fixture::PerformanceTest { diff --git a/rclcpp/test/benchmark/benchmark_parameter_client.cpp b/rclcpp/test/benchmark/benchmark_parameter_client.cpp index 0d9a6fd9c9..24834ad358 100644 --- a/rclcpp/test/benchmark/benchmark_parameter_client.cpp +++ b/rclcpp/test/benchmark/benchmark_parameter_client.cpp @@ -12,13 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include -#include #include +#include +#include #include "benchmark/benchmark.h" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/context.hpp" +#include "rclcpp/executor_options.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/init_options.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_client.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" class RemoteNodeTest : public benchmark::Fixture { diff --git a/rclcpp/test/benchmark/benchmark_service.cpp b/rclcpp/test/benchmark/benchmark_service.cpp index 4d00567da5..30bdc9ac42 100644 --- a/rclcpp/test/benchmark/benchmark_service.cpp +++ b/rclcpp/test/benchmark/benchmark_service.cpp @@ -12,10 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include "performance_test_fixture/performance_test_fixture.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/srv/empty.hpp" using performance_test_fixture::PerformanceTest; diff --git a/rclcpp/test/rclcpp/exceptions/test_exceptions.cpp b/rclcpp/test/rclcpp/exceptions/test_exceptions.cpp index 184dfc7a06..7e07598797 100644 --- a/rclcpp/test/rclcpp/exceptions/test_exceptions.cpp +++ b/rclcpp/test/rclcpp/exceptions/test_exceptions.cpp @@ -14,8 +14,10 @@ #include +#include + +#include "rclcpp/exceptions.hpp" #include "rclcpp/exceptions/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" #include "../../mocking_utils/patch.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_entities_collector.cpp b/rclcpp/test/rclcpp/executors/test_entities_collector.cpp index 930dc68aff..98399531a6 100644 --- a/rclcpp/test/rclcpp/executors/test_entities_collector.cpp +++ b/rclcpp/test/rclcpp/executors/test_entities_collector.cpp @@ -14,9 +14,14 @@ #include -#include "rclcpp/executors/executor_notify_waitable.hpp" -#include "rclcpp/rclcpp.hpp" +#include +#include + +#include "rclcpp/callback_group.hpp" #include "rclcpp/executors/executor_entities_collector.hpp" +#include "rclcpp/executors/executor_notify_waitable.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_events_cbg_executor_reentrant.cpp b/rclcpp/test/rclcpp/executors/test_events_cbg_executor_reentrant.cpp index 4b1d25285c..94ade49e25 100644 --- a/rclcpp/test/rclcpp/executors/test_events_cbg_executor_reentrant.cpp +++ b/rclcpp/test/rclcpp/executors/test_events_cbg_executor_reentrant.cpp @@ -21,7 +21,12 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/executor_options.hpp" +#include "rclcpp/executors/events_cbg_executor/events_cbg_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/test/rclcpp/executors/test_executor_notify_waitable.cpp b/rclcpp/test/rclcpp/executors/test_executor_notify_waitable.cpp index 92b6445475..6dfcb3aae5 100644 --- a/rclcpp/test/rclcpp/executors/test_executor_notify_waitable.cpp +++ b/rclcpp/test/rclcpp/executors/test_executor_notify_waitable.cpp @@ -19,7 +19,10 @@ #include #include "rclcpp/executors/single_threaded_executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/waitable.hpp" #include "rcpputils/scope_exit.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp index 68c7a78557..a2341a9d48 100644 --- a/rclcpp/test/rclcpp/executors/test_executors.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -33,12 +34,24 @@ #include "rcl/error_handling.h" #include "rcl/time.h" +#include "rclcpp/callback_group.hpp" #include "rclcpp/clock.hpp" +#include "rclcpp/context.hpp" #include "rclcpp/detail/add_guard_condition_to_rcl_wait_set.hpp" #include "rclcpp/duration.hpp" +#include "rclcpp/executor_options.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" #include "rclcpp/guard_condition.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/subscription_options.hpp" #include "rclcpp/time_source.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_executors_busy_waiting.cpp b/rclcpp/test/rclcpp/executors/test_executors_busy_waiting.cpp index c4cfe384ed..5b4ea137e8 100644 --- a/rclcpp/test/rclcpp/executors/test_executors_busy_waiting.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors_busy_waiting.cpp @@ -15,13 +15,16 @@ #include #include +#include #include #include #include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" #include "./executor_types.hpp" #include "./test_waitable.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_executors_warmup.cpp b/rclcpp/test/rclcpp/executors/test_executors_warmup.cpp index 257d009c9d..84199dbd95 100644 --- a/rclcpp/test/rclcpp/executors/test_executors_warmup.cpp +++ b/rclcpp/test/rclcpp/executors/test_executors_warmup.cpp @@ -28,7 +28,14 @@ #include "rcpputils/compile_warnings.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/experimental/executors/events_executor/events_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/executors/test_multi_threaded_executor.cpp b/rclcpp/test/rclcpp/executors/test_multi_threaded_executor.cpp index 09dfa03f90..a6157c8bb9 100644 --- a/rclcpp/test/rclcpp/executors/test_multi_threaded_executor.cpp +++ b/rclcpp/test/rclcpp/executors/test_multi_threaded_executor.cpp @@ -15,13 +15,20 @@ #include #include -#include +#include #include +#include +#include +#include "rclcpp/callback_group.hpp" +#include "rclcpp/clock.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executor_options.hpp" #include "rclcpp/executors.hpp" +#include "rclcpp/executors/multi_threaded_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/time.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/test/rclcpp/executors/test_reinitialized_timers.cpp b/rclcpp/test/rclcpp/executors/test_reinitialized_timers.cpp index c58b63c76c..7c6e5979dd 100644 --- a/rclcpp/test/rclcpp/executors/test_reinitialized_timers.cpp +++ b/rclcpp/test/rclcpp/executors/test_reinitialized_timers.cpp @@ -19,8 +19,10 @@ #include #include -#include "rclcpp/rclcpp.hpp" #include "rclcpp/create_timer.hpp" +#include "rclcpp/duration.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" #include "./executor_types.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/node_wrapper.hpp b/rclcpp/test/rclcpp/node_interfaces/node_wrapper.hpp index b1413e1f05..79bc7b278c 100644 --- a/rclcpp/test/rclcpp/node_interfaces/node_wrapper.hpp +++ b/rclcpp/test/rclcpp/node_interfaces/node_wrapper.hpp @@ -18,7 +18,17 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_interfaces/node_clock_interface.hpp" +#include "rclcpp/node_interfaces/node_graph_interface.hpp" +#include "rclcpp/node_interfaces/node_logging_interface.hpp" +#include "rclcpp/node_interfaces/node_parameters_interface.hpp" +#include "rclcpp/node_interfaces/node_services_interface.hpp" +#include "rclcpp/node_interfaces/node_time_source_interface.hpp" +#include "rclcpp/node_interfaces/node_timers_interface.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" +#include "rclcpp/node_interfaces/node_waitables_interface.hpp" class NodeWrapper { diff --git a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_rclcpp_node.cpp b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_rclcpp_node.cpp index 121f64126f..363db333fc 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_rclcpp_node.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_rclcpp_node.cpp @@ -14,8 +14,9 @@ #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/get_node_topics_interface.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" int main(void) { diff --git a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_wrapped_node.cpp b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_wrapped_node.cpp index 4f5b8311af..5c039ea133 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_wrapped_node.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ptr_wrapped_node.cpp @@ -14,8 +14,8 @@ #include -#include "rclcpp/rclcpp.hpp" #include "rclcpp/node_interfaces/get_node_topics_interface.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" #include "../node_wrapper.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_rclcpp_node.cpp b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_rclcpp_node.cpp index ed147418f5..481d0ac0e0 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_rclcpp_node.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_rclcpp_node.cpp @@ -14,8 +14,9 @@ #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/get_node_topics_interface.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" int main(void) { diff --git a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_wrapped_node.cpp b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_wrapped_node.cpp index 6d7c19cac7..33a62b507f 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_wrapped_node.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_does_not_compile/get_node_topics_interface_const_ref_wrapped_node.cpp @@ -14,8 +14,8 @@ #include -#include "rclcpp/rclcpp.hpp" #include "rclcpp/node_interfaces/get_node_topics_interface.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" #include "../node_wrapper.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_get_node_interfaces.cpp b/rclcpp/test/rclcpp/node_interfaces/test_get_node_interfaces.cpp index d890f74d08..3297199a26 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_get_node_interfaces.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_get_node_interfaces.cpp @@ -13,12 +13,16 @@ // limitations under the License. #include +#include #include +#include #include "gtest/gtest.h" +#include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/get_node_topics_interface.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_interfaces/node_topics_interface.hpp" +#include "rclcpp/utilities.hpp" #include "./node_wrapper.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_base.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_base.cpp index a40bc712bd..b01e70c31e 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_base.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_base.cpp @@ -15,12 +15,14 @@ #include #include +#include #include #include "rcl/node_options.h" +#include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_base.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" #include "rmw/validate_namespace.h" #include "rmw/validate_node_name.h" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_graph.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_graph.cpp index d9afffc030..409ca7af91 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_graph.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_graph.cpp @@ -14,8 +14,10 @@ #include +#include #include #include +#include #include #include #include @@ -23,10 +25,14 @@ #include "rcl/graph.h" #include "rcl/node_options.h" #include "rcl/remap.h" +#include "rclcpp/event.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_base.hpp" #include "rclcpp/node_interfaces/node_graph.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_interfaces/node_graph_interface.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/utilities.hpp" #include "rcutils/strdup.h" #include "test_msgs/msg/empty.h" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_services.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_services.cpp index 4d33948517..955b5272b1 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_services.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_services.cpp @@ -15,13 +15,19 @@ #include #include +#include #include #include #include "rcl/node_options.h" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_services.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" #include "../../mocking_utils/patch.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_timers.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_timers.cpp index ce6343fb5c..637d559fed 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_timers.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_timers.cpp @@ -14,13 +14,18 @@ #include +#include #include +#include #include #include "rcl/node_options.h" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_timers.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "../../mocking_utils/patch.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_topics.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_topics.cpp index f18d8a16b7..bd00ae5d0e 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_topics.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_topics.cpp @@ -15,14 +15,28 @@ #include #include +#include #include #include #include #include "rcl/node_options.h" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/dynamic_typesupport/dynamic_message.hpp" +#include "rclcpp/dynamic_typesupport/dynamic_message_type.hpp" +#include "rclcpp/dynamic_typesupport/dynamic_serialization_support.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/message_info.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_topics.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/serialized_message.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" #include "../../mocking_utils/patch.hpp" diff --git a/rclcpp/test/rclcpp/node_interfaces/test_node_waitables.cpp b/rclcpp/test/rclcpp/node_interfaces/test_node_waitables.cpp index 2035cc8014..e13c1b2be0 100644 --- a/rclcpp/test/rclcpp/node_interfaces/test_node_waitables.cpp +++ b/rclcpp/test/rclcpp/node_interfaces/test_node_waitables.cpp @@ -14,13 +14,20 @@ #include +#include #include +#include #include +#include #include "rcl/node_options.h" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_waitables.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/waitable.hpp" #include "../../mocking_utils/patch.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp b/rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp index 2c628e5cf8..a17d63ce8c 100644 --- a/rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp +++ b/rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp @@ -15,19 +15,29 @@ #include #include +#include +#include #include #include #include +#include #include #include #include "rclcpp/node.hpp" #include "test_msgs/msg/empty.hpp" +#include "rclcpp/callback_group.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/executors.hpp" #include "rclcpp/executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "./executors/executor_types.hpp" diff --git a/rclcpp/test/rclcpp/test_client.cpp b/rclcpp/test/rclcpp/test_client.cpp index 506d981dd6..0ff7449807 100644 --- a/rclcpp/test/rclcpp/test_client.cpp +++ b/rclcpp/test/rclcpp/test_client.cpp @@ -14,12 +14,16 @@ #include -#include +#include #include +#include #include +#include "rclcpp/create_client.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/utilities.hpp" #include "rcl_interfaces/srv/list_parameters.hpp" diff --git a/rclcpp/test/rclcpp/test_client_common.cpp b/rclcpp/test/rclcpp/test_client_common.cpp index b06dc9697e..f391c75f80 100644 --- a/rclcpp/test/rclcpp/test_client_common.cpp +++ b/rclcpp/test/rclcpp/test_client_common.cpp @@ -14,16 +14,31 @@ #include -#include +#include +#include +#include #include +#include +#include +#include #include +#include #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/client.hpp" #include "rclcpp/create_generic_client.hpp" +#include "rclcpp/duration.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/generic_client.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/test_clock_conditional.cpp b/rclcpp/test/rclcpp/test_clock_conditional.cpp index e924e212d7..4b021bfa9e 100644 --- a/rclcpp/test/rclcpp/test_clock_conditional.cpp +++ b/rclcpp/test/rclcpp/test_clock_conditional.cpp @@ -14,13 +14,18 @@ #include +#include #include +#include +#include +#include #include "rcl/error_handling.h" #include "rcl/time.h" #include "rclcpp/clock.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/time_source.hpp" +#include "rclcpp/utilities.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_context.cpp b/rclcpp/test/rclcpp/test_context.cpp index 0374a2d151..aa0240d4f4 100644 --- a/rclcpp/test/rclcpp/test_context.cpp +++ b/rclcpp/test/rclcpp/test_context.cpp @@ -14,11 +14,13 @@ #include #include +#include #include #include +#include "rclcpp/callback_group.hpp" #include "rclcpp/context.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/guard_condition.hpp" TEST(TestContext, check_pre_shutdown_callback_order) { auto context = std::make_shared(); diff --git a/rclcpp/test/rclcpp/test_copy_all_parameter_values.cpp b/rclcpp/test/rclcpp/test_copy_all_parameter_values.cpp index e3020efd1e..c0be70a3ed 100644 --- a/rclcpp/test/rclcpp/test_copy_all_parameter_values.cpp +++ b/rclcpp/test/rclcpp/test_copy_all_parameter_values.cpp @@ -13,8 +13,14 @@ // limitations under the License. #include + +#include +#include + #include "rclcpp/copy_all_parameter_values.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" class TestNode : public ::testing::Test { diff --git a/rclcpp/test/rclcpp/test_duration.cpp b/rclcpp/test/rclcpp/test_duration.cpp index 2347514d7a..bc8272b147 100644 --- a/rclcpp/test/rclcpp/test_duration.cpp +++ b/rclcpp/test/rclcpp/test_duration.cpp @@ -17,13 +17,14 @@ #include #include #include +#include #include #include "rcl/error_handling.h" #include "rcl/time.h" #include "rclcpp/clock.hpp" -#include "rclcpp/rclcpp.hpp" #include "rclcpp/duration.hpp" +#include "rclcpp/time.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_executor.cpp b/rclcpp/test/rclcpp/test_executor.cpp index 894703226f..beda7e83ce 100644 --- a/rclcpp/test/rclcpp/test_executor.cpp +++ b/rclcpp/test/rclcpp/test_executor.cpp @@ -15,17 +15,28 @@ #include #include +#include #include #include #include #include +#include +#include #include "rcl_interfaces/msg/parameter_event.hpp" +#include "rclcpp/callback_group.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/create_subscription.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/executor.hpp" -#include "rclcpp/memory_strategy.hpp" #include "rclcpp/executors/single_threaded_executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/memory_strategy.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/test_externally_defined_services.cpp b/rclcpp/test/rclcpp/test_externally_defined_services.cpp index 21a7d11142..b3727179c8 100644 --- a/rclcpp/test/rclcpp/test_externally_defined_services.cpp +++ b/rclcpp/test/rclcpp/test_externally_defined_services.cpp @@ -14,13 +14,15 @@ #include -#include +#include #include +#include +#include -#include "rclcpp/node.hpp" #include "rclcpp/any_service_callback.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/service.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" #include "rcl/service.h" diff --git a/rclcpp/test/rclcpp/test_find_weak_nodes.cpp b/rclcpp/test/rclcpp/test_find_weak_nodes.cpp index e1e1dbed16..bd27241e4b 100644 --- a/rclcpp/test/rclcpp/test_find_weak_nodes.cpp +++ b/rclcpp/test/rclcpp/test_find_weak_nodes.cpp @@ -23,7 +23,7 @@ RCPPUTILS_DEPRECATION_WARNING_OFF_START RCPPUTILS_DEPRECATION_WARNING_OFF_STOP #include "rclcpp/memory_strategy.hpp" #include "rclcpp/node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" RCPPUTILS_DEPRECATION_WARNING_OFF_START class TestFindWeakNodes : public ::testing::Test diff --git a/rclcpp/test/rclcpp/test_generic_client.cpp b/rclcpp/test/rclcpp/test_generic_client.cpp index 5a1aed09d3..41362ebbcd 100644 --- a/rclcpp/test/rclcpp/test_generic_client.cpp +++ b/rclcpp/test/rclcpp/test_generic_client.cpp @@ -16,14 +16,19 @@ #include #include -#include #include +#include +#include #include #include "rclcpp/create_generic_client.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/generic_client.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" #include "rclcpp/serialization.hpp" +#include "rclcpp/utilities.hpp" #include "rcl_interfaces/srv/list_parameters.hpp" diff --git a/rclcpp/test/rclcpp/test_generic_pubsub.cpp b/rclcpp/test/rclcpp/test_generic_pubsub.cpp index 498322334a..f1ad0f8b18 100644 --- a/rclcpp/test/rclcpp/test_generic_pubsub.cpp +++ b/rclcpp/test/rclcpp/test_generic_pubsub.cpp @@ -28,12 +28,19 @@ #include "rcl/graph.h" +#include "rclcpp/event_handler.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/executors/single_threaded_executor.hpp" #include "rclcpp/generic_publisher.hpp" #include "rclcpp/generic_subscription.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/qos.hpp" #include "rclcpp/serialization.hpp" #include "rclcpp/serialized_message.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" using namespace ::testing; // NOLINT using namespace rclcpp; // NOLINT diff --git a/rclcpp/test/rclcpp/test_generic_service.cpp b/rclcpp/test/rclcpp/test_generic_service.cpp index 5cbe11db05..73c6fa24e0 100644 --- a/rclcpp/test/rclcpp/test_generic_service.cpp +++ b/rclcpp/test/rclcpp/test_generic_service.cpp @@ -14,16 +14,27 @@ #include +#include #include #include #include +#include #include #include #include +#include #include +#include "rclcpp/client.hpp" +#include "rclcpp/duration.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/generic_service.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_graph_listener.cpp b/rclcpp/test/rclcpp/test_graph_listener.cpp index ecb2dfb4a7..2dd8050545 100644 --- a/rclcpp/test/rclcpp/test_graph_listener.cpp +++ b/rclcpp/test/rclcpp/test_graph_listener.cpp @@ -15,10 +15,16 @@ #include #include +#include + +#include "rclcpp/context.hpp" #include "rclcpp/contexts/default_context.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/graph_listener.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/node_interfaces/node_graph.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_interfaces/node_graph_interface.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_guard_condition.cpp b/rclcpp/test/rclcpp/test_guard_condition.cpp index c9fc138ccc..9b54efb0d6 100644 --- a/rclcpp/test/rclcpp/test_guard_condition.cpp +++ b/rclcpp/test/rclcpp/test_guard_condition.cpp @@ -14,9 +14,17 @@ #include +#include +#include #include - -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/context.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "../mocking_utils/patch.hpp" diff --git a/rclcpp/test/rclcpp/test_intra_process_buffer.cpp b/rclcpp/test/rclcpp/test_intra_process_buffer.cpp index 6a7f8ecdd1..1cd4d37bb6 100644 --- a/rclcpp/test/rclcpp/test_intra_process_buffer.cpp +++ b/rclcpp/test/rclcpp/test_intra_process_buffer.cpp @@ -18,7 +18,8 @@ #include "gtest/gtest.h" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/experimental/buffers/intra_process_buffer.hpp" +#include "rclcpp/experimental/buffers/ring_buffer_implementation.hpp" /* Constructor diff --git a/rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp b/rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp index 371fa7c8ff..cc311d2e35 100644 --- a/rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp +++ b/rclcpp/test/rclcpp/test_intra_process_manager_with_allocators.cpp @@ -15,16 +15,28 @@ #include #include +#include +#include #include #include +#include #include #include #include #include "test_msgs/msg/empty.hpp" -#include "rclcpp/rclcpp.hpp" #include "rclcpp/allocator/allocator_common.hpp" +#include "rclcpp/allocator/allocator_deleter.hpp" +#include "rclcpp/context.hpp" +#include "rclcpp/executor_options.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/message_memory_strategy.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" #include "rclcpp/subscription_traits.hpp" // For demonstration purposes only, not necessary for allocator_traits diff --git a/rclcpp/test/rclcpp/test_loaned_message.cpp b/rclcpp/test/rclcpp/test_loaned_message.cpp index 0623210079..725b027c2e 100644 --- a/rclcpp/test/rclcpp/test_loaned_message.cpp +++ b/rclcpp/test/rclcpp/test_loaned_message.cpp @@ -16,8 +16,12 @@ #include #include +#include + +#include "rclcpp/exceptions.hpp" #include "rclcpp/loaned_message.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/basic_types.hpp" diff --git a/rclcpp/test/rclcpp/test_logger_service.cpp b/rclcpp/test/rclcpp/test_logger_service.cpp index 49d09b5cb0..a96279bce1 100644 --- a/rclcpp/test/rclcpp/test_logger_service.cpp +++ b/rclcpp/test/rclcpp/test_logger_service.cpp @@ -17,12 +17,17 @@ #include #include #include +#include +#include #include -#include "rclcpp/rclcpp.hpp" -#include "rclcpp/node.hpp" #include "rcl_interfaces/srv/get_logger_levels.hpp" #include "rcl_interfaces/srv/set_logger_levels.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/test/rclcpp/test_node.cpp b/rclcpp/test/rclcpp/test_node.cpp index c94a6a543c..99b2852101 100644 --- a/rclcpp/test/rclcpp/test_node.cpp +++ b/rclcpp/test/rclcpp/test_node.cpp @@ -14,19 +14,33 @@ #include +#include #include #include #include #include #include #include +#include #include +#include #include #include +#include "rclcpp/callback_group.hpp" +#include "rclcpp/context.hpp" +#include "rclcpp/event.hpp" #include "rclcpp/exceptions.hpp" +#include "rclcpp/expand_topic_or_service_name.hpp" #include "rclcpp/node.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node_interfaces/node_graph_interface.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "rcpputils/filesystem_helper.hpp" #include "rcpputils/scope_exit.hpp" diff --git a/rclcpp/test/rclcpp/test_node_global_args.cpp b/rclcpp/test/rclcpp/test_node_global_args.cpp index c3b0726d66..e8c1273828 100644 --- a/rclcpp/test/rclcpp/test_node_global_args.cpp +++ b/rclcpp/test/rclcpp/test_node_global_args.cpp @@ -21,7 +21,7 @@ #include "rclcpp/exceptions.hpp" #include "rclcpp/node.hpp" #include "rclcpp/node_options.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" class TestNodeWithGlobalArgs : public ::testing::Test { diff --git a/rclcpp/test/rclcpp/test_parameter.cpp b/rclcpp/test/rclcpp/test_parameter.cpp index fd2abbec0e..bc1035c131 100644 --- a/rclcpp/test/rclcpp/test_parameter.cpp +++ b/rclcpp/test/rclcpp/test_parameter.cpp @@ -22,8 +22,10 @@ #include #include +#include "rclcpp/exceptions.hpp" #include "rclcpp/parameter.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" class TestParameter : public ::testing::Test { diff --git a/rclcpp/test/rclcpp/test_parameter_client.cpp b/rclcpp/test/rclcpp/test_parameter_client.cpp index d0fa5b20f9..f554f9f00e 100644 --- a/rclcpp/test/rclcpp/test_parameter_client.cpp +++ b/rclcpp/test/rclcpp/test_parameter_client.cpp @@ -14,6 +14,7 @@ #include +#include #include #include #include @@ -23,7 +24,17 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_client.hpp" +#include "rclcpp/parameter_map.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_parameter_event_handler.cpp b/rclcpp/test/rclcpp/test_parameter_event_handler.cpp index 149ba533c3..88f0a3db28 100644 --- a/rclcpp/test/rclcpp/test_parameter_event_handler.cpp +++ b/rclcpp/test/rclcpp/test_parameter_event_handler.cpp @@ -14,12 +14,21 @@ #include #include +#include #include +#include #include #include #include "gtest/gtest.h" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_event_handler.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/time.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/test/rclcpp/test_parameter_service.cpp b/rclcpp/test/rclcpp/test_parameter_service.cpp index 6df8d8a793..2aff8ecd0d 100644 --- a/rclcpp/test/rclcpp/test_parameter_service.cpp +++ b/rclcpp/test/rclcpp/test_parameter_service.cpp @@ -20,8 +20,13 @@ #include #include -#include "rclcpp/rclcpp.hpp" #include "../../src/rclcpp/parameter_service_names.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_client.hpp" +#include "rclcpp/parameter_descriptor_wrapper.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/utilities.hpp" using namespace std::chrono_literals; diff --git a/rclcpp/test/rclcpp/test_publisher.cpp b/rclcpp/test/rclcpp/test_publisher.cpp index dbc857e114..9e7a5d6ed0 100644 --- a/rclcpp/test/rclcpp/test_publisher.cpp +++ b/rclcpp/test/rclcpp/test_publisher.cpp @@ -14,17 +14,34 @@ #include -#include #include +#include +#include #include +#include #include #include #include #include "rcl/publisher.h" +#include "rclcpp/create_publisher.hpp" +#include "rclcpp/event_handler.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/intra_process_setting.hpp" +#include "rclcpp/loaned_message.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/qos_overriding_options.hpp" +#include "rclcpp/serialized_message.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "rcutils/env.h" diff --git a/rclcpp/test/rclcpp/test_publisher_subscription_count_api.cpp b/rclcpp/test/rclcpp/test_publisher_subscription_count_api.cpp index d2a01a8f57..659c4aca94 100644 --- a/rclcpp/test/rclcpp/test_publisher_subscription_count_api.cpp +++ b/rclcpp/test/rclcpp/test_publisher_subscription_count_api.cpp @@ -14,13 +14,17 @@ #include +#include #include #include #include +#include "rclcpp/context.hpp" #include "rclcpp/exceptions.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" #include "rclcpp/publisher.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/test_publisher_with_type_adapter.cpp b/rclcpp/test/rclcpp/test_publisher_with_type_adapter.cpp index 0522c35e04..edffd38e16 100644 --- a/rclcpp/test/rclcpp/test_publisher_with_type_adapter.cpp +++ b/rclcpp/test/rclcpp/test_publisher_with_type_adapter.cpp @@ -16,14 +16,24 @@ #include #include +#include #include +#include #include #include +#include #include #include "rclcpp/exceptions.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" #include "rclcpp/loaned_message.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/type_adapter.hpp" +#include "rclcpp/utilities.hpp" #include "rclcpp/msg/large_message.hpp" #include "rclcpp/msg/string.hpp" diff --git a/rclcpp/test/rclcpp/test_qos_event.cpp b/rclcpp/test/rclcpp/test_qos_event.cpp index 5cfa6b4d60..d817348262 100644 --- a/rclcpp/test/rclcpp/test_qos_event.cpp +++ b/rclcpp/test/rclcpp/test_qos_event.cpp @@ -19,10 +19,23 @@ #include #include #include +#include #include +#include -#include "rclcpp/rclcpp.hpp" #include "rcl/event.h" +#include "rclcpp/duration.hpp" +#include "rclcpp/event_handler.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "rcutils/logging.h" #include "rmw/rmw.h" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/test_qos_parameters.cpp b/rclcpp/test/rclcpp/test_qos_parameters.cpp index be9a12cb5e..e535a65142 100644 --- a/rclcpp/test/rclcpp/test_qos_parameters.cpp +++ b/rclcpp/test/rclcpp/test_qos_parameters.cpp @@ -14,13 +14,20 @@ #include #include +#include #include #include "gmock/gmock.h" -#include "rclcpp/rclcpp.hpp" -#include "rclcpp/qos_overriding_options.hpp" #include "rclcpp/detail/qos_parameters.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/qos_overriding_options.hpp" +#include "rclcpp/utilities.hpp" TEST(TestQosParameters, declare) { rclcpp::init(0, nullptr); diff --git a/rclcpp/test/rclcpp/test_rosout_subscription.cpp b/rclcpp/test/rclcpp/test_rosout_subscription.cpp index 08786a3fcb..da9a80f2c5 100644 --- a/rclcpp/test/rclcpp/test_rosout_subscription.cpp +++ b/rclcpp/test/rclcpp/test_rosout_subscription.cpp @@ -15,10 +15,18 @@ #include #include +#include #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/future_return_code.hpp" +#include "rclcpp/logger.hpp" +#include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "rcl_interfaces/msg/log.hpp" diff --git a/rclcpp/test/rclcpp/test_serialized_message.cpp b/rclcpp/test/rclcpp/test_serialized_message.cpp index 67a2d9b2be..b847687f77 100644 --- a/rclcpp/test/rclcpp/test_serialized_message.cpp +++ b/rclcpp/test/rclcpp/test_serialized_message.cpp @@ -19,9 +19,9 @@ #include #include +#include "rclcpp/exceptions.hpp" #include "rclcpp/serialization.hpp" #include "rclcpp/serialized_message.hpp" -#include "rclcpp/rclcpp.hpp" #include "rcpputils/asserts.hpp" diff --git a/rclcpp/test/rclcpp/test_serialized_message_allocator.cpp b/rclcpp/test/rclcpp/test_serialized_message_allocator.cpp index 78ab77a28f..f0e6d37044 100644 --- a/rclcpp/test/rclcpp/test_serialized_message_allocator.cpp +++ b/rclcpp/test/rclcpp/test_serialized_message_allocator.cpp @@ -17,7 +17,10 @@ #include #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/message_memory_strategy.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/utilities.hpp" #include "rcl/types.h" diff --git a/rclcpp/test/rclcpp/test_service.cpp b/rclcpp/test/rclcpp/test_service.cpp index fabfc5ae6c..d8a72bee61 100644 --- a/rclcpp/test/rclcpp/test_service.cpp +++ b/rclcpp/test/rclcpp/test_service.cpp @@ -14,13 +14,24 @@ #include +#include #include -#include +#include #include +#include +#include +#include #include +#include "rclcpp/any_service_callback.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/duration.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_service_introspection.cpp b/rclcpp/test/rclcpp/test_service_introspection.cpp index 1055adb420..6d56141031 100644 --- a/rclcpp/test/rclcpp/test_service_introspection.cpp +++ b/rclcpp/test/rclcpp/test_service_introspection.cpp @@ -15,16 +15,29 @@ #include #include +#include #include +#include #include +#include #include +#include +#include +#include #include "gmock/gmock.h" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" #include "rclcpp/exceptions.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/future_return_code.hpp" #include "rclcpp/logging.hpp" +#include "rclcpp/node.hpp" #include "rclcpp/node_options.hpp" #include "rclcpp/parameter.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_subscription.cpp b/rclcpp/test/rclcpp/test_subscription.cpp index c7dc473061..0ebc2824f0 100644 --- a/rclcpp/test/rclcpp/test_subscription.cpp +++ b/rclcpp/test/rclcpp/test_subscription.cpp @@ -24,9 +24,20 @@ #include #include +#include "rclcpp/create_subscription.hpp" +#include "rclcpp/event_handler.hpp" #include "rclcpp/exceptions.hpp" #include "rclcpp/executors/single_threaded_executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/intra_process_setting.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/serialized_message.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_subscription_content_filter.cpp b/rclcpp/test/rclcpp/test_subscription_content_filter.cpp index 1c10995822..26635d9b66 100644 --- a/rclcpp/test/rclcpp/test_subscription_content_filter.cpp +++ b/rclcpp/test/rclcpp/test_subscription_content_filter.cpp @@ -21,8 +21,16 @@ #include #include +#include "rclcpp/context.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" +#include "rclcpp/subscription.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/utilities.hpp" #include "rclcpp/wait_for_message.hpp" #include "../mocking_utils/patch.hpp" diff --git a/rclcpp/test/rclcpp/test_subscription_publisher_count_api.cpp b/rclcpp/test/rclcpp/test_subscription_publisher_count_api.cpp index 131bc98bff..9b9142f99d 100644 --- a/rclcpp/test/rclcpp/test_subscription_publisher_count_api.cpp +++ b/rclcpp/test/rclcpp/test_subscription_publisher_count_api.cpp @@ -14,12 +14,16 @@ #include +#include #include -#include #include +#include +#include "rclcpp/context.hpp" #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" diff --git a/rclcpp/test/rclcpp/test_subscription_publisher_with_same_type_adapter.cpp b/rclcpp/test/rclcpp/test_subscription_publisher_with_same_type_adapter.cpp index d733d9758b..b8bae50428 100644 --- a/rclcpp/test/rclcpp/test_subscription_publisher_with_same_type_adapter.cpp +++ b/rclcpp/test/rclcpp/test_subscription_publisher_with_same_type_adapter.cpp @@ -23,7 +23,12 @@ #include #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/type_adapter.hpp" +#include "rclcpp/utilities.hpp" #include "rclcpp/msg/string.hpp" #include "statistics_msgs/msg/statistic_data_point.hpp" diff --git a/rclcpp/test/rclcpp/test_subscription_with_type_adapter.cpp b/rclcpp/test/rclcpp/test_subscription_with_type_adapter.cpp index 8e74592f9e..68ebf62cf5 100644 --- a/rclcpp/test/rclcpp/test_subscription_with_type_adapter.cpp +++ b/rclcpp/test/rclcpp/test_subscription_with_type_adapter.cpp @@ -19,9 +19,17 @@ #include #include #include +#include #include "rclcpp/exceptions.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/message_info.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/subscription_base.hpp" +#include "rclcpp/type_adapter.hpp" +#include "rclcpp/utilities.hpp" #include "rclcpp/msg/string.hpp" diff --git a/rclcpp/test/rclcpp/test_time.cpp b/rclcpp/test/rclcpp/test_time.cpp index 8406de4efb..a83c16a73d 100644 --- a/rclcpp/test/rclcpp/test_time.cpp +++ b/rclcpp/test/rclcpp/test_time.cpp @@ -18,13 +18,18 @@ #include #include #include +#include #include #include #include "rcl/error_handling.h" #include "rcl/time.h" #include "rclcpp/clock.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/context.hpp" +#include "rclcpp/duration.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_client.hpp" #include "rclcpp/time.hpp" #include "rclcpp/time_source.hpp" #include "rclcpp/utilities.hpp" diff --git a/rclcpp/test/rclcpp/test_time_source.cpp b/rclcpp/test/rclcpp/test_time_source.cpp index e15964f722..7a24f09f24 100644 --- a/rclcpp/test/rclcpp/test_time_source.cpp +++ b/rclcpp/test/rclcpp/test_time_source.cpp @@ -16,16 +16,32 @@ #include #include +#include +#include #include #include +#include +#include #include +#include #include "rcl/error_handling.h" #include "rcl/time.h" #include "rclcpp/clock.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/duration.hpp" +#include "rclcpp/executors.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/parameter.hpp" +#include "rclcpp/parameter_client.hpp" +#include "rclcpp/parameter_value.hpp" +#include "rclcpp/publisher.hpp" +#include "rclcpp/qos.hpp" #include "rclcpp/time.hpp" #include "rclcpp/time_source.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_timer.cpp b/rclcpp/test/rclcpp/test_timer.cpp index 55c0722ae1..108ad4317e 100644 --- a/rclcpp/test/rclcpp/test_timer.cpp +++ b/rclcpp/test/rclcpp/test_timer.cpp @@ -18,12 +18,19 @@ #include #include #include +#include +#include #include #include "rcl/timer.h" +#include "rclcpp/clock.hpp" +#include "rclcpp/exceptions.hpp" #include "rclcpp/executors/single_threaded_executor.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/node_interfaces/get_node_base_interface.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "../mocking_utils/patch.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/test_type_support.cpp b/rclcpp/test/rclcpp/test_type_support.cpp index 682907e2a9..f742b2c971 100644 --- a/rclcpp/test/rclcpp/test_type_support.cpp +++ b/rclcpp/test/rclcpp/test_type_support.cpp @@ -16,8 +16,12 @@ #include -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher_base.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/qos.hpp" #include "rclcpp/type_support_decl.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" class TestTypeSupport : public ::testing::Test diff --git a/rclcpp/test/rclcpp/test_wait_set.cpp b/rclcpp/test/rclcpp/test_wait_set.cpp index 78e102f390..af78a28010 100644 --- a/rclcpp/test/rclcpp/test_wait_set.cpp +++ b/rclcpp/test/rclcpp/test_wait_set.cpp @@ -14,12 +14,27 @@ #include +#include #include +#include #include #include #include "rcl_interfaces/srv/list_parameters.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/context.hpp" +#include "rclcpp/event_handler.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/publisher_options.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" #include "test_msgs/msg/basic_types.hpp" #include "../utils/rclcpp_gtest_macros.hpp" diff --git a/rclcpp/test/rclcpp/topic_statistics/test_subscription_topic_statistics.cpp b/rclcpp/test/rclcpp/topic_statistics/test_subscription_topic_statistics.cpp index 439fc685e3..df7faf0f10 100644 --- a/rclcpp/test/rclcpp/topic_statistics/test_subscription_topic_statistics.cpp +++ b/rclcpp/test/rclcpp/topic_statistics/test_subscription_topic_statistics.cpp @@ -15,6 +15,8 @@ #include #include +#include +#include #include #include #include @@ -27,10 +29,17 @@ #include "libstatistics_collector/moving_average_statistics/types.hpp" #include "rclcpp/create_publisher.hpp" +#include "rclcpp/executors/single_threaded_executor.hpp" +#include "rclcpp/message_info.hpp" #include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/publisher.hpp" #include "rclcpp/qos.hpp" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/subscription.hpp" #include "rclcpp/subscription_options.hpp" +#include "rclcpp/time.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" #include "rclcpp/topic_statistics/subscription_topic_statistics.hpp" diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_dynamic_storage.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_dynamic_storage.cpp index d1d34ef980..2dfcd42cc0 100644 --- a/rclcpp/test/rclcpp/wait_set_policies/test_dynamic_storage.cpp +++ b/rclcpp/test/rclcpp/wait_set_policies/test_dynamic_storage.cpp @@ -14,12 +14,25 @@ #include +#include +#include #include +#include #include -#include "rclcpp/rclcpp.hpp" -#include "rclcpp/wait_set.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/intra_process_setting.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/subscription_wait_set_mask.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" +#include "rclcpp/waitable.hpp" #include "test_msgs/msg/empty.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp index 75a6175feb..a870e3cb56 100644 --- a/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp +++ b/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp @@ -14,12 +14,22 @@ #include +#include +#include #include +#include +#include -#include "rclcpp/rclcpp.hpp" +#include "../../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription_wait_set_mask.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" #include "rclcpp/wait_set.hpp" #include "rclcpp/wait_set_policies/static_storage.hpp" -#include "../../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/waitable.hpp" #include "test_msgs/msg/empty.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_storage_policy_common.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_storage_policy_common.cpp index 8de8901795..2eeea87ddb 100644 --- a/rclcpp/test/rclcpp/wait_set_policies/test_storage_policy_common.cpp +++ b/rclcpp/test/rclcpp/wait_set_policies/test_storage_policy_common.cpp @@ -14,12 +14,22 @@ #include +#include +#include #include +#include +#include -#include "rclcpp/rclcpp.hpp" -#include "rclcpp/wait_set.hpp" #include "../../mocking_utils/patch.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/exceptions.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/subscription_wait_set_mask.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_set.hpp" +#include "rclcpp/waitable.hpp" #include "test_msgs/msg/empty.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp index e93553a40c..1baa7b3b67 100644 --- a/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp +++ b/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp @@ -14,12 +14,25 @@ #include +#include +#include #include +#include #include -#include "rclcpp/rclcpp.hpp" -#include "rclcpp/wait_set.hpp" #include "../../utils/rclcpp_gtest_macros.hpp" +#include "rclcpp/client.hpp" +#include "rclcpp/guard_condition.hpp" +#include "rclcpp/intra_process_setting.hpp" +#include "rclcpp/node.hpp" +#include "rclcpp/service.hpp" +#include "rclcpp/subscription_options.hpp" +#include "rclcpp/subscription_wait_set_mask.hpp" +#include "rclcpp/timer.hpp" +#include "rclcpp/utilities.hpp" +#include "rclcpp/wait_result_kind.hpp" +#include "rclcpp/wait_set.hpp" +#include "rclcpp/waitable.hpp" #include "test_msgs/msg/empty.hpp" #include "test_msgs/srv/empty.hpp" diff --git a/rclcpp/test/rclcpp/waitables/test_intra_process_waitable.cpp b/rclcpp/test/rclcpp/waitables/test_intra_process_waitable.cpp index 723e80513b..875c6b5ea5 100644 --- a/rclcpp/test/rclcpp/waitables/test_intra_process_waitable.cpp +++ b/rclcpp/test/rclcpp/waitables/test_intra_process_waitable.cpp @@ -14,7 +14,11 @@ #include -#include "rclcpp/rclcpp.hpp" +#include + +#include "rclcpp/node.hpp" +#include "rclcpp/node_options.hpp" +#include "rclcpp/utilities.hpp" #include "test_msgs/msg/empty.hpp" #include "./waitable_test_helpers.hpp" diff --git a/rclcpp/test/utils/test_rclcpp_gtest_macros.cpp b/rclcpp/test/utils/test_rclcpp_gtest_macros.cpp index 2c3b3ff20b..34f76ac673 100644 --- a/rclcpp/test/utils/test_rclcpp_gtest_macros.cpp +++ b/rclcpp/test/utils/test_rclcpp_gtest_macros.cpp @@ -14,15 +14,17 @@ #include +#include #include #include +#include #include #include "./rclcpp_gtest_macros.hpp" #include "rcl/rcl.h" -#include "rclcpp/rclcpp.hpp" +#include "rclcpp/exceptions.hpp" struct NonStandardThrowable {