From 82d7ae702fc293481999012f82fa94b634969504 Mon Sep 17 00:00:00 2001 From: Jorge Perez Date: Mon, 14 Sep 2020 13:04:21 -0300 Subject: [PATCH] Improve test readability Signed-off-by: Jorge Perez --- rclcpp/test/rclcpp/test_type_support.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/rclcpp/test/rclcpp/test_type_support.cpp b/rclcpp/test/rclcpp/test_type_support.cpp index bd962e615e..8e30b98a38 100644 --- a/rclcpp/test/rclcpp/test_type_support.cpp +++ b/rclcpp/test/rclcpp/test_type_support.cpp @@ -39,18 +39,14 @@ class TestTypeSupport : public ::testing::Test { rcl_service_t service_handle = rcl_get_zero_initialized_service(); rcl_service_options_t service_options = rcl_service_get_default_options(); + auto node_handle = node->get_node_base_interface()->get_rcl_node_handle(); rcl_ret_t ret = rcl_service_init( - &service_handle, - node->get_node_base_interface()->get_rcl_node_handle(), - ts, "base_node_service", &service_options); + &service_handle, node_handle, ts, "base_node_service", &service_options); if (ret != RCL_RET_OK) { return ::testing::AssertionFailure() << "Failed rcl_service_init with error string: " << rcl_get_error_string().str; } - EXPECT_EQ( - RCL_RET_OK, rcl_service_fini( - &service_handle, - node->get_node_base_interface()->get_rcl_node_handle())); + ret = rcl_service_fini(&service_handle, node_handle); if (ret != RCL_RET_OK) { return ::testing::AssertionFailure() << "Failed rcl_service_fini with error string: " << rcl_get_error_string().str;