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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/tools/quic/quic_dispatcher_test.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/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_epoll_clock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/quic_dispatcher_test.cc
diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index db8b76a9710781047befc36efdc7bcc9769290bd..fa7e3bdadc9db0b0f5a97d736faa7e0186620b34 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -48,13 +48,12 @@ class TestDispatcher : public QuicDispatcher {
crypto_config,
QuicSupportedVersions(),
eps,
- kInitialFlowControlWindowForTest) {
- }
+ kInitialFlowControlWindowForTest) {}
- MOCK_METHOD3(CreateQuicSession, QuicSession*(
- QuicConnectionId connection_id,
- const IPEndPoint& server_address,
- const IPEndPoint& client_address));
+ MOCK_METHOD3(CreateQuicSession,
+ QuicSession*(QuicConnectionId connection_id,
+ const IPEndPoint& server_address,
+ const IPEndPoint& client_address));
using QuicDispatcher::write_blocked_list;
using QuicDispatcher::current_server_address;
@@ -69,13 +68,13 @@ class MockServerConnection : public MockConnection {
public:
MockServerConnection(QuicConnectionId connection_id,
QuicDispatcher* dispatcher)
- : MockConnection(connection_id, true),
- dispatcher_(dispatcher) {}
+ : MockConnection(connection_id, true), dispatcher_(dispatcher) {}
void UnregisterOnConnectionClosed() {
LOG(ERROR) << "Unregistering " << connection_id();
dispatcher_->OnConnectionClosed(connection_id(), QUIC_NO_ERROR);
}
+
private:
QuicDispatcher* dispatcher_;
};
@@ -87,9 +86,8 @@ QuicSession* CreateSession(QuicDispatcher* dispatcher,
MockServerConnection* connection =
new MockServerConnection(connection_id, dispatcher);
*session = new MockSession(connection);
- ON_CALL(*connection, SendConnectionClose(_)).WillByDefault(
- WithoutArgs(Invoke(
- connection, &MockServerConnection::UnregisterOnConnectionClosed)));
+ ON_CALL(*connection, SendConnectionClose(_)).WillByDefault(WithoutArgs(
+ Invoke(connection, &MockServerConnection::UnregisterOnConnectionClosed)));
EXPECT_CALL(*reinterpret_cast<MockConnection*>((*session)->connection()),
ProcessUdpPacket(_, client_address, _));
@@ -149,22 +147,22 @@ TEST_F(QuicDispatcherTest, ProcessPackets) {
server_address_ = IPEndPoint(any4, 5);
EXPECT_CALL(dispatcher_, CreateQuicSession(1, _, client_address))
- .WillOnce(testing::Return(CreateSession(
- &dispatcher_, 1, client_address, &session1_)));
+ .WillOnce(testing::Return(
+ CreateSession(&dispatcher_, 1, client_address, &session1_)));
ProcessPacket(client_address, 1, true, "foo");
EXPECT_EQ(client_address, dispatcher_.current_client_address());
EXPECT_EQ(server_address_, dispatcher_.current_server_address());
-
EXPECT_CALL(dispatcher_, CreateQuicSession(2, _, client_address))
- .WillOnce(testing::Return(CreateSession(
- &dispatcher_, 2, client_address, &session2_)));
+ .WillOnce(testing::Return(
+ CreateSession(&dispatcher_, 2, client_address, &session2_)));
ProcessPacket(client_address, 2, true, "bar");
EXPECT_CALL(*reinterpret_cast<MockConnection*>(session1_->connection()),
- ProcessUdpPacket(_, _, _)).Times(1).
- WillOnce(testing::WithArgs<2>(Invoke(
- this, &QuicDispatcherTest::ValidatePacket)));
+ ProcessUdpPacket(_, _, _))
+ .Times(1)
+ .WillOnce(testing::WithArgs<2>(
+ Invoke(this, &QuicDispatcherTest::ValidatePacket)));
ProcessPacket(client_address, 1, false, "eep");
}
@@ -172,8 +170,8 @@ TEST_F(QuicDispatcherTest, Shutdown) {
IPEndPoint client_address(net::test::Loopback4(), 1);
EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, client_address))
- .WillOnce(testing::Return(CreateSession(
- &dispatcher_, 1, client_address, &session1_)));
+ .WillOnce(testing::Return(
+ CreateSession(&dispatcher_, 1, client_address, &session1_)));
ProcessPacket(client_address, 1, true, "foo");
@@ -191,17 +189,17 @@ class MockTimeWaitListManager : public QuicTimeWaitListManager {
: QuicTimeWaitListManager(writer, visitor, eps, QuicSupportedVersions()) {
}
- MOCK_METHOD5(ProcessPacket, void(const IPEndPoint& server_address,
- const IPEndPoint& client_address,
- QuicConnectionId connection_id,
- QuicPacketSequenceNumber sequence_number,
- const QuicEncryptedPacket& packet));
+ MOCK_METHOD5(ProcessPacket,
+ void(const IPEndPoint& server_address,
+ const IPEndPoint& client_address,
+ QuicConnectionId connection_id,
+ QuicPacketSequenceNumber sequence_number,
+ const QuicEncryptedPacket& packet));
};
TEST_F(QuicDispatcherTest, TimeWaitListManager) {
- MockTimeWaitListManager* time_wait_list_manager =
- new MockTimeWaitListManager(
- QuicDispatcherPeer::GetWriter(&dispatcher_), &dispatcher_, &eps_);
+ MockTimeWaitListManager* time_wait_list_manager = new MockTimeWaitListManager(
+ QuicDispatcherPeer::GetWriter(&dispatcher_), &dispatcher_, &eps_);
// dispatcher takes the ownership of time_wait_list_manager.
QuicDispatcherPeer::SetTimeWaitListManager(&dispatcher_,
time_wait_list_manager);
@@ -210,7 +208,7 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
QuicConnectionId connection_id = 1;
EXPECT_CALL(dispatcher_, CreateQuicSession(connection_id, _, client_address))
.WillOnce(testing::Return(CreateSession(
- &dispatcher_, connection_id, client_address, &session1_)));
+ &dispatcher_, connection_id, client_address, &session1_)));
ProcessPacket(client_address, connection_id, true, "foo");
// Close the connection by sending public reset packet.
@@ -222,29 +220,29 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
packet.nonce_proof = 132232;
scoped_ptr<QuicEncryptedPacket> encrypted(
QuicFramer::BuildPublicResetPacket(packet));
- EXPECT_CALL(*session1_, OnConnectionClosed(QUIC_PUBLIC_RESET, true)).Times(1)
+ EXPECT_CALL(*session1_, OnConnectionClosed(QUIC_PUBLIC_RESET, true))
+ .Times(1)
.WillOnce(WithoutArgs(Invoke(
reinterpret_cast<MockServerConnection*>(session1_->connection()),
&MockServerConnection::UnregisterOnConnectionClosed)));
EXPECT_CALL(*reinterpret_cast<MockConnection*>(session1_->connection()),
ProcessUdpPacket(_, _, _))
- .WillOnce(Invoke(
- reinterpret_cast<MockConnection*>(session1_->connection()),
- &MockConnection::ReallyProcessUdpPacket));
+ .WillOnce(
+ Invoke(reinterpret_cast<MockConnection*>(session1_->connection()),
+ &MockConnection::ReallyProcessUdpPacket));
dispatcher_.ProcessPacket(IPEndPoint(), client_address, *encrypted);
EXPECT_TRUE(time_wait_list_manager->IsConnectionIdInTimeWait(connection_id));
// Dispatcher forwards subsequent packets for this connection_id to the time
// wait list manager.
- EXPECT_CALL(*time_wait_list_manager,
- ProcessPacket(_, _, connection_id, _, _)).Times(1);
+ EXPECT_CALL(*time_wait_list_manager, ProcessPacket(_, _, connection_id, _, _))
+ .Times(1);
ProcessPacket(client_address, connection_id, true, "foo");
}
TEST_F(QuicDispatcherTest, StrayPacketToTimeWaitListManager) {
- MockTimeWaitListManager* time_wait_list_manager =
- new MockTimeWaitListManager(
- QuicDispatcherPeer::GetWriter(&dispatcher_), &dispatcher_, &eps_);
+ MockTimeWaitListManager* time_wait_list_manager = new MockTimeWaitListManager(
+ QuicDispatcherPeer::GetWriter(&dispatcher_), &dispatcher_, &eps_);
// dispatcher takes the ownership of time_wait_list_manager.
QuicDispatcherPeer::SetTimeWaitListManager(&dispatcher_,
time_wait_list_manager);
@@ -254,8 +252,8 @@ TEST_F(QuicDispatcherTest, StrayPacketToTimeWaitListManager) {
// Dispatcher forwards all packets for this connection_id to the time wait
// list manager.
EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, _)).Times(0);
- EXPECT_CALL(*time_wait_list_manager,
- ProcessPacket(_, _, connection_id, _, _)).Times(1);
+ EXPECT_CALL(*time_wait_list_manager, ProcessPacket(_, _, connection_id, _, _))
+ .Times(1);
string data = "foo";
ProcessPacket(client_address, connection_id, false, "foo");
}
@@ -275,15 +273,17 @@ TEST(QuicDispatcherFlowControlTest, NoNewVersion17ConnectionsIfFlagDisabled) {
IPEndPoint server(net::test::Loopback4(), 1);
QuicConnectionId kCID = 1234;
- QuicVersion kTestQuicVersions[] = {QUIC_VERSION_17,
- QUIC_VERSION_16,
+ QuicVersion kTestQuicVersions[] = {QUIC_VERSION_17, QUIC_VERSION_16,
QUIC_VERSION_15};
QuicVersionVector kTestVersions;
for (size_t i = 0; i < arraysize(kTestQuicVersions); ++i) {
kTestVersions.push_back(kTestQuicVersions[i]);
}
- QuicDispatcher dispatcher(config, server_config, kTestVersions, &eps,
+ QuicDispatcher dispatcher(config,
+ server_config,
+ kTestVersions,
+ &eps,
kInitialFlowControlWindowForTest);
dispatcher.Initialize(0);
@@ -294,7 +294,6 @@ TEST(QuicDispatcherFlowControlTest, NoNewVersion17ConnectionsIfFlagDisabled) {
&dispatcher, kCID, client, server, kInitialFlowControlWindowForTest));
EXPECT_EQ(QUIC_VERSION_17, connection_1->version());
-
// When flag is disabled, new connections should not support QUIC_VERSION_17.
FLAGS_enable_quic_stream_flow_control_2 = false;
scoped_ptr<QuicConnection> connection_2(
@@ -335,13 +334,13 @@ class QuicDispatcherWriteBlockedListTest : public QuicDispatcherTest {
IPEndPoint client_address(net::test::Loopback4(), 1);
EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, client_address))
- .WillOnce(testing::Return(CreateSession(
- &dispatcher_, 1, client_address, &session1_)));
+ .WillOnce(testing::Return(
+ CreateSession(&dispatcher_, 1, client_address, &session1_)));
ProcessPacket(client_address, 1, true, "foo");
EXPECT_CALL(dispatcher_, CreateQuicSession(_, _, client_address))
- .WillOnce(testing::Return(CreateSession(
- &dispatcher_, 2, client_address, &session2_)));
+ .WillOnce(testing::Return(
+ CreateSession(&dispatcher_, 2, client_address, &session2_)));
ProcessPacket(client_address, 2, true, "bar");
blocked_list_ = dispatcher_.write_blocked_list();
@@ -353,9 +352,7 @@ class QuicDispatcherWriteBlockedListTest : public QuicDispatcherTest {
dispatcher_.Shutdown();
}
- void SetBlocked() {
- writer_->write_blocked_ = true;
- }
+ void SetBlocked() { writer_->write_blocked_ = true; }
void BlockConnection2() {
writer_->write_blocked_ = true;
@@ -450,8 +447,8 @@ TEST_F(QuicDispatcherWriteBlockedListTest, OnCanWriteHandleBlock) {
SetBlocked();
dispatcher_.OnWriteBlocked(connection1());
dispatcher_.OnWriteBlocked(connection2());
- EXPECT_CALL(*connection1(), OnCanWrite()).WillOnce(
- Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
+ EXPECT_CALL(*connection1(), OnCanWrite())
+ .WillOnce(Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
EXPECT_CALL(*connection2(), OnCanWrite()).Times(0);
dispatcher_.OnCanWrite();
@@ -485,8 +482,8 @@ TEST_F(QuicDispatcherWriteBlockedListTest, TestWriteLimits) {
SetBlocked();
dispatcher_.OnWriteBlocked(connection1());
dispatcher_.OnWriteBlocked(connection2());
- EXPECT_CALL(*connection1(), OnCanWrite()).WillOnce(
- Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
+ EXPECT_CALL(*connection1(), OnCanWrite())
+ .WillOnce(Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
EXPECT_CALL(*connection2(), OnCanWrite()).Times(0);
dispatcher_.OnCanWrite();
EXPECT_TRUE(dispatcher_.HasPendingWrites());
« net/base/mime_util_unittest.cc ('K') | « net/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_epoll_clock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698