Skip to content

Commit

Permalink
updated tests according to new buffer APIs
Browse files Browse the repository at this point in the history 
Signed-off-by: alberto <alberto.soragna@gmail.com>
  • Loading branch information
@alsora
alsora committed Jul 16, 2019
1 parent b013d3f commit e979052
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
32 changes: 16 additions & 16 deletions rclcpp/test/test_intra_process_buffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ TEST(TestIntraProcessBuffer, shared_buffer_add) {
auto original_shared_msg = std::make_shared<char>('a');
auto original_message_pointer = reinterpret_cast<std::uintptr_t>(original_shared_msg.get());

intra_process_buffer->add(original_shared_msg);
intra_process_buffer->add_shared(original_shared_msg);

EXPECT_EQ(2u, original_shared_msg.use_count());

SharedMessageT popped_shared_msg;
intra_process_buffer->consume(popped_shared_msg);
popped_shared_msg = intra_process_buffer->consume_shared();
auto popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_shared_msg.get());

EXPECT_EQ(original_shared_msg.use_count(), popped_shared_msg.use_count());
Expand All @@ -86,9 +86,9 @@ TEST(TestIntraProcessBuffer, shared_buffer_add) {
original_message_pointer = reinterpret_cast<std::uintptr_t>(original_unique_msg.get());
auto original_value = *original_unique_msg;

intra_process_buffer->add(std::move(original_unique_msg));
intra_process_buffer->add_unique(std::move(original_unique_msg));

intra_process_buffer->consume(popped_shared_msg);
popped_shared_msg = intra_process_buffer->consume_shared();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_shared_msg.get());

EXPECT_EQ(1u, popped_shared_msg.use_count());
Expand Down Expand Up @@ -117,12 +117,12 @@ TEST(TestIntraProcessBuffer, unique_buffer_add) {
auto original_shared_msg = std::make_shared<char>('a');
auto original_message_pointer = reinterpret_cast<std::uintptr_t>(original_shared_msg.get());

intra_process_buffer->add(original_shared_msg);
intra_process_buffer->add_shared(original_shared_msg);

EXPECT_EQ(1u, original_shared_msg.use_count());

UniqueMessageT popped_unique_msg;
intra_process_buffer->consume(popped_unique_msg);
popped_unique_msg = intra_process_buffer->consume_unique();
auto popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_unique_msg.get());

EXPECT_EQ(*original_shared_msg, *popped_unique_msg);
Expand All @@ -132,9 +132,9 @@ TEST(TestIntraProcessBuffer, unique_buffer_add) {
original_message_pointer = reinterpret_cast<std::uintptr_t>(original_unique_msg.get());
auto original_value = *original_unique_msg;

intra_process_buffer->add(std::move(original_unique_msg));
intra_process_buffer->add_unique(std::move(original_unique_msg));

intra_process_buffer->consume(popped_unique_msg);
popped_unique_msg = intra_process_buffer->consume_unique();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_unique_msg.get());

EXPECT_EQ(original_value, *popped_unique_msg);
Expand Down Expand Up @@ -163,12 +163,12 @@ TEST(TestIntraProcessBuffer, shared_buffer_consume) {
auto original_shared_msg = std::make_shared<char>('a');
auto original_message_pointer = reinterpret_cast<std::uintptr_t>(original_shared_msg.get());

intra_process_buffer->add(original_shared_msg);
intra_process_buffer->add_shared(original_shared_msg);

EXPECT_EQ(2u, original_shared_msg.use_count());

SharedMessageT popped_shared_msg;
intra_process_buffer->consume(popped_shared_msg);
popped_shared_msg = intra_process_buffer->consume_shared();
auto popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_shared_msg.get());

EXPECT_EQ(original_shared_msg.use_count(), popped_shared_msg.use_count());
Expand All @@ -178,10 +178,10 @@ TEST(TestIntraProcessBuffer, shared_buffer_consume) {
original_shared_msg = std::make_shared<char>('b');
original_message_pointer = reinterpret_cast<std::uintptr_t>(original_shared_msg.get());

intra_process_buffer->add(original_shared_msg);
intra_process_buffer->add_shared(original_shared_msg);

UniqueMessageT popped_unique_msg;
intra_process_buffer->consume(popped_unique_msg);
popped_unique_msg = intra_process_buffer->consume_unique();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_unique_msg.get());

EXPECT_EQ(1u, original_shared_msg.use_count());
Expand Down Expand Up @@ -212,10 +212,10 @@ TEST(TestIntraProcessBuffer, unique_buffer_consume) {
auto original_message_pointer = reinterpret_cast<std::uintptr_t>(original_unique_msg.get());
auto original_value = *original_unique_msg;

intra_process_buffer->add(std::move(original_unique_msg));
intra_process_buffer->add_unique(std::move(original_unique_msg));

SharedMessageT popped_shared_msg;
intra_process_buffer->consume(popped_shared_msg);
popped_shared_msg = intra_process_buffer->consume_shared();
auto popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_shared_msg.get());

EXPECT_EQ(original_value, *popped_shared_msg);
Expand All @@ -225,10 +225,10 @@ TEST(TestIntraProcessBuffer, unique_buffer_consume) {
original_message_pointer = reinterpret_cast<std::uintptr_t>(original_unique_msg.get());
original_value = *original_unique_msg;

intra_process_buffer->add(std::move(original_unique_msg));
intra_process_buffer->add_unique(std::move(original_unique_msg));

UniqueMessageT popped_unique_msg;
intra_process_buffer->consume(popped_unique_msg);
popped_unique_msg = intra_process_buffer->consume_unique();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_unique_msg.get());

EXPECT_EQ(original_value, *popped_unique_msg);
Expand Down
7 changes: 3 additions & 4 deletions rclcpp/test/test_ring_buffer_implementation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ TEST(TestRingBufferImplementation, basic_usage) {
EXPECT_EQ(true, rb.has_data());
EXPECT_EQ(false, rb.is_full());

char v;
rb.dequeue(v);
char v = rb.dequeue();

EXPECT_EQ('a', v);
EXPECT_EQ(false, rb.has_data());
Expand All @@ -67,13 +66,13 @@ TEST(TestRingBufferImplementation, basic_usage) {
EXPECT_EQ(true, rb.has_data());
EXPECT_EQ(true, rb.is_full());

rb.dequeue(v);
v = rb.dequeue();

EXPECT_EQ('c', v);
EXPECT_EQ(true, rb.has_data());
EXPECT_EQ(false, rb.is_full());

rb.dequeue(v);
v = rb.dequeue();

EXPECT_EQ('d', v);
EXPECT_EQ(false, rb.has_data());
Expand Down

0 comments on commit e979052

Please sign in to comment.