ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8b60ef9db43089f08444ede0d9171d4903b6a174' into develop

Browse Source
This commit is contained in:
Vinnie Falco
2017-02-24 12:42:36 -05:00
parent 209fe8f7a9 8b60ef9db4
commit 7698477e86
251 changed files with 1999 additions and 1561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/beast/test/websocket/stream.cpp
View File

@@ -1,5 +1,5 @@
//
// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,7 +14,7 @@
#include <beast/core/streambuf.hpp>
#include <beast/core/to_string.hpp>
#include <beast/test/fail_stream.hpp>
#include <beast/test/string_stream.hpp>
#include <beast/test/string_istream.hpp>
#include <beast/test/yield_to.hpp>
#include <beast/unit_test/suite.hpp>
#include <boost/asio.hpp>
@@ -172,7 +172,7 @@ public:
req.fields.insert("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
req.fields.insert("Sec-WebSocket-Version", "13");
stream<test::fail_stream<
test::string_stream>> ws(n, ios_, "");
test::string_istream>> ws(n, ios_, "");
try
{
ws.accept(req);
@@ -186,7 +186,7 @@ public:
}
{
// valid
stream<test::string_stream> ws(ios_,
stream<test::string_istream> ws(ios_,
"GET / HTTP/1.1\r\n"
"Host: localhost:80\r\n"
"Upgrade: WebSocket\r\n"
@@ -207,7 +207,7 @@ public:
}
{
// invalid
stream<test::string_stream> ws(ios_,
stream<test::string_istream> ws(ios_,
"GET / HTTP/1.0\r\n"
"\r\n"
);
@@ -230,7 +230,7 @@ public:
{
for(std::size_t i = 0; i < s.size(); ++i)
{
stream<test::string_stream> ws(ios_,
stream<test::string_istream> ws(ios_,
s.substr(i, s.size() - i));
ws.set_option(keep_alive{true});
try
@@ -339,7 +339,7 @@ public:
auto const check =
[&](std::string const& s)
{
stream<test::string_stream> ws(ios_, s);
stream<test::string_istream> ws(ios_, s);
try
{
ws.handshake("localhost:80", "/");
@@ -1062,9 +1062,10 @@ public:
// send ping and message
bool pong = false;
ws.set_option(pong_callback{
[&](ping_data const& payload)
ws.set_option(ping_callback{
[&](bool is_pong, ping_data const& payload)
{
BEAST_EXPECT(is_pong);
BEAST_EXPECT(! pong);
pong = true;
BEAST_EXPECT(payload == "");
@@ -1081,12 +1082,13 @@ public:
BEAST_EXPECT(op == opcode::binary);
BEAST_EXPECT(to_string(db.data()) == "Hello");
}
ws.set_option(pong_callback{});
ws.set_option(ping_callback{});
// send ping and fragmented message
ws.set_option(pong_callback{
[&](ping_data const& payload)
ws.set_option(ping_callback{
[&](bool is_pong, ping_data const& payload)
{
BEAST_EXPECT(is_pong);
BEAST_EXPECT(payload == "payload");
}});
ws.ping("payload");
@@ -1101,7 +1103,7 @@ public:
BEAST_EXPECT(pong == 1);
BEAST_EXPECT(to_string(db.data()) == "Hello, World!");
}
ws.set_option(pong_callback{});
ws.set_option(ping_callback{});
// send pong
c.pong(ws, "");