Skip to content

Commit e13b7b4

Browse files
deanberrisdeanberris
committed
Re-arranging tests for HTTP, renaming accordingly.
1 parent 3affdbd commit e13b7b4

11 files changed

+11
-15
lines changed

‎libs/network/test/CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR})
77
find_package( Boost 1.41.0 COMPONENTS unit_test_framework system regex date_time thread filesystem )
88
find_package( OpenSSL )
9-
if (OPENSSL_FOUND)
10-
include_directories(${OPENSSL_INCLUDE_DIR}})
11-
add_definitions(-DBOOST_NETWORK_ENABLE_HTTPS)
12-
endif()
139
find_package( Threads )
1410
set(Boost_USE_STATIC_LIBS ON)
1511
set(Boost_USE_MULTITHREADED ON)
@@ -19,18 +15,10 @@ add_subdirectory(http)
1915
if (Boost_FOUND)
2016
set(
2117
TESTS
22-
http_incremental_parser
23-
http_incremental_request_parser
24-
http_localhost_tests
25-
https_localhost_tests
2618
message_test
27-
http_message_test
2819
message_transform_test
2920
url_test
30-
http_url_test
3121
utils_thread_pool
32-
http_async_message_ready
33-
http_request_linearize
3422
)
3523
foreach (test ${TESTS})
3624
set_source_files_properties(${test}.cpp

‎libs/network/test/http/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ if (Boost_FOUND)
2323
client_get_test
2424
client_get_different_port_test
2525
client_get_timeout_test
26+
client_localhost_ssl_test
27+
client_localhost_normal_test
28+
message_async_ready_test
29+
message_test
30+
request_linearize_test
31+
request_incremental_parser_test
32+
response_incremental_parser_test
33+
url_test
2634
)
2735
foreach ( test ${TESTS} )
2836
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)

‎libs/network/test/http_localhost_tests.cpp renamed to ‎libs/network/test/http/client_localhost_normal_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// http://www.boost.org/LICENSE_1_0.txt)
66
//
77
// Changes by Kim Grasman 2008
8-
// Changes by Dean Michael Berris 2008
8+
// Changes by Dean Michael Berris 2008, 2010
99

1010
#define BOOST_TEST_MODULE http 1.0 localhost tests
1111

@@ -19,7 +19,7 @@
1919
#include <fstream>
2020
#include <iostream>
2121

22-
#include "server/http_test_server.hpp"
22+
#include "http_test_server.hpp"
2323

2424
using std::cout;
2525
using std::endl;

‎libs/network/test/https_localhost_tests.cpp renamed to ‎libs/network/test/http/client_localhost_ssl_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <iostream>
2020

2121
#define HTTPS_SERVER_TEST
22-
#include "server/http_test_server.hpp"
22+
#include "http_test_server.hpp"
2323

2424
using std::cout;
2525
using std::endl;

‎libs/network/test/server/http_test_server.hpp renamed to ‎libs/network/test/http/http_test_server.hpp

File renamed without changes.

‎libs/network/test/http_async_message_ready.cpp renamed to ‎libs/network/test/http/message_async_ready_test.cpp

File renamed without changes.

‎libs/network/test/http_message_test.cpp renamed to ‎libs/network/test/http/message_test.cpp

File renamed without changes.

‎libs/network/test/http_incremental_request_parser.cpp renamed to ‎libs/network/test/http/request_incremental_parser_test.cpp

File renamed without changes.

‎libs/network/test/http_request_linearize.cpp renamed to ‎libs/network/test/http/request_linearize_test.cpp

File renamed without changes.

‎libs/network/test/http_incremental_parser.cpp renamed to ‎libs/network/test/http/response_incremental_parser_test.cpp

File renamed without changes.

0 commit comments

Comments
 (0)