Skip to content

Commit 41a1e67

Browse files
glynosglynos
committed
Removed warnings from CMakeLists.txt files, because of the noise from BOOST_CONCEPT_CHECK. Refactored normal connection test.
1 parent 3382000 commit 41a1e67

File tree

7 files changed

+56
-109
lines changed

7 files changed

+56
-109
lines changed

‎CMakeLists.txt

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else()
2929
endif()
3030
set(Boost_USE_MULTITHREADED ON)
3131
set(Boost_COMPONENTS system regex date_time filesystem program_options )
32-
find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
32+
find_package( Boost 1.53 REQUIRED ${Boost_COMPONENTS} )
3333
find_package( OpenSSL )
3434
find_package( Threads )
3535
set(CMAKE_VERBOSE_MAKEFILE true)
@@ -46,7 +46,8 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
4646
INCLUDE(CheckCXXCompilerFlag)
4747
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
4848
if (HAVE_STD11)
49-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
49+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
50+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
5051
else()
5152
message(FATAL_ERROR "No advanced standard C++ support (-std=c++11 not defined).")
5253
endif()
@@ -55,9 +56,11 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
5556
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
5657
if (HAVE_STD11)
5758
if (CPP-NETLIB_DISABLE_LIBCXX)
58-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
59+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
60+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
5961
else()
60-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
62+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
63+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
6164
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -stdlib=libc++")
6265
endif()
6366
else()
@@ -124,16 +127,16 @@ if(CPP-NETLIB_BUILD_TESTS)
124127
set(GTEST_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gtest)
125128
set(GTEST_FOUND ON)
126129
set(GTEST_INCLUDE_DIRS ${GTEST_ROOT}/include)
127-
set(GTEST_LIBRARIES gtest)
128-
set(GTEST_MAIN_LIBRARIES gtest_main)
129-
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
130+
set(GTEST_LIBRARY gtest)
131+
set(GTEST_MAIN_LIBRARY gtest_main)
132+
set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
130133

131134
set(GMOCK_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/gmock)
132135
set(GMOCK_FOUND ON)
133136
set(GMOCK_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} {${GMOCK_DIR}/include)
134-
set(GMOCK_LIBRARIES {$GTEST_LIBRARIES} gmock)
135-
set(GMOCK_MAIN_LIBRARIES gmock_main)
136-
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
137+
set(GMOCK_LIBRARY {$GTEST_LIBRARIES} gmock)
138+
set(GMOCK_MAIN_LIBRARY gmock_main)
139+
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
137140

138141
set(IGLOO_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/igloo)
139142
set(IGLOO_FOUND ON)
@@ -148,6 +151,7 @@ if (DOXYGEN_FOUND)
148151
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
149152
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
150153
COMMENT "Generating API documentation with Doxygen" VERBATIM)
154+
set(CPP-NETLIB_GENERATE_DOCS ON)
151155
endif(DOXYGEN_FOUND)
152156

153157
if(CPP-NETLIB_BUILD_SINGLE_LIB)
@@ -178,7 +182,7 @@ if(CPP-NETLIB_BUILD_SINGLE_LIB)
178182
${CPP-NETLIB_MESSAGE_SRCS}
179183
${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS}
180184
${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS}
181-
${CPP-NETLIB_LOGGING_SRCS}
185+
${CPP-NETLIB_LoOGGING_SRCS}
182186
${CPP-NETLIB_HTTP_CLIENT_SRCS}
183187
${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS}
184188
${CPP-NETLIB_HTTP_SERVER_SRCS}

‎http/test/v2/features/client/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ set(CPP-NETLIB_CLIENT_TESTS
1414
#endif()
1515

1616
foreach(test ${CPP-NETLIB_CLIENT_TESTS})
17-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
18-
set_source_files_properties(${test}.cpp
19-
PROPERTIES COMPILE_FLAGS "-Wall")
20-
endif()
17+
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
18+
# set_source_files_properties(${test}.cpp
19+
# PROPERTIES COMPILE_FLAGS "-Wall")
20+
#endif()
2121

2222
add_executable(cpp-netlib-http-v2-${test} ${test}.cpp)
2323
target_link_libraries(cpp-netlib-http-v2-${test}

‎http/test/v2/features/client/client_test.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,6 @@ Describe(http_client) {
2020

2121
};
2222

23-
//TEST(client_test, get) {
24-
// http::client client;
25-
// auto response = client.get(http::request(network::uri("http://127.0.0.1/")));
26-
// FAIL();
27-
//}
28-
//
29-
//TEST(client_test, post) {
30-
// http::client client;
31-
// auto response = client.post(http::request(network::uri("http://127.0.0.1/")));
32-
// FAIL();
33-
//}
34-
//
35-
//TEST(client_test, put) {
36-
// http::client client;
37-
// auto response = client.put(http::request(network::uri("http://127.0.0.1/")));
38-
// FAIL();
39-
//}
40-
//
41-
//TEST(client_test, delete) {
42-
// http::client client;
43-
// auto response = client.delete_(http::request(network::uri("http://127.0.0.1/")));
44-
// FAIL();
45-
//}
46-
//
47-
//TEST(client_test, head) {
48-
// http::client client;
49-
// auto response = client.head(http::request(network::uri("http://127.0.0.1/")));
50-
// FAIL();
51-
//}
52-
5323
int
5424
main(int argc, char *argv[]) {
5525
return TestRunner::RunAllTests(argc, const_cast<const char **>(argv));

‎http/test/v2/features/client/normal_connection_test.cpp

Lines changed: 28 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ Describe(normal_http_connection) {
2727
socket_->close();
2828
}
2929

30-
It(connects_to_localhost) {
30+
void ConnectToLocalhost(boost::system::error_code &ec) {
3131
// Resolve the host.
32-
boost::system::error_code ec;
3332
tcp::resolver::query query("www.boost.org", "80");
3433
auto it = resolver_->resolve(query, ec);
3534
Assert::That(ec, Equals(boost::system::error_code()));
@@ -40,23 +39,10 @@ Describe(normal_http_connection) {
4039
[&ec] (const boost::system::error_code &ec_) {
4140
ec = ec_;
4241
});
43-
io_service_->run_one();
44-
Assert::That(ec, Equals(boost::system::error_code()));
4542
}
4643

47-
It(writes_to_localhost) {
48-
// Resolve the host.
49-
boost::system::error_code ec;
50-
tcp::resolver::query query("www.boost.org", "80");
51-
auto it = resolver_->resolve(query, ec);
52-
Assert::That(ec, Equals(boost::system::error_code()));
53-
54-
// Make sure that the connection is successful.
55-
tcp::endpoint endpoint(it->endpoint());
56-
connection_->async_connect(endpoint, "www.boost.org",
57-
[&ec] (const boost::system::error_code &ec_) {
58-
Assert::That(ec_, Equals(boost::system::error_code()));
59-
});
44+
void WriteToLocalhost(boost::system::error_code &ec,
45+
std::size_t &bytes_written) {
6046

6147
// Create an HTTP request.
6248
http::request request{network::uri{"http://www.boost.org/"}};
@@ -69,63 +55,50 @@ Describe(normal_http_connection) {
6955
boost::asio::streambuf request_;
7056
std::ostream request_stream(&request_);
7157
request_stream << request;
72-
std::size_t bytes_written = 0;
7358
connection_->async_write(request_,
7459
[&bytes_written] (const boost::system::error_code &ec_,
7560
std::size_t bytes_written_) {
7661
Assert::That(ec_, Equals(boost::system::error_code()));
7762
bytes_written = bytes_written_;
7863
});
79-
io_service_->run();
80-
Assert::That(bytes_written, IsGreaterThan(0));
8164
}
8265

83-
It(reads_from_localhost) {
84-
// Resolve the host.
85-
boost::system::error_code ec;
86-
tcp::resolver::query query("www.boost.org", "80");
87-
auto it = resolver_->resolve(query, ec);
88-
Assert::That(ec, Equals(boost::system::error_code()));
89-
90-
// Make sure that the connection is successful.
91-
tcp::endpoint endpoint(it->endpoint());
92-
connection_->async_connect(endpoint, "www.boost.org",
93-
[] (const boost::system::error_code &ec_) {
94-
Assert::That(ec_, Equals(boost::system::error_code()));
95-
});
96-
97-
// Create an HTTP request.
98-
http::request request{network::uri{"http://www.boost.org/LICENSE_1_0.txt"}};
99-
request.set_method(http::method::GET);
100-
request.set_version("1.0");
101-
request.append_header("User-Agent", "normal_connection_test");
102-
request.append_header("Connection", "close");
103-
104-
// Write the HTTP request to the socket, sending it to the server.
105-
boost::asio::streambuf request_;
106-
std::ostream request_stream(&request_);
107-
request_stream << request;
108-
std::size_t bytes_written = 0;
109-
connection_->async_write(request_,
110-
[&bytes_written] (const boost::system::error_code &ec_,
111-
std::size_t bytes_written_) {
112-
Assert::That(ec_, Equals(boost::system::error_code()));
113-
bytes_written = bytes_written_;
114-
});
115-
66+
void ReadFromLocalhost(boost::system::error_code &ec,
67+
std::size_t &bytes_read) {
11668
// Read the HTTP response on the socket from the server.
11769
char output[1024];
11870
std::memset(output, 0, sizeof(output));
119-
std::size_t bytes_read = 0;
12071
connection_->async_read_some(boost::asio::mutable_buffers_1(output, sizeof(output)),
12172
[&bytes_read] (const boost::system::error_code &ec_,
12273
std::size_t bytes_read_) {
12374
Assert::That(ec_, Equals(boost::system::error_code()));
12475
bytes_read = bytes_read_;
12576
});
77+
}
78+
79+
It(connects_to_localhost) {
80+
boost::system::error_code ec;
81+
ConnectToLocalhost(ec);
82+
io_service_->run_one();
83+
Assert::That(ec, Equals(boost::system::error_code()));
84+
}
85+
86+
It(writes_to_localhost) {
87+
boost::system::error_code ec;
88+
std::size_t bytes_written = 0;
89+
ConnectToLocalhost(ec);
90+
WriteToLocalhost(ec, bytes_written);
91+
io_service_->run();
92+
Assert::That(bytes_written, IsGreaterThan(0));
93+
}
12694

95+
It(reads_from_localhost) {
96+
boost::system::error_code ec;
97+
std::size_t bytes_written = 0, bytes_read = 0;;
98+
ConnectToLocalhost(ec);
99+
WriteToLocalhost(ec, bytes_written);
100+
ReadFromLocalhost(ec, bytes_read);
127101
io_service_->run();
128-
std::cout << output << std::endl;
129102
Assert::That(bytes_read, IsGreaterThan(0));
130103
}
131104

‎http/test/v2/units/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ set(CPP-NETLIB_CLIENT_TESTS
88
)
99

1010
foreach(test ${CPP-NETLIB_CLIENT_TESTS})
11-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
12-
set_source_files_properties(${test}.cpp
13-
PROPERTIES COMPILE_FLAGS "-Wall")
14-
endif()
11+
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
12+
# set_source_files_properties(${test}.cpp
13+
# PROPERTIES COMPILE_FLAGS "-Wall")
14+
#endif()
1515

1616
add_executable(cpp-netlib-http-v2-${test} ${test}.cpp)
1717
target_link_libraries(cpp-netlib-http-v2-${test}

‎http/test/v2/units/client/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ set(CPP-NETLIB_CLIENT_TESTS
1313
)
1414

1515
foreach(test ${CPP-NETLIB_CLIENT_TESTS})
16-
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
17-
set_source_files_properties(${test}.cpp
18-
PROPERTIES COMPILE_FLAGS "-Wall")
19-
endif()
16+
#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
17+
# set_source_files_properties(${test}.cpp
18+
# PROPERTIES COMPILE_FLAGS "-Wall")
19+
#endif()
2020

2121
add_executable(cpp-netlib-http-v2-${test} ${test}.cpp)
2222
target_link_libraries(cpp-netlib-http-v2-${test}

‎uri

Submodule uri updated from 7a5399b to 7e21917

0 commit comments

Comments
 (0)