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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_pipelined_host_pool_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_pool.cc ('k') | net/http/http_pipelined_host_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_pipelined_host_pool_unittest.cc
diff --git a/net/http/http_pipelined_host_pool_unittest.cc b/net/http/http_pipelined_host_pool_unittest.cc
index fa8d93facb17848cff0603d3c85d3efde28c127f..2c2b63b104c16940566d4fcaf12d8e07ba89d5f0 100644
--- a/net/http/http_pipelined_host_pool_unittest.cc
+++ b/net/http/http_pipelined_host_pool_unittest.cc
@@ -25,8 +25,7 @@ namespace {
ClientSocketHandle* kDummyConnection =
reinterpret_cast<ClientSocketHandle*>(188);
-HttpPipelinedStream* kDummyStream =
- reinterpret_cast<HttpPipelinedStream*>(99);
+HttpPipelinedStream* kDummyStream = reinterpret_cast<HttpPipelinedStream*>(99);
class MockPoolDelegate : public HttpPipelinedHostPool::Delegate {
public:
@@ -36,27 +35,25 @@ class MockPoolDelegate : public HttpPipelinedHostPool::Delegate {
class MockHostFactory : public HttpPipelinedHost::Factory {
public:
- MOCK_METHOD5(CreateNewHost, HttpPipelinedHost*(
- HttpPipelinedHost::Delegate* delegate,
- const HttpPipelinedHost::Key& key,
- HttpPipelinedConnection::Factory* factory,
- HttpPipelinedHostCapability capability,
- bool force_pipelining));
+ MOCK_METHOD5(CreateNewHost,
+ HttpPipelinedHost*(HttpPipelinedHost::Delegate* delegate,
+ const HttpPipelinedHost::Key& key,
+ HttpPipelinedConnection::Factory* factory,
+ HttpPipelinedHostCapability capability,
+ bool force_pipelining));
};
class MockHost : public HttpPipelinedHost {
public:
- MockHost(const Key& key)
- : key_(key) {
- }
-
- MOCK_METHOD6(CreateStreamOnNewPipeline, HttpPipelinedStream*(
- ClientSocketHandle* connection,
- const SSLConfig& used_ssl_config,
- const ProxyInfo& used_proxy_info,
- const BoundNetLog& net_log,
- bool was_npn_negotiated,
- NextProto protocol_negotiated));
+ MockHost(const Key& key) : key_(key) {}
+
+ MOCK_METHOD6(CreateStreamOnNewPipeline,
+ HttpPipelinedStream*(ClientSocketHandle* connection,
+ const SSLConfig& used_ssl_config,
+ const ProxyInfo& used_proxy_info,
+ const BoundNetLog& net_log,
+ bool was_npn_negotiated,
+ NextProto protocol_negotiated));
MOCK_METHOD0(CreateStreamOnExistingPipeline, HttpPipelinedStream*());
MOCK_CONST_METHOD0(IsExistingPipelineAvailable, bool());
MOCK_CONST_METHOD0(PipelineInfoToValue, base::Value*());
@@ -72,38 +69,43 @@ class HttpPipelinedHostPoolTest : public testing::Test {
HttpPipelinedHostPoolTest()
: key_(HostPortPair("host", 123)),
factory_(new MockHostFactory), // Owned by pool_.
- host_(new MockHost(key_)), // Owned by pool_.
+ host_(new MockHost(key_)), // Owned by pool_.
http_server_properties_(new HttpServerPropertiesImpl()),
- pool_(new HttpPipelinedHostPool(
- &delegate_, factory_,
- http_server_properties_->GetWeakPtr(), false)),
+ pool_(new HttpPipelinedHostPool(&delegate_,
+ factory_,
+ http_server_properties_->GetWeakPtr(),
+ false)),
was_npn_negotiated_(false),
- protocol_negotiated_(kProtoUnknown) {
- }
+ protocol_negotiated_(kProtoUnknown) {}
void CreateDummyStream(const HttpPipelinedHost::Key& key,
ClientSocketHandle* connection,
HttpPipelinedStream* stream,
MockHost* host) {
- EXPECT_CALL(*host, CreateStreamOnNewPipeline(connection,
- Ref(ssl_config_),
- Ref(proxy_info_),
- Ref(net_log_),
- was_npn_negotiated_,
- protocol_negotiated_))
+ EXPECT_CALL(*host,
+ CreateStreamOnNewPipeline(connection,
+ Ref(ssl_config_),
+ Ref(proxy_info_),
+ Ref(net_log_),
+ was_npn_negotiated_,
+ protocol_negotiated_))
.Times(1)
.WillOnce(Return(stream));
EXPECT_EQ(stream,
- pool_->CreateStreamOnNewPipeline(key, connection,
- ssl_config_, proxy_info_,
- net_log_, was_npn_negotiated_,
+ pool_->CreateStreamOnNewPipeline(key,
+ connection,
+ ssl_config_,
+ proxy_info_,
+ net_log_,
+ was_npn_negotiated_,
protocol_negotiated_));
}
MockHost* CreateDummyHost(const HttpPipelinedHost::Key& key) {
MockHost* mock_host = new MockHost(key);
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(
+ *factory_,
+ CreateNewHost(pool_.get(), Ref(key), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(mock_host));
ClientSocketHandle* dummy_connection =
@@ -130,8 +132,8 @@ class HttpPipelinedHostPoolTest : public testing::Test {
TEST_F(HttpPipelinedHostPoolTest, DefaultUnknown) {
EXPECT_TRUE(pool_->IsKeyEligibleForPipelining(key_));
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -140,8 +142,8 @@ TEST_F(HttpPipelinedHostPoolTest, DefaultUnknown) {
}
TEST_F(HttpPipelinedHostPoolTest, RemembersIncapable) {
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -149,19 +151,23 @@ TEST_F(HttpPipelinedHostPoolTest, RemembersIncapable) {
pool_->OnHostDeterminedCapability(host_, PIPELINE_INCAPABLE);
pool_->OnHostIdle(host_);
EXPECT_FALSE(pool_->IsKeyEligibleForPipelining(key_));
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_INCAPABLE, false))
+ EXPECT_CALL(
+ *factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_INCAPABLE, false))
.Times(0);
EXPECT_EQ(NULL,
- pool_->CreateStreamOnNewPipeline(key_, kDummyConnection,
- ssl_config_, proxy_info_, net_log_,
+ pool_->CreateStreamOnNewPipeline(key_,
+ kDummyConnection,
+ ssl_config_,
+ proxy_info_,
+ net_log_,
was_npn_negotiated_,
protocol_negotiated_));
}
TEST_F(HttpPipelinedHostPoolTest, RemembersCapable) {
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -171,8 +177,8 @@ TEST_F(HttpPipelinedHostPoolTest, RemembersCapable) {
EXPECT_TRUE(pool_->IsKeyEligibleForPipelining(key_));
host_ = new MockHost(key_);
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_CAPABLE, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_CAPABLE, false))
.Times(1)
.WillOnce(Return(host_));
CreateDummyStream(key_, kDummyConnection, kDummyStream, host_);
@@ -180,8 +186,8 @@ TEST_F(HttpPipelinedHostPoolTest, RemembersCapable) {
}
TEST_F(HttpPipelinedHostPoolTest, IncapableIsSticky) {
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -194,8 +200,8 @@ TEST_F(HttpPipelinedHostPoolTest, IncapableIsSticky) {
}
TEST_F(HttpPipelinedHostPoolTest, RemainsUnknownWithoutFeedback) {
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -204,8 +210,8 @@ TEST_F(HttpPipelinedHostPoolTest, RemainsUnknownWithoutFeedback) {
EXPECT_TRUE(pool_->IsKeyEligibleForPipelining(key_));
host_ = new MockHost(key_);
- EXPECT_CALL(*factory_, CreateNewHost(pool_.get(), Ref(key_), _,
- PIPELINE_UNKNOWN, false))
+ EXPECT_CALL(*factory_,
+ CreateNewHost(pool_.get(), Ref(key_), _, PIPELINE_UNKNOWN, false))
.Times(1)
.WillOnce(Return(host_));
@@ -214,13 +220,13 @@ TEST_F(HttpPipelinedHostPoolTest, RemainsUnknownWithoutFeedback) {
}
TEST_F(HttpPipelinedHostPoolTest, PopulatesServerProperties) {
- EXPECT_EQ(PIPELINE_UNKNOWN,
- http_server_properties_->GetPipelineCapability(
- host_->GetKey().origin()));
+ EXPECT_EQ(
+ PIPELINE_UNKNOWN,
+ http_server_properties_->GetPipelineCapability(host_->GetKey().origin()));
pool_->OnHostDeterminedCapability(host_, PIPELINE_CAPABLE);
- EXPECT_EQ(PIPELINE_CAPABLE,
- http_server_properties_->GetPipelineCapability(
- host_->GetKey().origin()));
+ EXPECT_EQ(
+ PIPELINE_CAPABLE,
+ http_server_properties_->GetPipelineCapability(host_->GetKey().origin()));
delete host_; // Must manually delete, because it's never added to |pool_|.
}
@@ -233,19 +239,16 @@ TEST_F(HttpPipelinedHostPoolTest, MultipleKeys) {
MockHost* host2 = CreateDummyHost(key2);
MockHost* host3 = CreateDummyHost(key3);
- EXPECT_CALL(*host1, IsExistingPipelineAvailable())
- .Times(1)
- .WillOnce(Return(true));
+ EXPECT_CALL(*host1, IsExistingPipelineAvailable()).Times(1).WillOnce(
+ Return(true));
EXPECT_TRUE(pool_->IsExistingPipelineAvailableForKey(key1));
- EXPECT_CALL(*host2, IsExistingPipelineAvailable())
- .Times(1)
- .WillOnce(Return(false));
+ EXPECT_CALL(*host2, IsExistingPipelineAvailable()).Times(1).WillOnce(
+ Return(false));
EXPECT_FALSE(pool_->IsExistingPipelineAvailableForKey(key2));
- EXPECT_CALL(*host3, IsExistingPipelineAvailable())
- .Times(1)
- .WillOnce(Return(true));
+ EXPECT_CALL(*host3, IsExistingPipelineAvailable()).Times(1).WillOnce(
+ Return(true));
EXPECT_TRUE(pool_->IsExistingPipelineAvailableForKey(key3));
EXPECT_FALSE(pool_->IsExistingPipelineAvailableForKey(key4));
« net/base/mime_util_unittest.cc ('K') | « net/http/http_pipelined_host_pool.cc ('k') | net/http/http_pipelined_host_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698