UnknownObject/WebCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove http prefix

Browse Source
This commit is contained in:
Chunting Gu
2019-04-18 13:40:36 +08:00
parent 2ea04b9705
commit e621025cc3
66 changed files with 997 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autotest/CMakeLists.txt
+1 -1
View File
@@ -1,7 +1,7 @@
# Auto test
set(AT_SRCS
http_client_autotest.cc
client_autotest.cc
)
set(AT_TARGET_NAME webcc_autotest)
autotest/http_client_autotest.cc → autotest/client_autotest.cc
+20 -20
View File
@@ -3,7 +3,7 @@
#include "boost/algorithm/string.hpp"
#include "json/json.h"
#include "webcc/http_client_session.h"
#include "webcc/client_session.h"
#include "webcc/logger.h"
// -----------------------------------------------------------------------------
@@ -36,7 +36,7 @@ static Json::Value StringToJson(const std::string& str) {
// -----------------------------------------------------------------------------
static void AssertGet(webcc::HttpResponsePtr r) {
static void AssertGet(webcc::ResponsePtr r) {
Json::Value json = StringToJson(r->content());
Json::Value args = json["args"];
@@ -52,11 +52,11 @@ static void AssertGet(webcc::HttpResponsePtr r) {
EXPECT_EQ("httpbin.org", headers["Host"].asString());
}
TEST(HttpClientTest, Get_RequestFunc) {
webcc::HttpClientSession session;
TEST(ClientTest, Get_RequestFunc) {
webcc::ClientSession session;
try {
auto r = session.Request(webcc::HttpRequestBuilder{}.Get().
auto r = session.Request(webcc::RequestBuilder{}.Get().
Url("http://httpbin.org/get").
Query("key1", "value1").
Query("key2", "value2").
@@ -70,8 +70,8 @@ TEST(HttpClientTest, Get_RequestFunc) {
}
}
TEST(HttpClientTest, Get_Shortcut) {
webcc::HttpClientSession session;
TEST(ClientTest, Get_Shortcut) {
webcc::ClientSession session;
try {
auto r = session.Get("http://httpbin.org/get",
@@ -86,14 +86,14 @@ TEST(HttpClientTest, Get_Shortcut) {
}
#if WEBCC_ENABLE_SSL
TEST(HttpClientTest, Get_SSL) {
webcc::HttpClientSession session;
TEST(ClientTest, Get_SSL) {
webcc::ClientSession session;
session.set_ssl_verify(kSslVerify);
try {
// HTTPS is auto-detected from the URL scheme.
auto r = session.Request(webcc::HttpRequestBuilder{}.Get().
auto r = session.Request(webcc::RequestBuilder{}.Get().
Url("https://httpbin.org/get").
Query("key1", "value1").
Query("key2", "value2").
@@ -111,8 +111,8 @@ TEST(HttpClientTest, Get_SSL) {
// -----------------------------------------------------------------------------
// Test Gzip compressed response.
TEST(HttpClientTest, Compression_Gzip) {
webcc::HttpClientSession session;
TEST(ClientTest, Compression_Gzip) {
webcc::ClientSession session;
try {
auto r = session.Get("http://httpbin.org/gzip");
@@ -127,8 +127,8 @@ TEST(HttpClientTest, Compression_Gzip) {
}
// Test Deflate compressed response.
TEST(HttpClientTest, Compression_Deflate) {
webcc::HttpClientSession session;
TEST(ClientTest, Compression_Deflate) {
webcc::ClientSession session;
try {
auto r = session.Get("http://httpbin.org/deflate");
@@ -157,8 +157,8 @@ TEST(HttpClientTest, Compression_Deflate) {
// "https://www.google.com";
// "https://api.github.com/events";
//
TEST(HttpClientTest, KeepAlive) {
webcc::HttpClientSession session;
TEST(ClientTest, KeepAlive) {
webcc::ClientSession session;
std::string url = "http://httpbin.org/get";
try {
@@ -176,14 +176,14 @@ TEST(HttpClientTest, KeepAlive) {
EXPECT_TRUE(iequals(r->GetHeader("Connection"), "Close"));
// Close by using request builder.
r = session.Request(webcc::HttpRequestBuilder{}.Get().
r = session.Request(webcc::RequestBuilder{}.Get().
Url(url).KeepAlive(false)
());
EXPECT_TRUE(iequals(r->GetHeader("Connection"), "Close"));
// Keep-Alive explicitly by using request builder.
r = session.Request(webcc::HttpRequestBuilder{}.Get().
r = session.Request(webcc::RequestBuilder{}.Get().
Url(url).KeepAlive(true)
());
@@ -197,8 +197,8 @@ TEST(HttpClientTest, KeepAlive) {
// -----------------------------------------------------------------------------
// Get a JPEG image.
TEST(HttpClientTest, GetImageJpeg) {
webcc::HttpClientSession session;
TEST(ClientTest, GetImageJpeg) {
webcc::ClientSession session;
std::string url = "http://httpbin.org/get";
try {