Skip to content

Wait for publisher and subscription to match #1777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobperron merged 1 commit into from
Oct 20, 2021
Merged

Wait for publisher and subscription to match #1777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion rclcpp/test/rclcpp/test_subscription_with_type_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ class CLASSNAME (test_intra_process_within_one_node, RMW_IMPLEMENTATION) : publi
public:
static void SetUpTestCase()
{
rclcpp::init(0, nullptr);
if (!rclcpp::ok()) {
rclcpp::init(0, nullptr);
}
Comment on lines +80 to +82
Copy link
Member Author

@jacobperron jacobperron Oct 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed an exception being thrown here because rclcpp::init() is already being called at L57, so I added this guard.

}

static void TearDownTestCase()
Expand Down Expand Up @@ -128,6 +130,20 @@ void wait_for_message_to_be_received(
executor.spin_once(g_sleep_per_loop);
}
}

bool wait_for_match(
const std::shared_ptr<rclcpp::SubscriptionBase> sub,
const std::shared_ptr<rclcpp::PublisherBase> pub)
{
int i = 0;
bool matched = false;
while (!matched && i < g_max_loops) {
matched = sub->get_publisher_count() > 0 && pub->get_subscription_count() > 0;
std::this_thread::sleep_for(g_sleep_per_loop);
}
return matched;
}

/*
* Testing publisher creation signatures with a type adapter.
*/
Expand Down Expand Up @@ -175,6 +191,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -191,6 +208,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -206,6 +224,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), (*msg).c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -222,6 +241,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -237,6 +257,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), (*msg).c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -253,6 +274,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -268,6 +290,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg.data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -284,6 +307,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -299,6 +323,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg->data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -315,6 +340,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -330,6 +356,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg->data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -346,6 +373,7 @@ TEST_F(
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand Down Expand Up @@ -381,6 +409,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -398,6 +427,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -413,6 +443,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), (*msg).c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -430,6 +461,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -445,6 +477,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), (*msg).c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -461,6 +494,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -476,6 +510,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg.data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -492,6 +527,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -507,6 +543,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg->data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -523,6 +560,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -538,6 +576,7 @@ TEST_F(
ASSERT_STREQ(message_data.c_str(), msg->data.c_str());
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand All @@ -554,6 +593,7 @@ TEST_F(
ASSERT_FALSE(message_info.get_rmw_message_info().from_intra_process);
};
auto sub = node->create_subscription<StringTypeAdapter>(topic_name, 1, callback);
ASSERT_TRUE(wait_for_match(sub, pub));
pub->publish(msg);
ASSERT_FALSE(is_received);
wait_for_message_to_be_received(is_received, node);
Expand Down