Skip to content
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.

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

updates since changes to message_info in rclcpp #423

Merged
merged 1 commit into from Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -44,11 +44,11 @@ TEST(
int counter = 0;
auto callback =
[&counter](test_rclcpp::msg::UInt32::ConstSharedPtr msg,
const rmw_message_info_t & info) -> void
const rclcpp::MessageInfo & info) -> void
wjwwood marked this conversation as resolved.
Show resolved Hide resolved
{
++counter;
printf(" callback() %d with message data %u\n", counter, msg->data);
ASSERT_FALSE(info.from_intra_process);
ASSERT_FALSE(info.get_rmw_message_info().from_intra_process);
};
auto qos = rclcpp::QoS(rclcpp::KeepLast(10)).avoid_ros_namespace_conventions(true);
auto create_subscription_func =
@@ -47,14 +47,14 @@ TEST(CLASSNAME(test_intra_process_within_one_node, RMW_IMPLEMENTATION), nominal_
auto callback =
[&counter](
const test_rclcpp::msg::UInt32::SharedPtr msg,
const rmw_message_info_t & message_info
const rclcpp::MessageInfo & message_info
) -> void
{
++counter;
printf(" callback() %d with message data %u\n", counter, msg->data);
ASSERT_GE(counter, 0);
ASSERT_EQ(static_cast<unsigned int>(counter), msg->data);
ASSERT_TRUE(message_info.from_intra_process);
ASSERT_TRUE(message_info.get_rmw_message_info().from_intra_process);
};

test_rclcpp::msg::UInt32 msg;
@@ -60,11 +60,11 @@ static inline void multi_consumer_pub_sub_test(bool intra_process)

auto callback =
[&counter, &intra_process](test_rclcpp::msg::UInt32::ConstSharedPtr msg,
const rmw_message_info_t & info) -> void
const rclcpp::MessageInfo & info) -> void
{
counter.fetch_add(1);
printf("callback() %d with message data %u\n", counter.load(), msg->data);
ASSERT_EQ(intra_process, info.from_intra_process);
ASSERT_EQ(intra_process, info.get_rmw_message_info().from_intra_process);
};

// Try to saturate the MultithreadedExecutor's thread pool with subscriptions
@@ -41,11 +41,11 @@ TEST(CLASSNAME(test_publisher, RMW_IMPLEMENTATION), publish_with_const_reference
int counter = 0;
auto callback =
[&counter](test_rclcpp::msg::UInt32::ConstSharedPtr msg,
const rmw_message_info_t & info) -> void
const rclcpp::MessageInfo & info) -> void
{
++counter;
printf(" callback() %d with message data %u\n", counter, msg->data);
ASSERT_FALSE(info.from_intra_process);
ASSERT_FALSE(info.get_rmw_message_info().from_intra_process);
};
auto create_subscription_func =
[&callback](
@@ -291,11 +291,11 @@ TEST(CLASSNAME(test_subscription, RMW_IMPLEMENTATION), subscription_shared_ptr_c
int counter = 0;
auto callback =
[&counter](test_rclcpp::msg::UInt32::ConstSharedPtr msg,
const rmw_message_info_t & info) -> void
const rclcpp::MessageInfo & info) -> void
{
++counter;
printf(" callback() %d with message data %u\n", counter, msg->data);
ASSERT_FALSE(info.from_intra_process);
ASSERT_FALSE(info.get_rmw_message_info().from_intra_process);
};
auto create_subscription_func =
[&callback](