consuming_buffers members and coverage

CHANGELOG.md

@@ -3,6 +3,7 @@ Version 54:
 * static_buffer coverage
 * flat_buffer coverage
 * multi_buffer coverage
+* consuming_buffers members and coverage
 
 --------------------------------------------------------------------------------
 

include/beast/core/consuming_buffers.hpp

@@ -80,21 +80,15 @@ public:
 
 #endif
 
-    /// Default constructor.
+    /// Constructor
     consuming_buffers();
 
-    /// Move constructor.
+    /// Move constructor
     consuming_buffers(consuming_buffers&&);
 
-    /// Copy constructor.
+    /// Copy constructor
     consuming_buffers(consuming_buffers const&);
 
-    /// Move assignment.
-    consuming_buffers& operator=(consuming_buffers&&);
-
-    /// Copy assignment.
-    consuming_buffers& operator=(consuming_buffers const&);
-
     /** Construct to represent a buffer sequence.
 
         A copy of the buffer sequence is made. Ownership of the
@@ -110,6 +104,12 @@ public:
     template<class... Args>
     consuming_buffers(boost::in_place_init_t, Args&&... args);
 
+    /// Move assignment
+    consuming_buffers& operator=(consuming_buffers&&);
+
+    /// Copy assignmen
+    consuming_buffers& operator=(consuming_buffers const&);
+
     /// Get a bidirectional iterator to the first element.
     const_iterator
     begin() const;

include/beast/core/impl/consuming_buffers.ipp

@@ -17,13 +17,13 @@
 
 namespace beast {
 
-template<class BufferSequence>
-class consuming_buffers<BufferSequence>::const_iterator
+template<class Buffers>
+class consuming_buffers<Buffers>::const_iterator
 {
-    friend class consuming_buffers<BufferSequence>;
+    friend class consuming_buffers<Buffers>;
 
     using iter_type =
-        typename BufferSequence::const_iterator;
+        typename Buffers::const_iterator;
 
     iter_type it_;
     consuming_buffers const* b_ = nullptr;
@@ -109,16 +109,18 @@ private:
     }
 };
 
-template<class BufferSequence>
-consuming_buffers<BufferSequence>::
+//------------------------------------------------------------------------------
+
+template<class Buffers>
+consuming_buffers<Buffers>::
 consuming_buffers()
     : begin_(bs_.begin())
     , end_(bs_.end())
 {
 }
 
-template<class BufferSequence>
-consuming_buffers<BufferSequence>::
+template<class Buffers>
+consuming_buffers<Buffers>::
 consuming_buffers(consuming_buffers&& other)
     : consuming_buffers(std::move(other),
         std::distance<iter_type>(
@@ -126,8 +128,8 @@ consuming_buffers(consuming_buffers&& other)
 {
 }
 
-template<class BufferSequence>
-consuming_buffers<BufferSequence>::
+template<class Buffers>
+consuming_buffers<Buffers>::
 consuming_buffers(consuming_buffers const& other)
     : consuming_buffers(other,
         std::distance<iter_type>(
@@ -135,9 +137,36 @@ consuming_buffers(consuming_buffers const& other)
 {
 }
 
-template<class BufferSequence>
+template<class Buffers>
+consuming_buffers<Buffers>::
+consuming_buffers(Buffers const& bs)
+    : bs_(bs)
+    , begin_(bs_.begin())
+{
+    static_assert(
+        is_const_buffer_sequence<Buffers>::value||
+        is_mutable_buffer_sequence<Buffers>::value,
+            "BufferSequence requirements not met");
+}
+
+template<class Buffers>
+template<class... Args>
+consuming_buffers<Buffers>::
+consuming_buffers(boost::in_place_init_t, Args&&... args)
+    : bs_(std::forward<Args>(args)...)
+    , begin_(bs_.begin())
+    , end_(bs_.end())
+{
+    static_assert(sizeof...(Args) > 0,
+        "Missing constructor arguments");
+    static_assert(
+        std::is_constructible<Buffers, Args...>::value,
+            "Buffers not constructible from arguments");
+}
+
+template<class Buffers>
 auto
-consuming_buffers<BufferSequence>::
+consuming_buffers<Buffers>::
 operator=(consuming_buffers&& other) ->
     consuming_buffers&
 {
@@ -149,9 +178,9 @@ operator=(consuming_buffers&& other) ->
     return *this;
 }
 
-template<class BufferSequence>
+template<class Buffers>
 auto
-consuming_buffers<BufferSequence>::
+consuming_buffers<Buffers>::
 operator=(consuming_buffers const& other) ->
     consuming_buffers&
 {
@@ -163,56 +192,29 @@ operator=(consuming_buffers const& other) ->
     return *this;
 }
 
-template<class BufferSequence>
-consuming_buffers<BufferSequence>::
-consuming_buffers(BufferSequence const& bs)
-    : bs_(bs)
-    , begin_(bs_.begin())
-{
-    static_assert(
-        is_const_buffer_sequence<BufferSequence>::value||
-        is_mutable_buffer_sequence<BufferSequence>::value,
-            "BufferSequence requirements not met");
-}
-
-template<class BufferSequence>
-template<class... Args>
-consuming_buffers<BufferSequence>::
-consuming_buffers(boost::in_place_init_t, Args&&... args)
-    : bs_(std::forward<Args>(args)...)
-    , begin_(bs_.begin())
-    , end_(bs_.end())
-{
-    static_assert(sizeof...(Args) > 0,
-        "Missing constructor arguments");
-    static_assert(
-        std::is_constructible<BufferSequence, Args...>::value,
-            "BufferSequence is not constructible from arguments");
-}
-
-template<class BufferSequence>
+template<class Buffers>
 inline
 auto
-consuming_buffers<BufferSequence>::
+consuming_buffers<Buffers>::
 begin() const ->
     const_iterator
 {
     return const_iterator{*this, begin_};
 }
 
-template<class BufferSequence>
+template<class Buffers>
 inline
 auto
-consuming_buffers<BufferSequence>::
+consuming_buffers<Buffers>::
 end() const ->
     const_iterator
 {
     return const_iterator{*this, bs_.end()};
 }
 
-template<class BufferSequence>
+template<class Buffers>
 void
-consuming_buffers<BufferSequence>::
+consuming_buffers<Buffers>::
 consume(std::size_t n)
 {
     using boost::asio::buffer_size;

test/core/consuming_buffers.cpp

@@ -9,6 +9,7 @@
 #include <beast/core/consuming_buffers.hpp>
 
 #include "buffer_test.hpp"
+
 #include <beast/core/buffer_cat.hpp>
 #include <beast/core/ostream.hpp>
 #include <beast/unit_test/suite.hpp>
@@ -20,15 +21,6 @@ namespace beast {
 class consuming_buffers_test : public beast::unit_test::suite
 {
 public:
-    template<class ConstBufferSequence>
-    static
-    std::string
-    to_string(ConstBufferSequence const& bs)
-    {
-        return boost::lexical_cast<
-            std::string>(buffers(bs));
-    }
-
     template<class BufferSequence>
     static
     consuming_buffers<BufferSequence>
@@ -44,6 +36,7 @@ public:
     bool
     eq(Buffers1 const& lhs, Buffers2 const& rhs)
     {
+        using namespace test;
         return to_string(lhs) == to_string(rhs);
     }
 
@@ -57,9 +50,24 @@ public:
         BEAST_EXPECT(test::size_rev_post(buffers) == n);
     }
 
+    void
+    testMembers()
+    {
+        char buf[12];
+        consuming_buffers<
+            boost::asio::const_buffers_1> cb1{
+                boost::in_place_init, buf, sizeof(buf)};
+        consuming_buffers<
+            boost::asio::const_buffers_1> cb2{
+                boost::in_place_init, nullptr, 0};
+        cb2 = cb1;
+        cb1 = std::move(cb2);
+    }
+
     void
     testMatrix()
     {
+        using namespace test;
         using boost::asio::buffer;
         using boost::asio::const_buffer;
         char buf[12];
@@ -104,6 +112,7 @@ public:
     void
     testDefaultCtor()
     {
+        using namespace test;
         class test_buffer : public boost::asio::const_buffers_1
         {
         public:
@@ -120,6 +129,7 @@ public:
     void
     testInPlace()
     {
+        using namespace test;
         consuming_buffers<buffer_cat_view<
             boost::asio::const_buffers_1,
             boost::asio::const_buffers_1>> cb(
@@ -157,6 +167,7 @@ public:
 
     void run() override
     {
+        testMembers();
         testMatrix();
         testDefaultCtor();
         testInPlace();