forked fromglynos/cpp-netlib
- Notifications
You must be signed in to change notification settings - Fork425
Convert all tests to use googletest#580
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
Convert all tests to use googletest
This change systematically removes the dependency to Boost.Testthroughout the tests in libs/network/test/*. Most of the changes aremechanical, and functionally equivalent.We can actually start simplifying the test structure after this changegets pulled into the main repository.
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commita9df2cdf6a30a022de92ff38e1d227f67227fc4c
There are no files selected for viewing
8 changes: 4 additions & 4 deletionsCMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
9 changes: 2 additions & 7 deletionslibs/network/test/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
91 changes: 51 additions & 40 deletionslibs/network/test/http/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
30 changes: 16 additions & 14 deletionslibs/network/test/http/client_constructor_test.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
19 changes: 10 additions & 9 deletionslibs/network/test/http/client_get_different_port_test.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,24 @@ | ||
| // Copyright 2010 Dean Michael Berris. | ||
| // Copyright 2016 Google, Inc. | ||
| // Distributed under the Boost Software License, Version 1.0. | ||
| // (See accompanying file LICENSE_1_0.txt or copy at | ||
| // http://www.boost.org/LICENSE_1_0.txt) | ||
| #include <gtest/gtest.h> | ||
| #include <boost/network/include/http/client.hpp> | ||
| #include "client_types.hpp" | ||
| namespace net = boost::network; | ||
| namespace http = boost::network::http; | ||
| TYPED_TEST_CASE(HTTPClientTest, ClientTypes); | ||
| TYPED_TEST(HTTPClientTest, GetDifferentPort) { | ||
| TypeParam client; | ||
| typename TypeParam::request r("http://www.boost.org:80/"); | ||
| auto response_ = client.get(r); | ||
| auto range = headers(response_)["Content-Type"]; | ||
| EXPECT_TRUE(boost::begin(range) != boost::end(range)); | ||
| EXPECT_NE(0,body(response_).size()); | ||
| } |
35 changes: 18 additions & 17 deletionslibs/network/test/http/client_get_streaming_test.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,46 @@ | ||
| // Copyright 2011 Dean Michael Berris <mikhailberis@gmail.com>. | ||
| // Copyright 2016 Google, Inc. | ||
| // Distributed under the Boost Software License, Version 1.0. | ||
| // (See accompanying file LICENSE_1_0.txt or copy at | ||
| // http://www.boost.org/LICENSE_1_0.txt) | ||
| #include <gtest/gtest.h> | ||
| #include <boost/network/include/http/client.hpp> | ||
| #include <iostream> | ||
| #include "client_types.hpp" | ||
| namespace net = boost::network; | ||
| namespace http = boost::network::http; | ||
| struct body_handler { | ||
| explicit body_handler(std::string& body) : body(body) {} | ||
| BOOST_NETWORK_HTTP_BODY_CALLBACK(operator(), range, error) { | ||
| (void)error; | ||
| body.append(boost::begin(range), boost::end(range)); | ||
| } | ||
| std::string& body; | ||
| }; | ||
| TYPED_TEST_CASE(HTTPClientTest, ClientTypes); | ||
| TYPED_TEST(HTTPClientTest, GetStreamingTest) { | ||
| typename TypeParam::request request("http://www.boost.org"); | ||
| typename TypeParam::response response; | ||
| typename TypeParam::string_type body_string; | ||
| typename TypeParam::string_type dummy_body; | ||
| body_handler handler_instance(body_string); | ||
| { | ||
| TypeParam client_; | ||
| ASSERT_NO_THROW(response = client_.get(request, handler_instance)); | ||
| auto range = headers(response)["Content-Type"]; | ||
| ASSERT_TRUE(!boost::empty(range)); | ||
| EXPECT_EQ(0u,body(response).size()); | ||
| EXPECT_EQ("HTTP/1.",response.version().substr(0, 7)); | ||
| EXPECT_EQ(200u,response.status()); | ||
| EXPECT_EQ("OK",response.status_message()); | ||
| dummy_body = body(response); | ||
| } | ||
| EXPECT_EQ(dummy_body,typenameTypeParam::string_type()); | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.