ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'exception_refactor' into develop

Browse Source 
Conflicts:
	changelog.md
	websocketpp/impl/connection_impl.hpp
This commit is contained in:
Peter Thorson
2014-08-09 15:44:46 -05:00
parent 5d0c2f6341 b92a2b7f61
commit 8a7beaa86a
10 changed files with 87 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/roles/client.cpp
View File

@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE( select_subprotocol ) {
con->select_subprotocol("foo",ec);
BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::server_only) );
BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::lib::error_code );
BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::exception );
}
BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
@@ -158,11 +158,11 @@ BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
con->add_subprotocol("",ec);
BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::lib::error_code );
BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::exception );
con->add_subprotocol("foo,bar",ec);
BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::lib::error_code );
BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::exception );
}
BOOST_AUTO_TEST_CASE( add_subprotocols ) {

2
test/roles/server.cpp
View File

@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
std::string o;
BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::lib::error_code);
BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::exception);
}
BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {