niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code style only: wrap after open parenthesis if not in one line (#565)

Browse source 
Signed-off-by: Dirk Thomas <dirk-thomas@users.noreply.github.com>
This commit is contained in:
Dirk Thomas 2020-02-03 09:06:35 -08:00 • committed by GitHub
parent 7537f83044
commit 4b9c0a30be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 944 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

48
rcl_lifecycle/test/test_default_state_machine.cpp
View file

@ -45,7 +45,8 @@ public:
rcl_init_options_t init_options = rcl_get_zero_initialized_init_options();
ret = rcl_init_options_init(&init_options, rcl_get_default_allocator());
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
EXPECT_EQ(RCL_RET_OK, rcl_init_options_fini(&init_options)) << rcl_get_error_string().str;
});
this->context_ptr = new rcl_context_t;
@ -186,7 +187,8 @@ TEST_F(TestDefaultStateMachine, default_sequence) {
lifecycle_msgs__msg__State__TRANSITION_STATE_SHUTTINGDOWN,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -253,7 +255,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__TRANSITION_STATE_CONFIGURING);
}
}
@ -273,7 +276,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
RCUTILS_LOG_INFO_NAMED(ROS_PACKAGE_NAME, "applying key %u", *it);
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__PRIMARY_STATE_INACTIVE);
}
}
@ -292,7 +296,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__TRANSITION_STATE_ACTIVATING);
}
}
@ -311,7 +316,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__PRIMARY_STATE_ACTIVE);
}
}
@ -330,7 +336,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__TRANSITION_STATE_DEACTIVATING);
}
}
@ -355,7 +362,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__TRANSITION_STATE_CLEANINGUP);
}
}
@ -380,7 +388,8 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__TRANSITION_STATE_SHUTTINGDOWN);
}
}
@ -395,12 +404,14 @@ TEST_F(TestDefaultStateMachine, wrong_default_sequence) {
for (auto it = transition_ids.begin(); it != transition_ids.end(); ++it) {
EXPECT_EQ(RCL_RET_ERROR, rcl_lifecycle_trigger_transition_by_id(&state_machine, *it, false));
rcl_reset_error();
EXPECT_EQ(state_machine.current_state->id,
EXPECT_EQ(
state_machine.current_state->id,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
}
}
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -473,7 +484,8 @@ TEST_F(TestDefaultStateMachine, default_in_a_loop) {
lifecycle_msgs__msg__State__TRANSITION_STATE_SHUTTINGDOWN,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -589,7 +601,8 @@ TEST_F(TestDefaultStateMachine, default_sequence_failure) {
lifecycle_msgs__msg__State__TRANSITION_STATE_SHUTTINGDOWN,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -736,7 +749,8 @@ TEST_F(TestDefaultStateMachine, default_sequence_error_resolved) {
lifecycle_msgs__msg__State__TRANSITION_STATE_ERRORPROCESSING,
lifecycle_msgs__msg__State__PRIMARY_STATE_UNCONFIGURED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -767,7 +781,8 @@ TEST_F(TestDefaultStateMachine, default_sequence_error_unresolved) {
lifecycle_msgs__msg__State__TRANSITION_STATE_ERRORPROCESSING,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
@ -807,7 +822,8 @@ TEST_F(TestDefaultStateMachine, default_sequence_error_unresolved) {
lifecycle_msgs__msg__State__TRANSITION_STATE_ERRORPROCESSING,
lifecycle_msgs__msg__State__PRIMARY_STATE_FINALIZED);
EXPECT_EQ(RCL_RET_OK,
EXPECT_EQ(
RCL_RET_OK,
rcl_lifecycle_state_machine_fini(&state_machine, this->node_ptr, this->allocator));
}
}

3
rcl_lifecycle/test/test_multiple_instances.cpp
View file

@ -43,7 +43,8 @@ public:
rcl_init_options_t init_options = rcl_get_zero_initialized_init_options();
ret = rcl_init_options_init(&init_options, rcl_get_default_allocator());
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT({
OSRF_TESTING_TOOLS_CPP_SCOPE_EXIT(
{
EXPECT_EQ(RCL_RET_OK, rcl_init_options_fini(&init_options)) << rcl_get_error_string().str;
});
this->context_ptr = new rcl_context_t;