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
+21 -21
View File
@@ -100,7 +100,7 @@ public:
flat_buffer buffer;
receive_expect_100_continue(
p.server, buffer, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
},
[&](yield_context)
{
@@ -116,7 +116,7 @@ public:
error_code ec;
send_expect_100_continue(
p.client, buffer, req, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
});
}
@@ -131,8 +131,8 @@ public:
test::pipe p{ios_};
error_code ec;
send_cgi_response(child.server, p.client, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(equal_body<false>(p.server.str(), s));
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(equal_body<false>(p.server.str(), s));
}
void
@@ -153,7 +153,7 @@ public:
error_code ec;
write(downstream.client, req);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
downstream.client.close();
flat_buffer buffer;
@@ -164,8 +164,8 @@ public:
h.erase("Content-Length");
h.set("Transfer-Encoding", "chunked");
});
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(equal_body<true>(
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(equal_body<true>(
upstream.server.str(), req.body));
}
@@ -182,8 +182,8 @@ public:
flat_buffer buffer;
response<string_body> res;
read_istream(is, buffer, res, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(to_string(res) == s);
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(to_string(res) == s);
}
void
@@ -197,8 +197,8 @@ public:
req.insert(field::user_agent, "test");
error_code ec;
write_ostream(os, req, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(to_string(req) == os.str());
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(to_string(req) == os.str());
}
void
@@ -216,7 +216,7 @@ public:
custom_parser<true> p;
p.put(boost::asio::buffer(
s.data(), s.size()), ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
}
{
string_view s{
@@ -233,7 +233,7 @@ public:
custom_parser<false> p;
p.put(boost::asio::buffer(
s.data(), s.size()), ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
}
}
@@ -247,14 +247,14 @@ public:
error_code ec;
flat_buffer buffer;
do_server_head(p.server, buffer, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
},
[&](yield_context)
{
error_code ec;
flat_buffer buffer;
auto res = do_head_request(p.client, buffer, "/", ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECTS(! ec, ec.message());
});
}
@@ -290,7 +290,7 @@ public:
handler h;
flat_buffer buffer;
do_form_request(p.server, buffer, h);
BOOST_BEAST_EXPECT(h.body == "Hello, world!");
BEAST_EXPECT(h.body == "Hello, world!");
}
//--------------------------------------------------------------------------
@@ -310,8 +310,8 @@ public:
flat_buffer b;
std::stringstream ss;
read_and_print_body<false>(ss, c.server, b, ec);
if(BOOST_BEAST_EXPECTS(! ec, ec.message()))
BOOST_BEAST_EXPECT(ss.str() == s);
if(BEAST_EXPECTS(! ec, ec.message()))
BEAST_EXPECT(ss.str() == s);
}
//--------------------------------------------------------------------------
@@ -366,7 +366,7 @@ public:
trailers,
std::allocator<double>{}
), ec);
BOOST_BEAST_EXPECT(
BEAST_EXPECT(
to_string(p.server.buffer.data()) ==
"HTTP/1.1 200 OK\r\n"
"Server: test\r\n"
@@ -417,8 +417,8 @@ public:
flat_buffer b;
std::stringstream ss;
print_chunked_body<false>(ss, c.client, b, ec);
BOOST_BEAST_EXPECTS(! ec, ec.message());
BOOST_BEAST_EXPECT(ss.str() ==
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(ss.str() ==
"Chunk Body: First\n"
"Extension: quality = 1.0\n"
"Chunk Body: Hello, world!\n"