Skip to content

Commit ccf23df

Browse files
committed
Use named variable for improved readability.
Signed-off-by: Michel Hidalgo <[email protected]>
1 parent cf68a37 commit ccf23df

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

rcl/test/rcl/test_subscription.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -957,33 +957,34 @@ TEST_F(
957957
{
958958
EXPECT_EQ(RMW_RET_OK, rmw_message_info_sequence_fini(&message_infos));
959959
});
960+
rmw_subscription_allocation_t * allocation = nullptr; // is a valid argument
960961

961962
EXPECT_EQ(
962963
RCL_RET_SUBSCRIPTION_INVALID,
963-
rcl_take_sequence(nullptr, seq_size, &messages, &message_infos, nullptr));
964+
rcl_take_sequence(nullptr, seq_size, &messages, &message_infos, allocation));
964965
rcl_reset_error();
965966
EXPECT_EQ(
966967
RCL_RET_SUBSCRIPTION_INVALID,
967-
rcl_take_sequence(&subscription_zero_init, seq_size, &messages, &message_infos, nullptr));
968+
rcl_take_sequence(&subscription_zero_init, seq_size, &messages, &message_infos, allocation));
968969
rcl_reset_error();
969970

970971
EXPECT_EQ(
971972
RCL_RET_INVALID_ARGUMENT,
972-
rcl_take_sequence(&subscription, seq_size + 1, &messages, &message_infos, nullptr));
973+
rcl_take_sequence(&subscription, seq_size + 1, &messages, &message_infos, allocation));
973974
rcl_reset_error();
974975
EXPECT_EQ(
975976
RCL_RET_INVALID_ARGUMENT,
976-
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos_short, nullptr));
977+
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos_short, allocation));
977978
rcl_reset_error();
978979

979980
EXPECT_EQ(
980981
RCL_RET_INVALID_ARGUMENT,
981-
rcl_take_sequence(&subscription, seq_size, nullptr, &message_infos, nullptr));
982+
rcl_take_sequence(&subscription, seq_size, nullptr, &message_infos, allocation));
982983
rcl_reset_error();
983984

984985
EXPECT_EQ(
985986
RCL_RET_INVALID_ARGUMENT,
986-
rcl_take_sequence(&subscription, seq_size, &messages, nullptr, nullptr));
987+
rcl_take_sequence(&subscription, seq_size, &messages, nullptr, allocation));
987988
rcl_reset_error();
988989

989990
rmw_ret_t rmw_take_sequence_returns = RMW_RET_OK;
@@ -996,19 +997,19 @@ TEST_F(
996997

997998
EXPECT_EQ(
998999
RCL_RET_SUBSCRIPTION_TAKE_FAILED,
999-
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, nullptr));
1000+
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, allocation));
10001001
rcl_reset_error();
10011002

10021003
rmw_take_sequence_returns = RMW_RET_BAD_ALLOC;
10031004
EXPECT_EQ(
10041005
RCL_RET_BAD_ALLOC,
1005-
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, nullptr));
1006+
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, allocation));
10061007
rcl_reset_error();
10071008

10081009
rmw_take_sequence_returns = RMW_RET_ERROR;
10091010
EXPECT_EQ(
10101011
RCL_RET_ERROR,
1011-
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, nullptr));
1012+
rcl_take_sequence(&subscription, seq_size, &messages, &message_infos, allocation));
10121013
rcl_reset_error();
10131014
}
10141015

0 commit comments

Comments
 (0)