Starting to break down the HTTP client tests to reduce test build times.

deanberris · deanberris · commit 8c6a08a4b0bd · 2010-12-03T11:13:11.000+08:00
diff --git a/libs/network/test/CMakeLists.txt b/libs/network/test/CMakeLists.txt
@@ -14,6 +14,8 @@ find_package( Threads )
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 
+add_subdirectory(http)
+
 if (Boost_FOUND)
     set(
         TESTS
@@ -41,22 +43,8 @@ if (Boost_FOUND)
             target_link_libraries(cpp-netlib-${test} ${OPENSSL_LIBRARIES})
         endif()
         set_target_properties(cpp-netlib-${test}
-            PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../../../build/tests)
-        add_test(cpp-netlib-${test} ../../../build/tests/cpp-netlib-${test})
-    endforeach (test)
-
-    set(SERVER_TESTS
-        hello_world
-        http_async_server
-        )
-    foreach (test ${SERVER_TESTS})
-        set_source_files_properties(${test}.cpp
-            PROPERTIES COMPILE_FLAGS "-Wall")
-        add_executable(cpp-netlib-${test} ${test}.cpp)
-        target_link_libraries(cpp-netlib-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-        set_target_properties(cpp-netlib-${test}
-            PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../../../build/tests)
-        add_test(cpp-netlib-${test} python httplib_acceptance.py ../../../build/tests/cpp-netlib-${test} ../../../build/tests/cpp-netlib-${test}.passed)
+            PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+        add_test(cpp-netlib-${test} ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
     endforeach (test)
 
 endif()
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -0,0 +1,64 @@
+
+# Copyright 2010 Dean Michael Berris. 
+# 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)
+
+include_directories(${CPP-NETLIB_SOURCE_DIR})
+find_package( Boost 1.43.0 COMPONENTS unit_test_framework system regex thread filesystem )
+find_package( OpenSSL )
+
+if (OPENSSL_FOUND)
+    include_directories( ${OPENSSL_INCLUDE_DIR} )
+    add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
+endif()
+
+find_package( Threads )
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
+
+if (Boost_FOUND)
+    set ( TESTS
+        client_constructor_test
+        client_get_test
+        client_get_different_port_test
+        client_get_timeout_test
+        )
+    foreach ( test ${TESTS} )
+        if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+            set_source_files_properties(${test}.cpp
+                PROPERTIES COMPILE_FLAGS "-Wall")
+        endif()
+        add_executable(cpp-netlib-http-${test} ${test}.cpp)
+        target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+        if (OPENSSL_FOUND)
+            target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
+        endif()
+        set_target_properties(cpp-netlib-http-${test}
+            PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+        add_test(cpp-netlib-http-${test} 
+            %{CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
+    endforeach (test)
+
+    set ( SERVER_TESTS
+        server_hello_world
+        server_async
+        )
+    foreach ( test ${SERVER_TESTS} )
+        if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+            set_source_files_properties(${test}.cpp
+                PROPERTIES COMPILE_FLAGS "-Wall")
+        endif()
+        add_executable(cpp-netlib-http-${test} ${test}.cpp)
+        target_link_libraries(cpp-netlib-http-${test} ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+        set_target_properties(cpp-netlib-http-${test}
+            PROPERTIES RUNTIME_OUTPUT_DIRECTORY 
+            ${CPP-NETLIB_BINARY_DIR}/tests)
+        add_test(cpp-netlib-${test} 
+            python 
+            ${CPP-NETLIB_SOURCE_DIR}/libs/network/httplib_acceptance.py 
+            ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}
+            ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test}.passed)
+    endforeach (test)
+
+endif()
diff --git a/libs/network/test/http/client_constructor_test.cpp b/libs/network/test/http/client_constructor_test.cpp
@@ -0,0 +1,27 @@
+
+// Copyright 2010 Dean Michael Berris. 
+// 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)
+
+#define BOOST_TEST_MODULE HTTP 1.0 Client Constructor Test
+#include <boost/network/include/http/client.hpp>
+#include <boost/test/unit_test.hpp>
+#include "tag_types.hpp"
+
+namespace http = boost::network::http;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_1_0_constructor_test, T, tag_types) {
+    typedef http::basic_client<T, 1, 0> client;
+    client instance;
+    boost::asio::io_service io_service;
+    client instance2(io_service);
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_1_1_constructor_test, T, tag_types) {
+    typedef http::basic_client<T, 1, 1> client;
+    client instance;
+    boost::asio::io_service io_service;
+    client instance2(io_service);
+}
+
diff --git a/libs/network/test/http/client_get_different_port_test.cpp b/libs/network/test/http/client_get_different_port_test.cpp
@@ -0,0 +1,35 @@
+
+// Copyright 2010 Dean Michael Berris. 
+// 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)
+
+#define BOOST_TEST_MODULE HTTP Client Get Different Port Test
+#include <boost/network/include/http/client.hpp>
+#include <boost/test/unit_test.hpp>
+#include "tag_types.hpp"
+
+namespace net = boost::network;
+namespace http = boost::network::http;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_different_port_1_0, T, tag_types) {
+    typedef http::basic_client<T, 1, 0> client;
+    typename client::request request("http://www.boost.org:80/");
+    client client_;
+    typename client::response response_ = client_.get(request);
+    typename net::headers_range<typename http::basic_response<T> >::type range = headers(response_)["Content-Type"];
+    BOOST_CHECK ( boost::begin(range) != boost::end(range) );
+    BOOST_CHECK ( body(response_).size() != 0 );
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_different_port_1_1, T, tag_types) {
+    typedef http::basic_client<T, 1, 1> client;
+    typename client::request request("http://www.boost.org:80/");
+    typename client::response response_;
+    client client_;
+    BOOST_CHECK_NO_THROW ( response_ = client_.get(request) );
+    typename net::headers_range<typename client::response >::type range = headers(response_)["Content-Type"];
+    BOOST_CHECK ( boost::begin(range) != boost::end(range) );
+    BOOST_CHECK ( body(response_).size() != 0 );
+}
+
diff --git a/libs/network/test/http/client_get_test.cpp b/libs/network/test/http/client_get_test.cpp
@@ -0,0 +1,42 @@
+// Copyright 2010 Dean Michael Berris. 
+// 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)
+
+#define BOOST_TEST_MODULE HTTP 1.0 Get Test
+#include <boost/network/include/http/client.hpp>
+#include <boost/test/unit_test.hpp>
+#include "tag_types.hpp"
+
+namespace net = boost::network;
+namespace http = boost::network::http;
+
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_client_get_test, T, tag_types) {
+    typedef http::basic_client<T, 1, 0> client;
+    typename client::request request("http://www.boost.org");
+    client client_;
+    typename client::response response;
+    BOOST_CHECK_NO_THROW ( response = client_.get(request) );
+    typename net::headers_range<typename client::response>::type range = headers(response)["Content-Type"];
+    BOOST_CHECK ( !boost::empty(range) );
+    BOOST_CHECK ( body(response).size() != 0 );
+    BOOST_CHECK_EQUAL ( response.version().substr(0,7), std::string("HTTP/1.") );
+    BOOST_CHECK_EQUAL ( response.status(), 200u );
+    BOOST_CHECK_EQUAL ( response.status_message(), std::string("OK") );
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test, T, tag_types) {
+    typedef http::basic_client<T, 1, 1> client;
+    typename client::request request("http://www.boost.org/");
+    typename client::response response_;
+    client client_;
+    BOOST_CHECK_NO_THROW ( response_ = client_.get(request) );
+    typename net::headers_range<typename client::response>::type range = headers(response_)["Content-Type"];
+    BOOST_CHECK ( boost::begin(range) != boost::end(range) );
+    BOOST_CHECK ( body(response_).size() != 0 );
+    BOOST_CHECK_EQUAL ( response_.version().substr(0,7), std::string("HTTP/1.") );
+    BOOST_CHECK_EQUAL ( response_.status(), 200u );
+    BOOST_CHECK_EQUAL ( response_.status_message(), std::string("OK") );
+}
+
diff --git a/libs/network/test/http/client_get_timeout_test.cpp b/libs/network/test/http/client_get_timeout_test.cpp
@@ -0,0 +1,32 @@
+
+// Copyright 2010 Dean Michael Berris. 
+// 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)
+
+#define BOOST_TEST_MODULE HTTP Client Get Timeout Test
+#include <boost/network/include/http/client.hpp>
+#include <boost/test/unit_test.hpp>
+#include "tag_types.hpp"
+
+namespace http = boost::network::http;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_0, T, tag_types) {
+    typedef http::basic_client<T, 1, 0> client;
+    typename client::request request("http://localhost:12121/");
+    client client_;
+    typename client::response response_;
+    boost::uint16_t port_ = port(request);
+    BOOST_CHECK_EQUAL ( 12121, port_ );
+    BOOST_CHECK_THROW ( response_ = client_.get(request); body(response_); , std::exception );
+}
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_1, T, tag_types) {
+    typedef http::basic_client<T, 1, 1> client_type;
+    typename client_type::request request("http://localhost:12121/");
+    typename client_type::response response_;
+    boost::uint16_t port_ = port(request);
+    BOOST_CHECK_EQUAL ( 12121, port_ );
+    client_type client_;
+    BOOST_CHECK_THROW ( response_ = client_.get(request); body(response_); , std::exception );
+}
diff --git a/libs/network/test/http/server_async.cpp b/libs/network/test/http/server_async.cpp
diff --git a/libs/network/test/http/server_hello_world.cpp b/libs/network/test/http/server_hello_world.cpp
diff --git a/libs/network/test/http/tag_types.hpp b/libs/network/test/http/tag_types.hpp
@@ -0,0 +1,22 @@
+#ifndef TAG_TYPES_4NNM8B5T
+#define TAG_TYPES_4NNM8B5T
+
+// Copyright 2010 Dean Michael Berris. 
+// 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)
+
+#include <boost/mpl/list.hpp>
+#include <boost/network/protocol/http/tags.hpp>
+
+namespace http = boost::network::http;
+
+typedef boost::mpl::list<
+    http::tags::http_default_8bit_tcp_resolve
+    , http::tags::http_default_8bit_udp_resolve
+    , http::tags::http_async_8bit_udp_resolve
+    , http::tags::http_async_8bit_tcp_resolve
+> tag_types;
+
+
+#endif /* TAG_TYPES_4NNM8B5T */
