diff --git a/rclcpp/test/rclcpp/executors/test_static_executor_entities_collector.cpp b/rclcpp/test/rclcpp/executors/test_static_executor_entities_collector.cpp index e39589c3c6..5b20c6b201 100644 --- a/rclcpp/test/rclcpp/executors/test_static_executor_entities_collector.cpp +++ b/rclcpp/test/rclcpp/executors/test_static_executor_entities_collector.cpp @@ -267,7 +267,7 @@ TEST_F(TestStaticExecutorEntitiesCollector, add_remove_node_with_entities) { auto client = node->create_client("service"); auto waitable = std::make_shared(); - // Adding a subscription with rmw_connext_cpp adds another waitable, so we need to get the + // Adding a subscription could add another waitable, so we need to get the // current number of waitables just before adding the new waitable. expected_number_of_entities->waitables = get_number_of_default_entities(node)->waitables; node->get_node_waitables_interface()->add_waitable(waitable, nullptr); diff --git a/rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp b/rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp index b401d6d046..b0951c9218 100644 --- a/rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp +++ b/rclcpp/test/rclcpp/strategies/test_allocator_memory_strategy.cpp @@ -511,10 +511,7 @@ TEST_F(TestAllocatorMemoryStrategy, number_of_entities_with_subscription) { RclWaitSetSizes expected_sizes = {}; expected_sizes.size_of_subscriptions = 1; const std::string implementation_identifier = rmw_get_implementation_identifier(); - // TODO(asorbini): Remove Connext exception once ros2/rmw_connext is deprecated. - if (implementation_identifier == "rmw_connext_cpp" || - implementation_identifier == "rmw_cyclonedds_cpp") - { + if (implementation_identifier == "rmw_cyclonedds_cpp") { // For cyclonedds, a subscription will also add an event and waitable expected_sizes.size_of_events += 1; expected_sizes.size_of_waitables += 1;