feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Rename to BEAST_EXPECT

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
test/http/parser.cpp
+64 -64
View File
@@ -83,7 +83,7 @@ public:
error_code ec;
parser_type<isRequest> p;
put(buffer(s.data(), s.size()), p, ec);
if(! BOOST_BEAST_EXPECTS(! ec, ec.message()))
if(! BEAST_EXPECTS(! ec, ec.message()))
return;
f(p);
}
@@ -99,22 +99,22 @@ public:
s.remove_prefix(used);
if(ec == error::need_more)
ec.assign(0, ec.category());
if(! BOOST_BEAST_EXPECTS(! ec, ec.message()))
if(! BEAST_EXPECTS(! ec, ec.message()))
continue;
BOOST_BEAST_EXPECT(! p.is_done());
BEAST_EXPECT(! p.is_done());
used = p.put(
buffer(s.data(), s.size()), ec);
s.remove_prefix(used);
if(! BOOST_BEAST_EXPECTS(! ec, ec.message()))
if(! BEAST_EXPECTS(! ec, ec.message()))
continue;
BOOST_BEAST_EXPECT(s.empty());
BEAST_EXPECT(s.empty());
if(p.need_eof())
{
p.put_eof(ec);
if(! BOOST_BEAST_EXPECTS(! ec, ec.message()))
if(! BEAST_EXPECTS(! ec, ec.message()))
continue;
}
if(BOOST_BEAST_EXPECT(p.is_done()))
if(BEAST_EXPECT(p.is_done()))
f(p);
}
}
@@ -130,14 +130,14 @@ public:
[&](parser_type<false> const& p)
{
auto const& m = p.get();
BOOST_BEAST_EXPECT(! p.is_chunked());
BOOST_BEAST_EXPECT(p.need_eof());
BOOST_BEAST_EXPECT(p.content_length() == boost::none);
BOOST_BEAST_EXPECT(m.version == 10);
BOOST_BEAST_EXPECT(m.result() == status::ok);
BOOST_BEAST_EXPECT(m.reason() == "OK");
BOOST_BEAST_EXPECT(m["Server"] == "test");
BOOST_BEAST_EXPECT(m.body == "Hello, world!");
BEAST_EXPECT(! p.is_chunked());
BEAST_EXPECT(p.need_eof());
BEAST_EXPECT(p.content_length() == boost::none);
BEAST_EXPECT(m.version == 10);
BEAST_EXPECT(m.result() == status::ok);
BEAST_EXPECT(m.reason() == "OK");
BEAST_EXPECT(m["Server"] == "test");
BEAST_EXPECT(m.body == "Hello, world!");
}
);
doMatrix<false>(
@@ -157,17 +157,17 @@ public:
[&](parser_type<false> const& p)
{
auto const& m = p.get();
BOOST_BEAST_EXPECT(! p.need_eof());
BOOST_BEAST_EXPECT(p.is_chunked());
BOOST_BEAST_EXPECT(p.content_length() == boost::none);
BOOST_BEAST_EXPECT(m.version == 11);
BOOST_BEAST_EXPECT(m.result() == status::ok);
BOOST_BEAST_EXPECT(m.reason() == "OK");
BOOST_BEAST_EXPECT(m["Server"] == "test");
BOOST_BEAST_EXPECT(m["Transfer-Encoding"] == "chunked");
BOOST_BEAST_EXPECT(m["Expires"] == "never");
BOOST_BEAST_EXPECT(m["MD5-Fingerprint"] == "-");
BOOST_BEAST_EXPECT(m.body == "*****--");
BEAST_EXPECT(! p.need_eof());
BEAST_EXPECT(p.is_chunked());
BEAST_EXPECT(p.content_length() == boost::none);
BEAST_EXPECT(m.version == 11);
BEAST_EXPECT(m.result() == status::ok);
BEAST_EXPECT(m.reason() == "OK");
BEAST_EXPECT(m["Server"] == "test");
BEAST_EXPECT(m["Transfer-Encoding"] == "chunked");
BEAST_EXPECT(m["Expires"] == "never");
BEAST_EXPECT(m["MD5-Fingerprint"] == "-");
BEAST_EXPECT(m.body == "*****--");
}
);
doMatrix<false>(
@@ -179,7 +179,7 @@ public:
[&](parser_type<false> const& p)
{
auto const& m = p.get();
BOOST_BEAST_EXPECT(m.body == "*****");
BEAST_EXPECT(m.body == "*****");
}
);
doMatrix<true>(
@@ -189,12 +189,12 @@ public:
[&](parser_type<true> const& p)
{
auto const& m = p.get();
BOOST_BEAST_EXPECT(m.method() == verb::get);
BOOST_BEAST_EXPECT(m.target() == "/");
BOOST_BEAST_EXPECT(m.version == 11);
BOOST_BEAST_EXPECT(! p.need_eof());
BOOST_BEAST_EXPECT(! p.is_chunked());
BOOST_BEAST_EXPECT(p.content_length() == boost::none);
BEAST_EXPECT(m.method() == verb::get);
BEAST_EXPECT(m.target() == "/");
BEAST_EXPECT(m.version == 11);
BEAST_EXPECT(! p.need_eof());
BEAST_EXPECT(! p.is_chunked());
BEAST_EXPECT(p.content_length() == boost::none);
}
);
doMatrix<true>(
@@ -205,7 +205,7 @@ public:
[&](parser_type<true> const& p)
{
auto const& m = p.get();
BOOST_BEAST_EXPECT(m["X"] == "x");
BEAST_EXPECT(m["X"] == "x");
}
);
@@ -222,15 +222,15 @@ public:
"*")
, ec);
auto const& m = p.get();
BOOST_BEAST_EXPECT(! ec);
BOOST_BEAST_EXPECT(p.is_done());
BOOST_BEAST_EXPECT(p.is_header_done());
BOOST_BEAST_EXPECT(! p.need_eof());
BOOST_BEAST_EXPECT(m.method() == verb::get);
BOOST_BEAST_EXPECT(m.target() == "/");
BOOST_BEAST_EXPECT(m.version == 11);
BOOST_BEAST_EXPECT(m["User-Agent"] == "test");
BOOST_BEAST_EXPECT(m.body == "*");
BEAST_EXPECT(! ec);
BEAST_EXPECT(p.is_done());
BEAST_EXPECT(p.is_header_done());
BEAST_EXPECT(! p.need_eof());
BEAST_EXPECT(m.method() == verb::get);
BEAST_EXPECT(m.target() == "/");
BEAST_EXPECT(m.version == 11);
BEAST_EXPECT(m["User-Agent"] == "test");
BEAST_EXPECT(m.body == "*");
}
{
// test partial parsing of final chunk
@@ -247,9 +247,9 @@ public:
"*";
auto used = p.put(b.data(), ec);
b.consume(used);
BOOST_BEAST_EXPECT(! ec);
BOOST_BEAST_EXPECT(! p.is_done());
BOOST_BEAST_EXPECT(p.get().body == "*");
BEAST_EXPECT(! ec);
BEAST_EXPECT(! p.is_done());
BEAST_EXPECT(p.get().body == "*");
ostream(b) <<
"\r\n"
"0;d;e=3;f=\"4\"\r\n"
@@ -258,15 +258,15 @@ public:
// incomplete parse, missing the final crlf
used = p.put(b.data(), ec);
b.consume(used);
BOOST_BEAST_EXPECT(ec == error::need_more);
BEAST_EXPECT(ec == error::need_more);
ec.assign(0, ec.category());
BOOST_BEAST_EXPECT(! p.is_done());
BEAST_EXPECT(! p.is_done());
ostream(b) <<
"\r\n"; // final crlf to end message
used = p.put(b.data(), ec);
b.consume(used);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(p.is_done());
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(p.is_done());
}
// skip body
{
@@ -279,10 +279,10 @@ public:
"\r\n"
"*****")
, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(p.is_done());
BOOST_BEAST_EXPECT(p.is_header_done());
BOOST_BEAST_EXPECT(p.content_length() &&
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(p.is_done());
BEAST_EXPECT(p.is_header_done());
BEAST_EXPECT(p.content_length() &&
*p.content_length() == 5);
}
}
@@ -301,17 +301,17 @@ public:
ostream(b) <<
"GET / HTTP/1.1\r\n";
used = p.put(b.data(), ec);
BOOST_BEAST_EXPECTS(ec == error::need_more, ec.message());
BEAST_EXPECTS(ec == error::need_more, ec.message());
b.consume(used);
ec.assign(0, ec.category());
ostream(b) <<
"User-Agent: test\r\n"
"\r\n";
used = p.put(b.data(), ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
b.consume(used);
BOOST_BEAST_EXPECT(p.is_done());
BOOST_BEAST_EXPECT(p.is_header_done());
BEAST_EXPECT(p.is_done());
BEAST_EXPECT(p.is_header_done());
}
}
@@ -321,14 +321,14 @@ public:
error_code ec;
parser_type<true> p;
auto used = p.put(buf(""), ec);
BOOST_BEAST_EXPECT(ec == error::need_more);
BOOST_BEAST_EXPECT(! p.got_some());
BOOST_BEAST_EXPECT(used == 0);
BEAST_EXPECT(ec == error::need_more);
BEAST_EXPECT(! p.got_some());
BEAST_EXPECT(used == 0);
ec.assign(0, ec.category());
used = p.put(buf("G"), ec);
BOOST_BEAST_EXPECT(ec == error::need_more);
BOOST_BEAST_EXPECT(p.got_some());
BOOST_BEAST_EXPECT(used == 0);
BEAST_EXPECT(ec == error::need_more);
BEAST_EXPECT(p.got_some());
BEAST_EXPECT(used == 0);
}
void