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.

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

Fix a leak in test_array_list.cpp #149

Merged
merged 3 commits into from
Apr 16, 2019
Merged

Fix a leak in test_array_list.cpp #149

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31aae00
Fix a leak in test_array_list.cpp
Apr 10, 2019
bf29a32
Remove TearDown from fixture
Apr 11, 2019
19c915f
Assert in TearDown if finalization fails
Apr 12, 2019
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
30 changes: 17 additions & 13 deletions test/test_array_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,36 @@ class ArrayListTest : public ::testing::Test
protected:
void SetUp() override
{
// Reset rcutils error to prevent failure from a previous test case to contaminate
// another one.
rcutils_reset_error();

allocator = rcutils_get_default_allocator();
list = rcutils_get_zero_initialized_array_list();
rcutils_reset_error();
}

// void TearDown() override {}

rcutils_allocator_t allocator;
rcutils_array_list_t list;
};

// This fixture is used for test that want the list pre initialized
class ArrayListPreInitTest : public ::testing::Test
class ArrayListPreInitTest : public ArrayListTest
{
protected:
void SetUp() override
{
allocator = rcutils_get_default_allocator();
list = rcutils_get_zero_initialized_array_list();
rcutils_ret_t ret = rcutils_array_list_init(&list, 2, sizeof(uint32_t), &allocator);
ArrayListTest::SetUp();
const rcutils_ret_t ret = rcutils_array_list_init(&list, 2, sizeof(uint32_t), &allocator);
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
rcutils_reset_error();
}

void TearDown() override
{
rcutils_ret_t ret = rcutils_array_list_fini(&list);
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
// If the test fails, the test may exit before the list has been initialized
// so we allow rcutils_array_list_fini to fail if the list is not initialized.
const rcutils_ret_t ret = rcutils_array_list_fini(&list);
EXPECT_TRUE(ret == RCUTILS_RET_OK || ret == RCUTILS_RET_NOT_INITIALIZED);
}

rcutils_allocator_t allocator;
rcutils_array_list_t list;
};

TEST_F(ArrayListTest, init_list_null_fails) {
Expand All @@ -85,6 +83,9 @@ TEST_F(ArrayListTest, init_null_allocator_fails) {
TEST_F(ArrayListTest, init_success) {
rcutils_ret_t ret = rcutils_array_list_init(&list, 2, sizeof(uint32_t), &allocator);
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;

ret = rcutils_array_list_fini(&list);
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
}

TEST_F(ArrayListTest, fini_list_null) {
Expand Down Expand Up @@ -318,6 +319,9 @@ TEST_F(ArrayListTest, add_grow_capacity) {
ret = rcutils_array_list_get(&list, i, &ret_data);
EXPECT_EQ((i * 2), ret_data) << rcutils_get_error_string().str;
}

ret = rcutils_array_list_fini(&list);
EXPECT_EQ(RCUTILS_RET_OK, ret) << rcutils_get_error_string().str;
}

TEST_F(ArrayListPreInitTest, remove_preserves_data_around_it) {
Expand Down