From bfec81998b78a282edc5a33cd31faa9d7e116971 Mon Sep 17 00:00:00 2001 From: yhirose Date: Fri, 6 Sep 2019 18:16:42 -0400 Subject: [PATCH] Code cleanup --- README.md | 3 ++- test/test.cc | 28 ++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 30bf3b1..149cf98 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,8 @@ if (cli.send(requests, responses)) { ```cpp httplib::Client cli("yahoo.com"); cli.follow_location(true); -auto ret = cli.Get("/"); +auto res = cli.Get("/"); +res->status; // 200 ``` OpenSSL Support diff --git a/test/test.cc b/test/test.cc index a5f569b..d103ca2 100644 --- a/test/test.cc +++ b/test/test.cc @@ -441,8 +441,9 @@ TEST(AbsoluteRedirectTest, Redirect) { #endif cli.follow_location(true); - auto ret = cli.Get("/absolute-redirect/3"); - ASSERT_TRUE(ret != nullptr); + auto res = cli.Get("/absolute-redirect/3"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); } TEST(RedirectTest, Redirect) { @@ -455,8 +456,9 @@ TEST(RedirectTest, Redirect) { #endif cli.follow_location(true); - auto ret = cli.Get("/redirect/3"); - ASSERT_TRUE(ret != nullptr); + auto res = cli.Get("/redirect/3"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); } TEST(RelativeRedirectTest, Redirect) { @@ -469,8 +471,9 @@ TEST(RelativeRedirectTest, Redirect) { #endif cli.follow_location(true); - auto ret = cli.Get("/relative-redirect/3"); - ASSERT_TRUE(ret != nullptr); + auto res = cli.Get("/relative-redirect/3"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); } TEST(TooManyRedirectTest, Redirect) { @@ -483,23 +486,24 @@ TEST(TooManyRedirectTest, Redirect) { #endif cli.follow_location(true); - auto ret = cli.Get("/redirect/21"); - ASSERT_TRUE(ret == nullptr); + auto res = cli.Get("/redirect/21"); + ASSERT_TRUE(res == nullptr); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT TEST(YahooRedirectTest, Redirect) { httplib::Client cli("yahoo.com"); cli.follow_location(true); - auto ret = cli.Get("/"); - ASSERT_TRUE(ret != nullptr); + auto res = cli.Get("/"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); } TEST(Https2HttpRedirectTest, Redirect) { httplib::SSLClient cli("httpbin.org"); cli.follow_location(true); - auto ret = cli.Get("/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302"); - ASSERT_TRUE(ret != nullptr); + auto res = cli.Get("/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302"); + ASSERT_TRUE(res != nullptr); } #endif