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

use rmw_enclave_options_xxx APIs instead. #247

Open
wants to merge 1 commit into
base: rolling
Choose a base branch
from
Open

use rmw_enclave_options_xxx APIs instead. #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@ class TestClient : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_init_options_t init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_init_options_fini(&init_options);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
12 changes: 8 additions & 4 deletions test_rmw_implementation/test/test_create_destroy_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ class TestNodeConstructionDestruction : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", options.enclave);
context = rmw_get_zero_initialized_context();
ret = rmw_init(&options, &context);
Expand Down Expand Up @@ -133,10 +135,12 @@ class TestLocalhostNodeConstructionDestruction : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", options.enclave);
options.discovery_options.automatic_discovery_range = RMW_AUTOMATIC_DISCOVERY_RANGE_LOCALHOST;
context = rmw_get_zero_initialized_context();
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_duration_infinite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ class TestDurationInfinite : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
context = rmw_get_zero_initialized_context();
ret = rmw_init(&init_options, &context);
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ class TestEvent : public ::testing::Test
protected:
void SetUp() override
{
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_graph_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,17 @@ class TestGraphAPI : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_init_options_t init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_init_options_fini(&init_options);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_init_shutdown.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ class TestInitShutdown : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", options.enclave);
}

Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ class TestPublisher : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
context = rmw_get_zero_initialized_context();
ret = rmw_init(&init_options, &context);
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ class TestService : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_init_options_t init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_init_options_fini(&init_options);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_subscription.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ class TestSubscription : public ::testing::Test
protected:
void SetUp() override
{
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_unique_identifiers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,17 @@ class TestUniqueIdentifierAPI : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_init_options_t init_options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&init_options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&init_options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_init_options_fini(&init_options);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
init_options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &init_options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", init_options.enclave);
ret = rmw_init(&init_options, &context);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
Expand Down
6 changes: 4 additions & 2 deletions test_rmw_implementation/test/test_wait_set.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ class TestWaitSet : public ::testing::Test
protected:
void SetUp() override
{
rcutils_allocator_t allocator = rcutils_get_default_allocator();
rmw_init_options_t options = rmw_get_zero_initialized_init_options();
rmw_ret_t ret = rmw_init_options_init(&options, rcutils_get_default_allocator());
rmw_ret_t ret = rmw_init_options_init(&options, allocator);
ASSERT_EQ(RMW_RET_OK, ret) << rcutils_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
rmw_ret_t ret = rmw_init_options_fini(&options);
EXPECT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
});
options.enclave = rcutils_strdup("/", rcutils_get_default_allocator());
ret = rmw_enclave_options_copy("/", &allocator, &options.enclave);
ASSERT_EQ(RMW_RET_OK, ret) << rmw_get_error_string().str;
ASSERT_STREQ("/", options.enclave);
context = rmw_get_zero_initialized_context();
ret = rmw_init(&options, &context);
Expand Down