Skip to content

transition start and goal states can be null #662

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

Merged
Karsten1987 merged 2 commits into from
May 27, 2020
Merged

transition start and goal states can be null #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9abc7e
transition start and goal states can be null
Karsten1987 May 27, 2020
93dd1ad
correct tests
Karsten1987 May 27, 2020
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
10 changes: 0 additions & 10 deletions rcl_lifecycle/src/rcl_lifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,6 @@ rcl_lifecycle_transition_init(
return RCL_RET_ERROR;
}

if (!start) {
RCL_SET_ERROR_MSG("start state pointer is null\n");
return RCL_RET_ERROR;
}

if (!goal) {
RCL_SET_ERROR_MSG("goal state pointer is null\n");
return RCL_RET_ERROR;
}

transition->start = start;
transition->goal = goal;

Expand Down
4 changes: 2 additions & 2 deletions rcl_lifecycle/test/test_rcl_lifecycle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ TEST(TestRclLifecycle, lifecycle_transition) {

ret = rcl_lifecycle_transition_init(
&transition, expected_id, &expected_label[0], nullptr, nullptr, &allocator);
EXPECT_EQ(ret, RCL_RET_ERROR);
EXPECT_EQ(ret, RCL_RET_OK);
rcutils_reset_error();

ret = rcl_lifecycle_transition_init(
&transition, expected_id, &expected_label[0], start, nullptr, &allocator);
EXPECT_EQ(ret, RCL_RET_ERROR);
EXPECT_EQ(ret, RCL_RET_OK);
rcutils_reset_error();

rcl_allocator_t bad_allocator = rcl_get_default_allocator();
Expand Down