HTTP Client Test Consolidation, Remove Boost.Test

This is the simplification of the HTTP client test suite which serves as a guide for getting other tests migrated to use gtest. Moving forward the idea is to accomplish the same for all of the tests in cpp-netlib: * Consolidate logically grouped tests into a single binary. * Remove all traces of dependency to the Boost.Test framework. * Get all tests to a "green" state again. This paves the way for implementing mocks for some internal classes that we want to be able to change. In the meantime simplifying the test suite buys us more in the long run as we add more and more tests to the library.
cpp-netlib · deanberris · Jan 28, 2013 · Jan 21, 2013 · Jan 22, 2013 · Jan 26, 2013
commit 113e9fb7e69beac8b3029adb2468befa07ffdb1c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,11 +23,7 @@ else()
   set(Boost_USE_STATIC_LIBS ON)
 endif()
 set(Boost_USE_MULTITHREADED ON)
-if(CPP-NETLIB_BUILD_TESTS)
-  set(Boost_COMPONENTS unit_test_framework system regex date_time filesystem program_options )
-else()
-  set(Boost_COMPONENTS system regex date_time filesystem program_options )
-endif()
+set(Boost_COMPONENTS system regex date_time filesystem program_options )
 find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )
 find_package( Threads )

diff --git a/http/src/network/protocol/http/request/request_base.ipp b/http/src/network/protocol/http/request/request_base.ipp
@@ -8,6 +8,7 @@
 #define NETWORK_RPTOCOL_HTTP_REQUEST_BASE_IPP_20111102
 
 #include <network/protocol/http/request/request_base.hpp>
+#include <vector>
 #include <thread>
 #include <cstring>
 

diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -8,11 +8,12 @@ include_directories(
   ${CPP-NETLIB_SOURCE_DIR}/message/src
   ${CPP-NETLIB_SOURCE_DIR}/logging/src
   ${CPP-NETLIB_SOURCE_DIR}/http/src
+  ${GTEST_INCLUDE_DIRS}
   ${CPP-NETLIB_SOURCE_DIR})
 
 if (OPENSSL_FOUND)
     include_directories( ${OPENSSL_INCLUDE_DIR} )
-    add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
+    add_definitions(-DNETWORK_ENABLE_HTTPS)
 endif()
 
 if( NOT CPP-NETLIB_DISABLE_LOGGING )
@@ -47,6 +48,7 @@ if (Boost_FOUND)
             )
         target_link_libraries(cpp-netlib-http-${test}
             ${Boost_LIBRARIES}
+            ${GTEST_BOTH_LIBRARIES}
             ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
             ${CMAKE_THREAD_LIBS_INIT}
             cppnetlib-message
@@ -62,69 +64,62 @@ if (Boost_FOUND)
             ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
     endforeach(test)
 
-    set ( TESTS
-        client_constructor_test
-        client_get_test
-        client_get_different_port_test
-        client_get_timeout_test
-        client_get_streaming_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}
-            ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
-            ${CMAKE_THREAD_LIBS_INIT}
-            cppnetlib-constants
-            cppnetlib-uri
-            cppnetlib-message
-            cppnetlib-message-wrappers
-            cppnetlib-message-directives
-	    ${CPP-NETLIB_LOGGING_LIB}
-            cppnetlib-http-message
-            cppnetlib-http-message-wrappers
-            cppnetlib-http-client
-            cppnetlib-http-client-connections)
-        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)
+    if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+        set_source_files_properties(client_test.cpp
+            PROPERTIES COMPILE_FLAGS "-Wall")
+    endif()
+    add_executable(cpp-netlib-http-client_test client_test.cpp)
+    target_link_libraries(cpp-netlib-http-client_test
+        ${Boost_LIBRARIES}
+        ${GTEST_BOTH_LIBRARIES}
+        ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
+        ${CMAKE_THREAD_LIBS_INIT}
+        cppnetlib-constants
+        cppnetlib-uri
+        cppnetlib-message
+        cppnetlib-message-wrappers
+        cppnetlib-message-directives
+        ${CPP-NETLIB_LOGGING_LIB}
+        cppnetlib-http-message
+        cppnetlib-http-message-wrappers
+        cppnetlib-http-client
+        cppnetlib-http-client-connections)
+    if (OPENSSL_FOUND)
+        target_link_libraries(cpp-netlib-http-client_test ${OPENSSL_LIBRARIES})
+    endif()
+    set_target_properties(cpp-netlib-http-client_test
+        PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+    add_test(cpp-netlib-http-client_test
+        ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-${test})
 
-    #set ( SERVER_API_TESTS
-    #    server_constructor_test
-    #    server_async_run_stop_concurrency
-    #    )
-    #foreach ( test ${SERVER_API_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}
-    #        ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
-    #        ${CMAKE_THREAD_LIBS_INIT}
-    #        cppnetlib-constants
-    #        cppnetlib-uri
-    #        cppnetlib-message
-    #        cppnetlib-message-wrappers
-    #        cppnetlib-http-message
-    #        cppnetlib-http-server
-    #        cppnetlib-http-server-parsers
-    #        cppnetlib-utils-thread_pool
-    #        )
-    #    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_API_TESTS
+#        server_constructor_test
+#        server_async_run_stop_concurrency
+#        )
+#    foreach ( test ${SERVER_API_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}
+#            ${GTEST_BOTH_LIBRARIES}
+#            ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
+#            ${CMAKE_THREAD_LIBS_INIT}
+#            cppnetlib-constants
+#            cppnetlib-uri
+#            cppnetlib-message
+#            cppnetlib-message-wrappers
+#            cppnetlib-http-message
+#            cppnetlib-http-server
+#            cppnetlib-http-server-parsers
+#            cppnetlib-utils-thread_pool
+#            )
+#        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)
 
 endif()
diff --git a/http/test/client_constructor_test.cpp b/http/test/client_constructor_test.cpp
diff --git a/http/test/client_get_different_port_test.cpp b/http/test/client_get_different_port_test.cpp
diff --git a/http/test/client_get_streaming_test.cpp b/http/test/client_get_streaming_test.cpp
diff --git a/http/test/client_get_test.cpp b/http/test/client_get_test.cpp
diff --git a/http/test/client_get_timeout_test.cpp b/http/test/client_get_timeout_test.cpp
diff --git a/http/test/client_include_inlined.cpp b/http/test/client_include_inlined.cpp