diff --git a/rcl/test/rcl/test_expand_topic_name.cpp b/rcl/test/rcl/test_expand_topic_name.cpp index 308fbed68..8ec900a93 100644 --- a/rcl/test/rcl/test_expand_topic_name.cpp +++ b/rcl/test/rcl/test_expand_topic_name.cpp @@ -226,6 +226,9 @@ TEST(test_expand_topic_name, internal_error) { EXPECT_TRUE(rcl_error_is_set()); rcl_reset_error(); } + + ret = rcutils_string_map_fini(&subs); + ASSERT_EQ(RCL_RET_OK, ret); } TEST(test_expand_topic_name, various_valid_topics) { diff --git a/rcl/test/rcl/test_get_node_names.cpp b/rcl/test/rcl/test_get_node_names.cpp index 734dc1d4a..80a0da47c 100644 --- a/rcl/test/rcl/test_get_node_names.cpp +++ b/rcl/test/rcl/test_get_node_names.cpp @@ -279,6 +279,9 @@ TEST_F( ret = rcutils_string_array_fini(&node_namespaces); ASSERT_EQ(RCUTILS_RET_OK, ret); + ret = rcutils_string_array_fini(&enclaves); + ASSERT_EQ(RCUTILS_RET_OK, ret); + ret = rcl_node_fini(&node1); EXPECT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str; diff --git a/rcl/test/rcl/test_graph.cpp b/rcl/test/rcl/test_graph.cpp index 6d8d83a2f..ad95b5133 100644 --- a/rcl/test/rcl/test_graph.cpp +++ b/rcl/test/rcl/test_graph.cpp @@ -1435,6 +1435,10 @@ TEST_F(CLASSNAME(TestGraphFixture, RMW_IMPLEMENTATION), test_bad_get_node_names) EXPECT_EQ(RCUTILS_RET_OK, ret); ret = rcutils_string_array_fini(&node_namespaces); EXPECT_EQ(RCUTILS_RET_OK, ret); + ret = rcutils_string_array_fini(&node_names_2); + EXPECT_EQ(RCUTILS_RET_OK, ret); + ret = rcutils_string_array_fini(&node_namespaces_2); + EXPECT_EQ(RCUTILS_RET_OK, ret); ret = rcutils_string_array_fini(&node_enclaves); EXPECT_EQ(RCUTILS_RET_OK, ret); }); diff --git a/rcl/test/rcl/test_log_level.cpp b/rcl/test/rcl/test_log_level.cpp index fbbe51944..a53a3eab2 100644 --- a/rcl/test/rcl/test_log_level.cpp +++ b/rcl/test/rcl/test_log_level.cpp @@ -274,6 +274,10 @@ TEST(TestLogLevel, logger_log_level_copy) { // Expected usage rcl_log_levels_t copied_log_levels = rcl_get_zero_initialized_log_levels(); EXPECT_EQ(RCL_RET_OK, rcl_log_levels_copy(&log_levels, &copied_log_levels)); + OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT( + { + EXPECT_EQ(RCL_RET_OK, rcl_log_levels_fini(&copied_log_levels)); + }); EXPECT_EQ(RCUTILS_LOG_SEVERITY_UNSET, copied_log_levels.default_logger_level); EXPECT_EQ(log_levels.default_logger_level, copied_log_levels.default_logger_level); EXPECT_EQ(1ul, copied_log_levels.num_logger_settings); diff --git a/rcl/test/rcl/test_security.cpp b/rcl/test/rcl/test_security.cpp index cea6b00e4..688e37cdd 100644 --- a/rcl/test/rcl/test_security.cpp +++ b/rcl/test/rcl/test_security.cpp @@ -257,6 +257,7 @@ TEST_F(TestGetSecureRoot, test_get_security_options) { TEST_RESOURCES_DIRECTORY TEST_SECURITY_DIRECTORY_RESOURCES_DIR_NAME PATH_SEPARATOR "enclaves" PATH_SEPARATOR TEST_ENCLAVE, options.security_root_path); + EXPECT_EQ(RMW_RET_OK, rmw_security_options_fini(&options, &allocator)); } TEST_F(TestGetSecureRoot, test_rcl_security_enabled) { diff --git a/rcl/test/rcl/test_service.cpp b/rcl/test/rcl/test_service.cpp index 9ec820f8c..b4f6df67c 100644 --- a/rcl/test/rcl/test_service.cpp +++ b/rcl/test/rcl/test_service.cpp @@ -537,6 +537,10 @@ TEST_F(CLASSNAME(TestServiceFixture, RMW_IMPLEMENTATION), test_fail_take_request test_msgs__srv__BasicTypes_Request service_request; test_msgs__srv__BasicTypes_Request__init(&service_request); + OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT( + { + test_msgs__srv__BasicTypes_Request__fini(&service_request); + }); rmw_service_info_t header; ret = rcl_take_request_with_info(nullptr, &header, &service_request);