added intra process buffer test

Signed-off-by: alberto <alberto.soragna@gmail.com> Signed-off-by: alberto <alberto.soragna@gmail.com>
ros2 · Jul 4, 2019 · c0d00c1 · c0d00c1
1 parent 7e5f55b
commit c0d00c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/rclcpp/include/rclcpp/buffers/ring_buffer_implementation.hpp b/rclcpp/include/rclcpp/buffers/ring_buffer_implementation.hpp
@@ -62,8 +62,7 @@ class RingBufferImplementation : public BufferImplementationBase<BufferT>
 
     if (is_full()) {
       read_ = next(read_);
-    }
-    else {
+    } else {
       _length++;
     }
 

diff --git a/rclcpp/include/rclcpp/subscription_intra_process.hpp b/rclcpp/include/rclcpp/subscription_intra_process.hpp
@@ -88,12 +88,12 @@ class SubscriptionIntraProcess : public SubscriptionIntraProcessBase
   using ConstMessageSharedPtr = std::shared_ptr<const MessageT>;
   using MessageUniquePtr = std::unique_ptr<MessageT, MessageDeleter>;
 
-  using BufferPtr = typename intra_process_buffer::IntraProcessBuffer<MessageT>::SharedPtr;
-  using SubscriptionPtr = typename Subscription<MessageT, Alloc>::SharedPtr;
+  using BufferSharedPtr = typename intra_process_buffer::IntraProcessBuffer<MessageT>::SharedPtr;
+  using SubscriptionSharedPtr = typename Subscription<MessageT, Alloc>::SharedPtr;
 
   SubscriptionIntraProcess(
-    SubscriptionPtr subscription,
-    BufferPtr buffer)
+    SubscriptionSharedPtr subscription,
+    BufferSharedPtr buffer)
   : subscription_(subscription), buffer_(buffer)
   {
     std::shared_ptr<rclcpp::Context> context_ptr =
@@ -107,7 +107,7 @@ class SubscriptionIntraProcess : public SubscriptionIntraProcessBase
       &gc_, context_ptr->get_rcl_context().get(), guard_condition_options);
 
     if (RCL_RET_OK != ret) {
-      throw std::runtime_error("IntraProcessWaitable init error initializing guard condition");
+      throw std::runtime_error("SubscriptionIntraProcess init error initializing guard condition");
     }
   }
 
@@ -183,8 +183,8 @@ class SubscriptionIntraProcess : public SubscriptionIntraProcessBase
   std::recursive_mutex reentrant_mutex_;
   rcl_guard_condition_t gc_;
 
-  SubscriptionPtr subscription_;
-  BufferPtr buffer_;
+  SubscriptionSharedPtr subscription_;
+  BufferSharedPtr buffer_;
 };
 
 }  // namespace rclcpp

diff --git a/rclcpp/test/test_intra_process_buffer.cpp b/rclcpp/test/test_intra_process_buffer.cpp
@@ -233,4 +233,4 @@ TEST(TestIntraProcessBuffer, unique_buffer_consume) {
 
   EXPECT_EQ(original_value, *popped_unique_msg);
   EXPECT_EQ(original_message_pointer, popped_message_pointer);
-}
+}
diff --git a/rclcpp/test/test_ring_buffer_implementation.cpp b/rclcpp/test/test_ring_buffer_implementation.cpp
@@ -25,9 +25,9 @@
    Construtctor
  */
 TEST(TestRingBufferImplementation, constructor) {
-
   // Cannot create a buffer of size zero.
-  EXPECT_THROW(rclcpp::intra_process_buffer::RingBufferImplementation<char> rb(0), std::invalid_argument);
+  EXPECT_THROW(
+    rclcpp::intra_process_buffer::RingBufferImplementation<char> rb(0), std::invalid_argument);
 
   rclcpp::intra_process_buffer::RingBufferImplementation<char> rb(1);
 
@@ -42,10 +42,8 @@ TEST(TestRingBufferImplementation, constructor) {
    - overwrite old data writing over the buffer capacity
  */
 TEST(TestRingBufferImplementation, basic_usage) {
-
   rclcpp::intra_process_buffer::RingBufferImplementation<char> rb(2);
 
-
   rb.enqueue('a');
 
   EXPECT_EQ(true, rb.has_data());