Skip to content

Commit 37643ea

Browse files
committed
Enable callback group tests for connextdds
Signed-off-by: Christopher Wecht <[email protected]>
1 parent d7fdb61 commit 37643ea

File tree

1 file changed

+0
-63
lines changed

1 file changed

+0
-63
lines changed

rclcpp/test/rclcpp/test_add_callback_groups_to_executor.cpp

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ TYPED_TEST_SUITE(TestAddCallbackGroupsToExecutorStable, StandardExecutors, Execu
9999
TYPED_TEST(TestAddCallbackGroupsToExecutor, add_callback_groups)
100100
{
101101
using ExecutorType = TypeParam;
102-
// rmw_connextdds doesn't support events-executor
103-
if (
104-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
105-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
106-
{
107-
GTEST_SKIP();
108-
}
109102

110103
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
111104
auto timer_callback = []() {};
@@ -155,13 +148,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, add_callback_groups)
155148
TYPED_TEST(TestAddCallbackGroupsToExecutor, remove_callback_groups)
156149
{
157150
using ExecutorType = TypeParam;
158-
// rmw_connextdds doesn't support events-executor
159-
if (
160-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
161-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
162-
{
163-
GTEST_SKIP();
164-
}
165151

166152
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
167153
auto timer_callback = []() {};
@@ -193,13 +179,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, remove_callback_groups)
193179
TYPED_TEST(TestAddCallbackGroupsToExecutor, add_duplicate_callback_groups)
194180
{
195181
using ExecutorType = TypeParam;
196-
// rmw_connextdds doesn't support events-executor
197-
if (
198-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
199-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
200-
{
201-
GTEST_SKIP();
202-
}
203182

204183
ExecutorType executor;
205184
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
@@ -220,13 +199,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, add_duplicate_callback_groups)
220199
TYPED_TEST(TestAddCallbackGroupsToExecutor, add_callback_groups_after_add_node_to_executor)
221200
{
222201
using ExecutorType = TypeParam;
223-
// rmw_connextdds doesn't support events-executor
224-
if (
225-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
226-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
227-
{
228-
GTEST_SKIP();
229-
}
230202

231203
ExecutorType executor;
232204
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
@@ -263,13 +235,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, add_callback_groups_after_add_node_t
263235
TYPED_TEST(TestAddCallbackGroupsToExecutor, add_unallowable_callback_groups)
264236
{
265237
using ExecutorType = TypeParam;
266-
// rmw_connextdds doesn't support events-executor
267-
if (
268-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
269-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
270-
{
271-
GTEST_SKIP();
272-
}
273238

274239
ExecutorType executor;
275240
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
@@ -307,13 +272,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, add_unallowable_callback_groups)
307272
TYPED_TEST(TestAddCallbackGroupsToExecutor, one_node_many_callback_groups_many_executors)
308273
{
309274
using ExecutorType = TypeParam;
310-
// rmw_connextdds doesn't support events-executor
311-
if (
312-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
313-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
314-
{
315-
GTEST_SKIP();
316-
}
317275

318276
ExecutorType timer_executor;
319277
ExecutorType sub_executor;
@@ -355,13 +313,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutor, one_node_many_callback_groups_many_e
355313
TYPED_TEST(TestAddCallbackGroupsToExecutorStable, subscriber_triggered_to_receive_message)
356314
{
357315
using ExecutorType = TypeParam;
358-
// rmw_connextdds doesn't support events-executor
359-
if (
360-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
361-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
362-
{
363-
GTEST_SKIP();
364-
}
365316

366317
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
367318

@@ -428,13 +379,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutorStable, subscriber_triggered_to_receiv
428379
TYPED_TEST(TestAddCallbackGroupsToExecutorStable, callback_group_create_after_spin)
429380
{
430381
using ExecutorType = TypeParam;
431-
// rmw_connextdds doesn't support events-executor
432-
if (
433-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
434-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
435-
{
436-
GTEST_SKIP();
437-
}
438382

439383
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");
440384

@@ -481,13 +425,6 @@ TYPED_TEST(TestAddCallbackGroupsToExecutorStable, callback_group_create_after_sp
481425
TYPED_TEST(TestAddCallbackGroupsToExecutor, remove_callback_group)
482426
{
483427
using ExecutorType = TypeParam;
484-
// rmw_connextdds doesn't support events-executor
485-
if (
486-
std::is_same<ExecutorType, rclcpp::experimental::executors::EventsExecutor>() &&
487-
std::string(rmw_get_implementation_identifier()).find("rmw_connextdds") == 0)
488-
{
489-
GTEST_SKIP();
490-
}
491428

492429
ExecutorType executor;
493430
auto node = std::make_shared<rclcpp::Node>("my_node", "/ns");

0 commit comments

Comments
 (0)