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

Unit test macros use the global suite

Browse Source 
fix #1411
This commit is contained in:
Vinnie Falco
2019-01-17 17:19:00 -08:00
parent 72ea142c5c
commit 03bf9144b7
21 changed files with 331 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/beast/core/saved_handler.cpp
+9 -23
View File
@@ -23,29 +23,22 @@ class saved_handler_test : public unit_test::suite
public:
class handler
{
unit_test::suite& s_;
bool failed_ = true;
bool throw_on_move_ = false;
public:
handler() = default;
handler(handler const&) = delete;
handler& operator=(handler&&) = delete;
handler& operator=(handler const&) = delete;
~handler()
{
s_.BEAST_EXPECT(! failed_);
}
explicit
handler(unit_test::suite& s)
: s_(s)
{
BEAST_EXPECT(! failed_);
}
handler(handler&& other)
: s_(other.s_)
, failed_(boost::exchange(
: failed_(boost::exchange(
other.failed_, false))
{
if(throw_on_move_)
@@ -61,28 +54,21 @@ public:
class unhandler
{
unit_test::suite& s_;
bool invoked_ = false;
public:
unhandler() = default;
unhandler(unhandler const&) = delete;
unhandler& operator=(unhandler&&) = delete;
unhandler& operator=(unhandler const&) = delete;
~unhandler()
{
s_.BEAST_EXPECT(! invoked_);
}
explicit
unhandler(unit_test::suite& s)
: s_(s)
{
BEAST_EXPECT(! invoked_);
}
unhandler(unhandler&& other)
: s_(other.s_)
, invoked_(boost::exchange(
: invoked_(boost::exchange(
other.invoked_, false))
{
}
@@ -116,17 +102,17 @@ public:
saved_handler sh;
BEAST_EXPECT(! sh.has_value());
sh.emplace(handler{*this});
sh.emplace(handler{});
BEAST_EXPECT(sh.has_value());
sh.invoke();
BEAST_EXPECT(! sh.has_value());
sh.emplace(handler{*this}, std::allocator<char>{});
sh.emplace(handler{}, std::allocator<char>{});
BEAST_EXPECT(sh.has_value());
sh.invoke();
BEAST_EXPECT(! sh.has_value());
sh.emplace(unhandler{*this});
sh.emplace(unhandler{});
BEAST_EXPECT(sh.has_value());
}