From b55c41b8a877508f69a39daf8f0f8d9e551c69e8 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Fri, 4 Aug 2023 14:06:01 -0400 Subject: [PATCH] Reset errors in tests to reduce warnings (#1085) * Clear out the error after trying to reinitialize timer. This gets rid of a warning. Signed-off-by: Chris Lalancette * Clear out errors in init tests. Signed-off-by: Chris Lalancette * Make sure to reset errors after they occur in discovery options. Signed-off-by: Chris Lalancette * Reset errors after failure in type description tests. Signed-off-by: Chris Lalancette --------- Signed-off-by: Chris Lalancette --- rcl/test/rcl/test_discovery_options.cpp | 3 +++ rcl/test/rcl/test_init.cpp | 4 ++++ rcl/test/rcl/test_timer.cpp | 1 + rcl/test/rcl/test_type_description_conversions.cpp | 5 +++++ 4 files changed, 13 insertions(+) diff --git a/rcl/test/rcl/test_discovery_options.cpp b/rcl/test/rcl/test_discovery_options.cpp index fc1a9556c..1e2a806e4 100644 --- a/rcl/test/rcl/test_discovery_options.cpp +++ b/rcl/test/rcl/test_discovery_options.cpp @@ -209,12 +209,15 @@ TEST(TestDiscoveryInfo, test_bad_argument) { rcutils_allocator_t allocator = rcutils_get_default_allocator(); EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, rcl_get_automatic_discovery_range(nullptr)); + rcl_reset_error(); EXPECT_EQ(RCL_RET_INVALID_ARGUMENT, rcl_get_discovery_static_peers(nullptr, &allocator)); + rcl_reset_error(); rmw_discovery_options_t discovery_options_var = rmw_get_zero_initialized_discovery_options(); EXPECT_EQ( RCL_RET_INVALID_ARGUMENT, rcl_get_discovery_static_peers(&discovery_options_var, nullptr)); + rcl_reset_error(); EXPECT_EQ(RCL_RET_OK, rmw_discovery_options_fini(&discovery_options_var)); } diff --git a/rcl/test/rcl/test_init.cpp b/rcl/test/rcl/test_init.cpp index f62f68b9f..f40e015e2 100644 --- a/rcl/test/rcl/test_init.cpp +++ b/rcl/test/rcl/test_init.cpp @@ -469,12 +469,16 @@ TEST_F(CLASSNAME(TestRCLFixture, RMW_IMPLEMENTATION), test_rcl_init_options_acce EXPECT_EQ(0u, options->instance_id); EXPECT_EQ(nullptr, options->impl); EXPECT_EQ(NULL, rcl_init_options_get_rmw_init_options(nullptr)); + rcl_reset_error(); EXPECT_EQ(NULL, rcl_init_options_get_rmw_init_options(¬_ini_init_options)); + rcl_reset_error(); const rcl_allocator_t * options_allocator = rcl_init_options_get_allocator(&init_options); EXPECT_TRUE(rcutils_allocator_is_valid(options_allocator)); EXPECT_EQ(NULL, rcl_init_options_get_allocator(nullptr)); + rcl_reset_error(); EXPECT_EQ(NULL, rcl_init_options_get_allocator(¬_ini_init_options)); + rcl_reset_error(); size_t domain_id; ret = rcl_init_options_get_domain_id(NULL, &domain_id); diff --git a/rcl/test/rcl/test_timer.cpp b/rcl/test/rcl/test_timer.cpp index 636e3aa2d..d7b91bcda 100644 --- a/rcl/test/rcl/test_timer.cpp +++ b/rcl/test/rcl/test_timer.cpp @@ -523,6 +523,7 @@ TEST_F(TestTimerFixture, test_timer_init_state) { &timer, &clock, this->context_ptr, RCL_S_TO_NS(1), nullptr, rcl_get_default_allocator(), true); ASSERT_EQ(RCL_RET_ALREADY_INIT, ret) << rcl_get_error_string().str; + rcl_reset_error(); timer = rcl_get_zero_initialized_timer(); diff --git a/rcl/test/rcl/test_type_description_conversions.cpp b/rcl/test/rcl/test_type_description_conversions.cpp index 71a698f91..8b9ccb3d1 100644 --- a/rcl/test/rcl/test_type_description_conversions.cpp +++ b/rcl/test/rcl/test_type_description_conversions.cpp @@ -14,6 +14,7 @@ #include +#include "rcl/error_handling.h" #include "rcl/type_description_conversions.h" #include "rosidl_runtime_c/message_type_support_struct.h" #include "rosidl_runtime_c/type_description/type_description__functions.h" @@ -45,7 +46,9 @@ TEST(TestTypeDescriptionConversions, type_description_conversion_round_trip) { TEST(TestTypeDescriptionConversions, type_description_invalid_input) { EXPECT_TRUE(NULL == rcl_convert_type_description_runtime_to_msg(NULL)); + rcl_reset_error(); EXPECT_TRUE(NULL == rcl_convert_type_description_msg_to_runtime(NULL)); + rcl_reset_error(); } TEST(TestTypeDescriptionConversions, type_source_sequence_conversion_round_trip) { @@ -101,7 +104,9 @@ TEST(TestTypeDescriptionConversions, actually_empty_sources_ok) { TEST(TestTypeDescriptionConversions, type_source_sequence_invalid_input) { EXPECT_TRUE(NULL == rcl_convert_type_source_sequence_msg_to_runtime(NULL)); + rcl_reset_error(); EXPECT_TRUE(NULL == rcl_convert_type_source_sequence_runtime_to_msg(NULL)); + rcl_reset_error(); } int main(int argc, char ** argv)