boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 06:44:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

websocket test fixes

Browse Source
This commit is contained in:
Vinnie Falco
2017-08-26 06:13:11 -07:00
parent df7b068fa7
commit 53fa8a6589
8 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/beast/websocket/impl/read.ipp
View File

@@ -886,18 +886,18 @@ read_some(
static_assert(is_mutable_buffer_sequence<
MutableBufferSequence>::value,
"MutableBufferSequence requirements not met");
// Make sure the stream is open
if(failed_)
{
ec = boost::asio::error::operation_aborted;
return 0;
}
using beast::detail::clamp;
using boost::asio::buffer;
using boost::asio::buffer_cast;
using boost::asio::buffer_size;
close_code code{};
std::size_t bytes_written = 0;
// Make sure the stream is open
if(failed_)
{
ec = boost::asio::error::operation_aborted;
return 0;
}
loop:
// See if we need to read a frame header. This
// condition is structured to give the decompressor

8
include/boost/beast/websocket/stream.hpp
View File

@@ -115,12 +115,12 @@ enum class frame_type
template<class NextLayer>
class stream
{
friend class close_test;
friend class frame_test;
friend class ping_test;
friend class read_test;
friend class stream_test;
friend class stream_close_test;
friend class stream_ping_test;
friend class stream_read_test;
friend class stream_write_test;
friend class write_test;
/* The read buffer has to be at least as large
as the largest possible control frame including

4
test/beast/websocket/accept.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_accept_test : public websocket_test_suite
class accept_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -579,7 +579,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_accept);
BEAST_DEFINE_TESTSUITE(beast,websocket,accept);
} // websocket
} // beast

6
test/beast/websocket/close.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_close_test : public websocket_test_suite
class close_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -39,7 +39,7 @@ public:
w.close(ws, close_code::going_away);
});
// double close
// already closed
{
echo_server es{log};
stream<test::stream> ws{ios_};
@@ -257,7 +257,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_close);
BEAST_DEFINE_TESTSUITE(beast,websocket,close);
} // websocket
} // beast

4
test/beast/websocket/handshake.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_handshake_test : public websocket_test_suite
class handshake_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -221,7 +221,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_handshake);
BEAST_DEFINE_TESTSUITE(beast,websocket,handshake);
} // websocket
} // beast

92
test/beast/websocket/ping.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_ping_test : public websocket_test_suite
class ping_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -38,6 +38,46 @@ public:
{
w.pong(ws, {});
});
// ping, already closed
{
echo_server es{log};
stream<test::stream> ws{ios_};
ws.next_layer().connect(es.stream());
ws.handshake("localhost", "/");
ws.close({});
try
{
w.ping(ws, {});
fail("", __FILE__, __LINE__);
}
catch(system_error const& se)
{
BEAST_EXPECTS(
se.code() == boost::asio::error::operation_aborted,
se.code().message());
}
}
// pong, already closed
{
echo_server es{log};
stream<test::stream> ws{ios_};
ws.next_layer().connect(es.stream());
ws.handshake("localhost", "/");
ws.close({});
try
{
w.pong(ws, {});
fail("", __FILE__, __LINE__);
}
catch(system_error const& se)
{
BEAST_EXPECTS(
se.code() == boost::asio::error::operation_aborted,
se.code().message());
}
}
}
void
@@ -50,54 +90,6 @@ public:
doTestPing(AsyncClient{yield});
});
// ping, already closed
{
stream<test::stream> ws{ios_};
error_code ec;
ws.ping({}, ec);
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
}
// async_ping, already closed
{
boost::asio::io_service ios;
stream<test::stream> ws{ios};
ws.async_ping({},
[&](error_code ec)
{
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
});
ios.run();
}
// pong, already closed
{
stream<test::stream> ws{ios_};
error_code ec;
ws.pong({}, ec);
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
}
// async_pong, already closed
{
boost::asio::io_service ios;
stream<test::stream> ws{ios};
ws.async_pong({},
[&](error_code ec)
{
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
});
ios.run();
}
// suspend on write
{
echo_server es{log};
@@ -204,7 +196,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_ping);
BEAST_DEFINE_TESTSUITE(beast,websocket,ping);
} // websocket
} // beast

25
test/beast/websocket/read.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_read_test : public websocket_test_suite
class read_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -71,6 +71,27 @@ public:
pmd.client_enable = false;
pmd.server_enable = false;
// already closed
{
echo_server es{log};
stream<test::stream> ws{ios_};
ws.next_layer().connect(es.stream());
ws.handshake("localhost", "/");
ws.close({});
try
{
multi_buffer b;
w.read(ws, b);
fail("", __FILE__, __LINE__);
}
catch(system_error const& se)
{
BEAST_EXPECTS(
se.code() == boost::asio::error::operation_aborted,
se.code().message());
}
}
// empty, fragmented message
doTest(pmd, [&](ws_type& ws)
{
@@ -589,7 +610,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_read);
BEAST_DEFINE_TESTSUITE(beast,websocket,read);
} // websocket
} // beast

48
test/beast/websocket/write.cpp
View File

@@ -16,7 +16,7 @@ namespace boost {
namespace beast {
namespace websocket {
class stream_write_test : public websocket_test_suite
class write_test : public websocket_test_suite
{
public:
template<class Wrap>
@@ -29,6 +29,26 @@ public:
pmd.client_enable = false;
pmd.server_enable = false;
// already closed
{
echo_server es{log};
stream<test::stream> ws{ios_};
ws.next_layer().connect(es.stream());
ws.handshake("localhost", "/");
ws.close({});
try
{
w.write(ws, sbuf(""));
fail("", __FILE__, __LINE__);
}
catch(system_error const& se)
{
BEAST_EXPECTS(
se.code() == boost::asio::error::operation_aborted,
se.code().message());
}
}
// message
doTest(pmd, [&](ws_type& ws)
{
@@ -211,30 +231,6 @@ public:
doTestWrite(AsyncClient{yield});
});
// already closed
{
stream<test::stream> ws{ios_};
error_code ec;
ws.write(sbuf(""), ec);
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
}
// async, already closed
{
boost::asio::io_service ios;
stream<test::stream> ws{ios};
ws.async_write(sbuf(""),
[&](error_code ec)
{
BEAST_EXPECTS(
ec == boost::asio::error::operation_aborted,
ec.message());
});
ios.run();
}
// suspend on write
{
echo_server es{log};
@@ -550,7 +546,7 @@ public:
}
};
BEAST_DEFINE_TESTSUITE(beast,websocket,stream_write);
BEAST_DEFINE_TESTSUITE(beast,websocket,write);
} // websocket
} // beast