Skip to content

Commit 85830b0

Browse files
glynosglynos
committed
Updated feature tests for client and connections.
1 parent b895062 commit 85830b0

File tree

6 files changed

+79
-57
lines changed

6 files changed

+79
-57
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55

66
set(CPP-NETLIB_CLIENT_TESTS
77
async_resolver_test
8+
normal_connection_test
9+
client_test
810
)
911

12+
if (OPENSSL_FOUND)
13+
list(APPEND CPP-NETLIB_CLIENT_TESTS ssl_connection_test)
14+
endif()
15+
1016
foreach(test ${CPP-NETLIB_CLIENT_TESTS})
1117
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
1218
set_source_files_properties(${test}.cpp
@@ -28,3 +34,7 @@ foreach(test ${CPP-NETLIB_CLIENT_TESTS})
2834
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})
2935

3036
endforeach(test)
37+
38+
if (OPENSSL_FOUND)
39+
target_link_libraries(cpp-netlib-http-v2-ssl_connection_test ${OPENSSL_LIBRARIES})
40+
endif()

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Copyright (C) 2013 by Glyn Matthews
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
#include <igloo/igloo_alt.h>
7+
#include "network/http/v2/client.hpp"
8+
9+
using namespace igloo;
10+
namespace http = network::http::v2;
11+
12+
Describe(http_client) {
13+
14+
It(gets_a_response) {
15+
auto response = client_.get(http::request(network::uri("http://127.0.0.1/")));
16+
}
17+
18+
http::client client_;
19+
20+
};
21+
22+
//TEST(client_test, get) {
23+
// http::client client;
24+
// auto response = client.get(http::request(network::uri("http://127.0.0.1/")));
25+
// FAIL();
26+
//}
27+
//
28+
//TEST(client_test, post) {
29+
// http::client client;
30+
// auto response = client.post(http::request(network::uri("http://127.0.0.1/")));
31+
// FAIL();
32+
//}
33+
//
34+
//TEST(client_test, put) {
35+
// http::client client;
36+
// auto response = client.put(http::request(network::uri("http://127.0.0.1/")));
37+
// FAIL();
38+
//}
39+
//
40+
//TEST(client_test, delete) {
41+
// http::client client;
42+
// auto response = client.delete_(http::request(network::uri("http://127.0.0.1/")));
43+
// FAIL();
44+
//}
45+
//
46+
//TEST(client_test, head) {
47+
// http::client client;
48+
// auto response = client.head(http::request(network::uri("http://127.0.0.1/")));
49+
// FAIL();
50+
//}
51+
52+
int
53+
main(int argc, char *argv[]) {
54+
return TestRunner::RunAllTests(argc, const_cast<const char **>(argv));
55+
}

‎http/test/v2/units/client/normal_connection_test.cpp renamed to ‎http/test/v2/features/client/normal_connection_test.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
// (See accompanying file LICENSE_1_0.txt or copy at
44
// http://www.boost.org/LICENSE_1_0.txt)
55

6-
#include <gtest/gtest.h>
6+
#include <igloo/igloo_alt.h>
77
#include <boost/asio.hpp>
88
#include "network/http/v2/client/connection/normal_connection_delegate.hpp"
9-
#include <iostream>
109

10+
using namespace igloo;
1111
using boost::asio::ip::tcp;
1212
namespace http = network::http::v2;
1313

14+
int
15+
main(int argc, char *argv[]) {
16+
return TestRunner::RunAllTests(argc, const_cast<const char **>(argv));
17+
}

‎http/test/v2/units/client/ssl_connection_test.cpp renamed to ‎http/test/v2/features/client/ssl_connection_test.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
// (See accompanying file LICENSE_1_0.txt or copy at
44
// http://www.boost.org/LICENSE_1_0.txt)
55

6-
#include <gtest/gtest.h>
6+
#include <igloo/igloo.h>
77
#include <boost/asio.hpp>
88
#include "network/http/v2/client/connection/ssl_connection_delegate.hpp"
9-
#include <iostream>
109

10+
using namespace igloo;
11+
using boost::asio::ip::tcp;
1112
namespace http = network::http::v2;
13+
14+
int
15+
main(int argc, char *argv[]) {
16+
return TestRunner::RunAllTests(argc, const_cast<const char **>(argv));
17+
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ set(CPP-NETLIB_CLIENT_TESTS
99
byte_source_test
1010
response_test
1111
request_test
12-
normal_connection_test
13-
client_test
1412
)
1513

16-
if (OPENSSL_FOUND)
17-
list(APPEND CPP-NETLIB_CLIENT_TESTS ssl_connection_test)
18-
endif()
19-
2014
foreach(test ${CPP-NETLIB_CLIENT_TESTS})
2115
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
2216
set_source_files_properties(${test}.cpp
@@ -39,7 +33,3 @@ foreach(test ${CPP-NETLIB_CLIENT_TESTS})
3933
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})
4034

4135
endforeach(test)
42-
43-
if (OPENSSL_FOUND)
44-
target_link_libraries(cpp-netlib-http-v2-ssl_connection_test ${OPENSSL_LIBRARIES})
45-
endif()

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

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)