Rename to BEAST_EXPECT

This commit is contained in:
Vinnie Falco
2017-07-25 15:58:06 -07:00
parent 175763e773
commit c831afd93b
54 changed files with 2014 additions and 1657 deletions
+22 -22
View File
@@ -47,10 +47,10 @@ public:
void
expect_size(std::size_t n, ConstBufferSequence const& buffers)
{
BOOST_BEAST_EXPECT(test::size_pre(buffers) == n);
BOOST_BEAST_EXPECT(test::size_post(buffers) == n);
BOOST_BEAST_EXPECT(test::size_rev_pre(buffers) == n);
BOOST_BEAST_EXPECT(test::size_rev_post(buffers) == n);
BEAST_EXPECT(test::size_pre(buffers) == n);
BEAST_EXPECT(test::size_post(buffers) == n);
BEAST_EXPECT(test::size_rev_pre(buffers) == n);
BEAST_EXPECT(test::size_rev_post(buffers) == n);
}
void
@@ -75,9 +75,9 @@ public:
using boost::asio::const_buffer;
char buf[12];
std::string const s = "Hello, world";
BOOST_BEAST_EXPECT(s.size() == sizeof(buf));
BEAST_EXPECT(s.size() == sizeof(buf));
buffer_copy(buffer(buf), buffer(s));
BOOST_BEAST_EXPECT(to_string(buffer(buf)) == s);
BEAST_EXPECT(to_string(buffer(buf)) == s);
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) {
@@ -90,24 +90,24 @@ public:
const_buffer{&buf[i], j},
const_buffer{&buf[i+j], k}}};
consuming_buffers<decltype(bs)> cb(bs);
BOOST_BEAST_EXPECT(to_string(cb) == s);
BEAST_EXPECT(to_string(cb) == s);
expect_size(s.size(), cb);
cb.consume(0);
BOOST_BEAST_EXPECT(eq(cb, consumed_buffers(bs, 0)));
BOOST_BEAST_EXPECT(to_string(cb) == s);
BEAST_EXPECT(eq(cb, consumed_buffers(bs, 0)));
BEAST_EXPECT(to_string(cb) == s);
expect_size(s.size(), cb);
cb.consume(x);
BOOST_BEAST_EXPECT(to_string(cb) == s.substr(x));
BOOST_BEAST_EXPECT(eq(cb, consumed_buffers(bs, x)));
BEAST_EXPECT(to_string(cb) == s.substr(x));
BEAST_EXPECT(eq(cb, consumed_buffers(bs, x)));
cb.consume(y);
BOOST_BEAST_EXPECT(to_string(cb) == s.substr(x+y));
BOOST_BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y)));
BEAST_EXPECT(to_string(cb) == s.substr(x+y));
BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y)));
cb.consume(z);
BOOST_BEAST_EXPECT(to_string(cb) == "");
BOOST_BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y+z)));
BEAST_EXPECT(to_string(cb) == "");
BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y+z)));
cb.consume(1);
BOOST_BEAST_EXPECT(to_string(cb) == "");
BOOST_BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y+z)));
BEAST_EXPECT(to_string(cb) == "");
BEAST_EXPECT(eq(cb, consumed_buffers(bs, x+y+z)));
}
}}}}
}
@@ -126,7 +126,7 @@ public:
};
consuming_buffers<test_buffer> cb;
BOOST_BEAST_EXPECT(to_string(cb) == "\r\n");
BEAST_EXPECT(to_string(cb) == "\r\n");
}
void
@@ -139,7 +139,7 @@ public:
boost::in_place_init,
boost::asio::const_buffers_1("\r", 1),
boost::asio::const_buffers_1("\n", 1));
BOOST_BEAST_EXPECT(to_string(cb) == "\r\n");
BEAST_EXPECT(to_string(cb) == "\r\n");
}
void
@@ -150,10 +150,10 @@ public:
using boost::asio::null_buffers;
consuming_buffers<null_buffers> cb(
null_buffers{});
BOOST_BEAST_EXPECT(buffer_size(cb) == 0);
BEAST_EXPECT(buffer_size(cb) == 0);
consuming_buffers<null_buffers> cb2(
null_buffers{});
BOOST_BEAST_EXPECT(buffer_copy(cb2, cb) == 0);
BEAST_EXPECT(buffer_copy(cb2, cb) == 0);
}
void
@@ -165,7 +165,7 @@ public:
std::size_t n = 0;
for(auto it = cb.end(); it != cb.begin(); --it)
++n;
BOOST_BEAST_EXPECT(n == 3);
BEAST_EXPECT(n == 3);
}
void run() override