//
-// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// Test that header file is self-contained.
#include <boost/beast/core/static_buffer.hpp>
-#include "buffer_test.hpp"
+#include "test_buffer.hpp"
+#include <boost/beast/core/buffer_traits.hpp>
#include <boost/beast/core/ostream.hpp>
+#include <boost/beast/core/read_size.hpp>
#include <boost/beast/core/string.hpp>
-#include <boost/beast/unit_test/suite.hpp>
+#include <boost/beast/_experimental/unit_test/suite.hpp>
+#include <boost/asio/buffers_iterator.hpp>
+#include <algorithm>
+#include <cctype>
#include <string>
namespace boost {
namespace beast {
-BOOST_STATIC_ASSERT(
- boost::asio::is_dynamic_buffer<static_buffer_base>::value);
-
class static_buffer_test : public beast::unit_test::suite
{
public:
+ BOOST_STATIC_ASSERT(
+ is_mutable_dynamic_buffer<
+ static_buffer<13>>::value);
+
+ BOOST_STATIC_ASSERT(
+ is_mutable_dynamic_buffer<
+ static_buffer_base>::value);
+
void
- testStaticBuffer()
+ testDynamicBuffer()
{
- using namespace test;
- using boost::asio::buffer;
- using boost::asio::buffer_size;
- char buf[12];
- std::string const s = "Hello, world";
- BEAST_EXPECT(s.size() == sizeof(buf));
- for(std::size_t i = 1; i < 4; ++i) {
- for(std::size_t j = 1; j < 4; ++j) {
- for(std::size_t x = 1; x < 4; ++x) {
- for(std::size_t y = 1; y < 4; ++y) {
- for(std::size_t t = 1; t < 4; ++ t) {
- for(std::size_t u = 1; u < 4; ++ u) {
- std::size_t z = sizeof(buf) - (x + y);
- std::size_t v = sizeof(buf) - (t + u);
- {
- std::memset(buf, 0, sizeof(buf));
- static_buffer<sizeof(buf)> ba;
- {
- auto d = ba.prepare(z);
- BEAST_EXPECT(buffer_size(d) == z);
- }
- {
- auto d = ba.prepare(0);
- BEAST_EXPECT(buffer_size(d) == 0);
- }
- {
- auto d = ba.prepare(y);
- BEAST_EXPECT(buffer_size(d) == y);
- }
- {
- auto d = ba.prepare(x);
- BEAST_EXPECT(buffer_size(d) == x);
- ba.commit(buffer_copy(d, buffer(s.data(), x)));
- }
- BEAST_EXPECT(ba.size() == x);
- BEAST_EXPECT(buffer_size(ba.data()) == ba.size());
- {
- auto d = ba.prepare(x);
- BEAST_EXPECT(buffer_size(d) == x);
- }
- {
- auto d = ba.prepare(0);
- BEAST_EXPECT(buffer_size(d) == 0);
- }
- {
- auto d = ba.prepare(z);
- BEAST_EXPECT(buffer_size(d) == z);
- }
- {
- auto d = ba.prepare(y);
- BEAST_EXPECT(buffer_size(d) == y);
- ba.commit(buffer_copy(d, buffer(s.data()+x, y)));
- }
- ba.commit(1);
- BEAST_EXPECT(ba.size() == x + y);
- BEAST_EXPECT(buffer_size(ba.data()) == ba.size());
- {
- auto d = ba.prepare(x);
- BEAST_EXPECT(buffer_size(d) == x);
- }
- {
- auto d = ba.prepare(y);
- BEAST_EXPECT(buffer_size(d) == y);
- }
- {
- auto d = ba.prepare(0);
- BEAST_EXPECT(buffer_size(d) == 0);
- }
- {
- auto d = ba.prepare(z);
- BEAST_EXPECT(buffer_size(d) == z);
- ba.commit(buffer_copy(d, buffer(s.data()+x+y, z)));
- }
- ba.commit(2);
- BEAST_EXPECT(ba.size() == x + y + z);
- BEAST_EXPECT(buffer_size(ba.data()) == ba.size());
- BEAST_EXPECT(to_string(ba.data()) == s);
- ba.consume(t);
- {
- auto d = ba.prepare(0);
- BEAST_EXPECT(buffer_size(d) == 0);
- }
- BEAST_EXPECT(to_string(ba.data()) == s.substr(t, std::string::npos));
- ba.consume(u);
- BEAST_EXPECT(to_string(ba.data()) == s.substr(t + u, std::string::npos));
- ba.consume(v);
- BEAST_EXPECT(to_string(ba.data()) == "");
- ba.consume(1);
- {
- auto d = ba.prepare(0);
- BEAST_EXPECT(buffer_size(d) == 0);
- }
- try
- {
- ba.prepare(ba.capacity() - ba.size() + 1);
- fail();
- }
- catch(...)
- {
- pass();
- }
- }
- }}}}}}
+ test_dynamic_buffer(static_buffer<13>{});
}
void
- testBuffer()
+ testMembers()
{
- using namespace test;
string_view const s = "Hello, world!";
// static_buffer_base
char buf[64];
static_buffer_base b{buf, sizeof(buf)};
ostream(b) << s;
- BEAST_EXPECT(to_string(b.data()) == s);
- b.consume(b.size());
- BEAST_EXPECT(to_string(b.data()) == "");
+ BEAST_EXPECT(buffers_to_string(b.data()) == s);
+ b.clear();
+ BEAST_EXPECT(b.size() == 0);
+ BEAST_EXPECT(buffer_bytes(b.data()) == 0);
}
// static_buffer
BEAST_EXPECT(b1.max_size() == 64);
BEAST_EXPECT(b1.capacity() == 64);
ostream(b1) << s;
- BEAST_EXPECT(to_string(b1.data()) == s);
+ BEAST_EXPECT(buffers_to_string(b1.data()) == s);
{
static_buffer<64> b2{b1};
- BEAST_EXPECT(to_string(b2.data()) == s);
+ BEAST_EXPECT(buffers_to_string(b2.data()) == s);
b2.consume(7);
- BEAST_EXPECT(to_string(b2.data()) == s.substr(7));
+ BEAST_EXPECT(buffers_to_string(b2.data()) == s.substr(7));
}
{
static_buffer<64> b2;
b2 = b1;
- BEAST_EXPECT(to_string(b2.data()) == s);
+ BEAST_EXPECT(buffers_to_string(b2.data()) == s);
b2.consume(7);
- BEAST_EXPECT(to_string(b2.data()) == s.substr(7));
+ BEAST_EXPECT(buffers_to_string(b2.data()) == s.substr(7));
}
}
// cause memmove
{
static_buffer<10> b;
- write_buffer(b, "12345");
+ ostream(b) << "12345";
b.consume(3);
- write_buffer(b, "67890123");
- BEAST_EXPECT(to_string(b.data()) == "4567890123");
+ ostream(b) << "67890123";
+ BEAST_EXPECT(buffers_to_string(b.data()) == "4567890123");
try
{
b.prepare(1);
}
(b.base());
}
+
+ // This exercises the wrap-around cases
+ // for the circular buffer representation
+ {
+ static_buffer<5> b;
+ {
+ auto const mb = b.prepare(5);
+ BEAST_EXPECT(buffers_length(mb) == 1);
+ }
+ b.commit(4);
+ BEAST_EXPECT(buffers_length(b.data()) == 1);
+ BEAST_EXPECT(buffers_length(b.cdata()) == 1);
+ b.consume(3);
+ {
+ auto const mb = b.prepare(3);
+ BEAST_EXPECT(buffers_length(mb) == 2);
+ auto it1 = mb.begin();
+ auto it2 = std::next(it1);
+ BEAST_EXPECT(
+ net::const_buffer(*it1).data() >
+ net::const_buffer(*it2).data());
+ }
+ b.commit(2);
+ {
+ auto const mb = b.data();
+ auto it1 = mb.begin();
+ auto it2 = std::next(it1);
+ BEAST_EXPECT(
+ net::const_buffer(*it1).data() >
+ net::const_buffer(*it2).data());
+ }
+ {
+ auto const cb = b.cdata();
+ auto it1 = cb.begin();
+ auto it2 = std::next(it1);
+ BEAST_EXPECT(
+ net::const_buffer(*it1).data() >
+ net::const_buffer(*it2).data());
+ }
+ }
}
- void run() override
+ void
+ run() override
{
- testBuffer();
- //testStaticBuffer();
+ testDynamicBuffer();
+ testMembers();
}
};
projects / ceph.git / blobdiff