From fd0c62a8e4e230aa6f506c72ea2d9123864a5393 Mon Sep 17 00:00:00 2001
From: Peter Thorson <github@zaphoyd.com>
Date: Wed, 5 Mar 2014 07:27:18 -0600
Subject: [PATCH] add TLS config and types to asio integration tests

---
 test/transport/integration.cpp | 55 ++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/test/transport/integration.cpp b/test/transport/integration.cpp
index 53f54cbbb2..6c18eb0902 100644
--- a/test/transport/integration.cpp
+++ b/test/transport/integration.cpp
@@ -32,9 +32,9 @@
 
 #include <websocketpp/config/core.hpp>
 #include <websocketpp/config/core_client.hpp>
-#include <websocketpp/config/asio_no_tls.hpp>
-#include <websocketpp/config/asio_no_tls_client.hpp>
-#include <websocketpp/config/debug_asio_no_tls.hpp>
+#include <websocketpp/config/asio.hpp>
+#include <websocketpp/config/asio_client.hpp>
+#include <websocketpp/config/debug_asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/client.hpp>
 
@@ -80,9 +80,54 @@ struct config : public websocketpp::config::asio_client {
     static const long timeout_pong = 500;
 };
 
+struct config_tls : public websocketpp::config::asio_tls_client {
+    typedef config type;
+    typedef websocketpp::config::asio base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
+    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 500;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 500;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 500;
+};
+
 typedef websocketpp::server<config> server;
 typedef websocketpp::client<config> client;
 
+typedef websocketpp::server<config_tls> server_tls;
+typedef websocketpp::client<config_tls> client_tls;
+
 typedef websocketpp::server<websocketpp::config::core> iostream_server;
 typedef websocketpp::client<websocketpp::config::core_client> iostream_client;
 
@@ -555,3 +600,7 @@ BOOST_AUTO_TEST_CASE( pause_reading ) {
     BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 1);
 }
 
+
+BOOST_AUTO_TEST_CASE( server_connection_cleanup ) {
+    server_tls s;
+}
\ No newline at end of file