Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_pipelined_host_impl_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/http/http_pipelined_host_impl.cc ('k') | net/http/http_pipelined_host_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_pipelined_host_impl_unittest.cc
diff --git a/net/http/http_pipelined_host_impl_unittest.cc b/net/http/http_pipelined_host_impl_unittest.cc
index 2658472138d3987fc3c059c51b40b63cc281eef6..70e04a527333b8d9b4f5975090946d4e98207f3d 100644
--- a/net/http/http_pipelined_host_impl_unittest.cc
+++ b/net/http/http_pipelined_host_impl_unittest.cc
@@ -24,39 +24,46 @@ namespace {
ClientSocketHandle* kDummyConnection =
reinterpret_cast<ClientSocketHandle*>(84);
-HttpPipelinedStream* kDummyStream =
- reinterpret_cast<HttpPipelinedStream*>(42);
+HttpPipelinedStream* kDummyStream = reinterpret_cast<HttpPipelinedStream*>(42);
class HttpPipelinedHostImplTest : public testing::Test {
public:
HttpPipelinedHostImplTest()
: key_(HostPortPair("host", 123)),
factory_(new MockPipelineFactory), // Owned by host_.
- host_(new HttpPipelinedHostImpl(&delegate_, key_, factory_,
- PIPELINE_CAPABLE)) {
- }
+ host_(new HttpPipelinedHostImpl(&delegate_,
+ key_,
+ factory_,
+ PIPELINE_CAPABLE)) {}
void SetCapability(HttpPipelinedHostCapability capability) {
factory_ = new MockPipelineFactory;
- host_.reset(new HttpPipelinedHostImpl(
- &delegate_, key_, factory_, capability));
+ host_.reset(
+ new HttpPipelinedHostImpl(&delegate_, key_, factory_, capability));
}
MockPipeline* AddTestPipeline(int depth, bool usable, bool active) {
MockPipeline* pipeline = new MockPipeline(depth, usable, active);
- EXPECT_CALL(*factory_, CreateNewPipeline(kDummyConnection, host_.get(),
- MatchesOrigin(key_.origin()),
- Ref(ssl_config_), Ref(proxy_info_),
- Ref(net_log_), true,
- kProtoSPDY3))
+ EXPECT_CALL(*factory_,
+ CreateNewPipeline(kDummyConnection,
+ host_.get(),
+ MatchesOrigin(key_.origin()),
+ Ref(ssl_config_),
+ Ref(proxy_info_),
+ Ref(net_log_),
+ true,
+ kProtoSPDY3))
.Times(1)
.WillOnce(Return(pipeline));
- EXPECT_CALL(*pipeline, CreateNewStream())
- .Times(1)
- .WillOnce(Return(kDummyStream));
- EXPECT_EQ(kDummyStream, host_->CreateStreamOnNewPipeline(
- kDummyConnection, ssl_config_, proxy_info_, net_log_, true,
- kProtoSPDY3));
+ EXPECT_CALL(*pipeline, CreateNewStream()).Times(1).WillOnce(
+ Return(kDummyStream));
+ EXPECT_EQ(kDummyStream,
+ host_->CreateStreamOnNewPipeline(kDummyConnection,
+ ssl_config_,
+ proxy_info_,
+ net_log_,
+ true,
+ kProtoSPDY3));
return pipeline;
}
@@ -82,27 +89,21 @@ TEST_F(HttpPipelinedHostImplTest, Delegate) {
TEST_F(HttpPipelinedHostImplTest, OnUnusablePipelineHasCapacity) {
MockPipeline* pipeline = AddTestPipeline(0, false, true);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(0);
- EXPECT_CALL(delegate_, OnHostIdle(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(0);
+ EXPECT_CALL(delegate_, OnHostIdle(host_.get())).Times(1);
host_->OnPipelineHasCapacity(pipeline);
}
TEST_F(HttpPipelinedHostImplTest, OnUsablePipelineHasCapacity) {
MockPipeline* pipeline = AddTestPipeline(1, true, true);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
- EXPECT_CALL(delegate_, OnHostIdle(host_.get()))
- .Times(0);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
+ EXPECT_CALL(delegate_, OnHostIdle(host_.get())).Times(0);
host_->OnPipelineHasCapacity(pipeline);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
- EXPECT_CALL(delegate_, OnHostIdle(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
+ EXPECT_CALL(delegate_, OnHostIdle(host_.get())).Times(1);
ClearTestPipeline(pipeline);
}
@@ -125,8 +126,8 @@ TEST_F(HttpPipelinedHostImplTest, IgnoresInactivePipeline) {
}
TEST_F(HttpPipelinedHostImplTest, IgnoresFullPipeline) {
- MockPipeline* pipeline = AddTestPipeline(
- HttpPipelinedHostImpl::max_pipeline_depth(), true, true);
+ MockPipeline* pipeline =
+ AddTestPipeline(HttpPipelinedHostImpl::max_pipeline_depth(), true, true);
EXPECT_FALSE(host_->IsExistingPipelineAvailable());
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
@@ -135,16 +136,15 @@ TEST_F(HttpPipelinedHostImplTest, IgnoresFullPipeline) {
}
TEST_F(HttpPipelinedHostImplTest, PicksLeastLoadedPipeline) {
- MockPipeline* full_pipeline = AddTestPipeline(
- HttpPipelinedHostImpl::max_pipeline_depth(), true, true);
+ MockPipeline* full_pipeline =
+ AddTestPipeline(HttpPipelinedHostImpl::max_pipeline_depth(), true, true);
MockPipeline* usable_pipeline = AddTestPipeline(
HttpPipelinedHostImpl::max_pipeline_depth() - 1, true, true);
MockPipeline* empty_pipeline = AddTestPipeline(0, true, true);
EXPECT_TRUE(host_->IsExistingPipelineAvailable());
- EXPECT_CALL(*empty_pipeline, CreateNewStream())
- .Times(1)
- .WillOnce(ReturnNull());
+ EXPECT_CALL(*empty_pipeline, CreateNewStream()).Times(1).WillOnce(
+ ReturnNull());
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
ClearTestPipeline(full_pipeline);
@@ -157,17 +157,14 @@ TEST_F(HttpPipelinedHostImplTest, OpensUpOnPipelineSuccess) {
MockPipeline* pipeline = AddTestPipeline(1, true, true);
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
host_->OnPipelineFeedback(pipeline, HttpPipelinedConnection::OK);
- EXPECT_CALL(*pipeline, CreateNewStream())
- .Times(1)
- .WillOnce(Return(kDummyStream));
+ EXPECT_CALL(*pipeline, CreateNewStream()).Times(1).WillOnce(
+ Return(kDummyStream));
EXPECT_EQ(kDummyStream, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
ClearTestPipeline(pipeline);
}
@@ -177,17 +174,14 @@ TEST_F(HttpPipelinedHostImplTest, OpensAllPipelinesOnPipelineSuccess) {
MockPipeline* pipeline2 = AddTestPipeline(1, true, true);
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
host_->OnPipelineFeedback(pipeline1, HttpPipelinedConnection::OK);
- EXPECT_CALL(*pipeline2, CreateNewStream())
- .Times(1)
- .WillOnce(Return(kDummyStream));
+ EXPECT_CALL(*pipeline2, CreateNewStream()).Times(1).WillOnce(
+ Return(kDummyStream));
EXPECT_EQ(kDummyStream, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(2);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(2);
ClearTestPipeline(pipeline1);
ClearTestPipeline(pipeline2);
}
@@ -197,8 +191,7 @@ TEST_F(HttpPipelinedHostImplTest, ShutsDownOnOldVersion) {
MockPipeline* pipeline = AddTestPipeline(1, true, true);
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(0);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(0);
EXPECT_CALL(delegate_,
OnHostDeterminedCapability(host_.get(), PIPELINE_INCAPABLE))
.Times(1);
@@ -206,9 +199,13 @@ TEST_F(HttpPipelinedHostImplTest, ShutsDownOnOldVersion) {
HttpPipelinedConnection::OLD_HTTP_VERSION);
ClearTestPipeline(pipeline);
- EXPECT_EQ(NULL, host_->CreateStreamOnNewPipeline(
- kDummyConnection, ssl_config_, proxy_info_, net_log_, true,
- kProtoSPDY3));
+ EXPECT_EQ(NULL,
+ host_->CreateStreamOnNewPipeline(kDummyConnection,
+ ssl_config_,
+ proxy_info_,
+ net_log_,
+ true,
+ kProtoSPDY3));
}
TEST_F(HttpPipelinedHostImplTest, ShutsDownOnAuthenticationRequired) {
@@ -216,8 +213,7 @@ TEST_F(HttpPipelinedHostImplTest, ShutsDownOnAuthenticationRequired) {
MockPipeline* pipeline = AddTestPipeline(1, true, true);
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(0);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(0);
EXPECT_CALL(delegate_,
OnHostDeterminedCapability(host_.get(), PIPELINE_INCAPABLE))
.Times(1);
@@ -225,25 +221,26 @@ TEST_F(HttpPipelinedHostImplTest, ShutsDownOnAuthenticationRequired) {
HttpPipelinedConnection::AUTHENTICATION_REQUIRED);
ClearTestPipeline(pipeline);
- EXPECT_EQ(NULL, host_->CreateStreamOnNewPipeline(
- kDummyConnection, ssl_config_, proxy_info_, net_log_, true,
- kProtoSPDY3));
+ EXPECT_EQ(NULL,
+ host_->CreateStreamOnNewPipeline(kDummyConnection,
+ ssl_config_,
+ proxy_info_,
+ net_log_,
+ true,
+ kProtoSPDY3));
}
TEST_F(HttpPipelinedHostImplTest, ConnectionCloseHasNoEffect) {
SetCapability(PIPELINE_UNKNOWN);
MockPipeline* pipeline = AddTestPipeline(1, true, true);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(0);
- EXPECT_CALL(delegate_, OnHostDeterminedCapability(host_.get(), _))
- .Times(0);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(0);
+ EXPECT_CALL(delegate_, OnHostDeterminedCapability(host_.get(), _)).Times(0);
host_->OnPipelineFeedback(pipeline,
HttpPipelinedConnection::MUST_CLOSE_CONNECTION);
EXPECT_EQ(NULL, host_->CreateStreamOnExistingPipeline());
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
ClearTestPipeline(pipeline);
}
@@ -251,8 +248,7 @@ TEST_F(HttpPipelinedHostImplTest, SuccessesLeadToCapable) {
SetCapability(PIPELINE_UNKNOWN);
MockPipeline* pipeline = AddTestPipeline(1, true, true);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
EXPECT_CALL(delegate_,
OnHostDeterminedCapability(host_.get(), PIPELINE_CAPABLE))
.Times(1);
@@ -262,8 +258,7 @@ TEST_F(HttpPipelinedHostImplTest, SuccessesLeadToCapable) {
host_->OnPipelineFeedback(pipeline, HttpPipelinedConnection::OK);
host_->OnPipelineFeedback(pipeline, HttpPipelinedConnection::OK);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
ClearTestPipeline(pipeline);
}
@@ -271,15 +266,12 @@ TEST_F(HttpPipelinedHostImplTest, IgnoresSocketErrorOnFirstRequest) {
SetCapability(PIPELINE_UNKNOWN);
MockPipeline* pipeline = AddTestPipeline(1, true, true);
- EXPECT_CALL(delegate_, OnHostDeterminedCapability(host_.get(), _))
- .Times(0);
+ EXPECT_CALL(delegate_, OnHostDeterminedCapability(host_.get(), _)).Times(0);
host_->OnPipelineFeedback(pipeline,
HttpPipelinedConnection::PIPELINE_SOCKET_ERROR);
- EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get()))
- .Times(1);
- host_->OnPipelineFeedback(pipeline,
- HttpPipelinedConnection::OK);
+ EXPECT_CALL(delegate_, OnHostHasAdditionalCapacity(host_.get())).Times(1);
+ host_->OnPipelineFeedback(pipeline, HttpPipelinedConnection::OK);
EXPECT_CALL(delegate_,
OnHostDeterminedCapability(host_.get(), PIPELINE_INCAPABLE))
« net/base/mime_util_unittest.cc ('K') | « net/http/http_pipelined_host_impl.cc ('k') | net/http/http_pipelined_host_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698