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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/tools/quic/quic_dispatcher_test.cc

Issue 1908103002: Landing Recent QUIC changes until 4/15/2016 17:20 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 8 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
« no previous file with comments | « net/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_epoll_alarm_factory.h » ('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 32542c01429ab3d81043108a7ea66dcb74306e98..4ef43eab092a634fe8fe768b1d5561f39142da29 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc
@@ -4,6 +4,7 @@
#include "net/tools/quic/quic_dispatcher.h"
+#include <memory>
#include <ostream>
#include <string>
@@ -19,6 +20,7 @@
#include "net/quic/test_tools/crypto_test_utils.h"
#include "net/quic/test_tools/quic_test_utils.h"
#include "net/tools/epoll_server/epoll_server.h"
+#include "net/tools/quic/quic_epoll_alarm_factory.h"
#include "net/tools/quic/quic_epoll_connection_helper.h"
#include "net/tools/quic/quic_packet_writer_wrapper.h"
#include "net/tools/quic/quic_time_wait_list_manager.h"
@@ -99,7 +101,10 @@ class TestDispatcher : public QuicDispatcher {
config,
crypto_config,
QuicSupportedVersions(),
- new QuicEpollConnectionHelper(eps, QuicAllocator::BUFFER_POOL)) {}
+ std::unique_ptr<QuicEpollConnectionHelper>(
+ new QuicEpollConnectionHelper(eps, QuicAllocator::BUFFER_POOL)),
+ std::unique_ptr<QuicEpollAlarmFactory>(
+ new QuicEpollAlarmFactory(eps))) {}
MOCK_METHOD2(CreateQuicSession,
QuicServerSessionBase*(QuicConnectionId connection_id,
@@ -117,8 +122,12 @@ class MockServerConnection : public MockConnection {
public:
MockServerConnection(QuicConnectionId connection_id,
MockConnectionHelper* helper,
+ MockAlarmFactory* alarm_factory,
QuicDispatcher* dispatcher)
- : MockConnection(connection_id, helper, Perspective::IS_SERVER),
+ : MockConnection(connection_id,
+ helper,
+ alarm_factory,
+ Perspective::IS_SERVER),
dispatcher_(dispatcher) {}
void UnregisterOnConnectionClosed() {
@@ -137,11 +146,12 @@ QuicServerSessionBase* CreateSession(
QuicConnectionId connection_id,
const IPEndPoint& client_address,
MockConnectionHelper* helper,
+ MockAlarmFactory* alarm_factory,
const QuicCryptoServerConfig* crypto_config,
QuicCompressedCertsCache* compressed_certs_cache,
TestQuicSpdyServerSession** session) {
- MockServerConnection* connection =
- new MockServerConnection(connection_id, helper, dispatcher);
+ MockServerConnection* connection = new MockServerConnection(
+ connection_id, helper, alarm_factory, dispatcher);
*session = new TestQuicSpdyServerSession(config, connection, crypto_config,
compressed_certs_cache);
connection->set_visitor(*session);
@@ -158,6 +168,7 @@ class QuicDispatcherTest : public ::testing::Test {
public:
QuicDispatcherTest()
: helper_(&eps_, QuicAllocator::BUFFER_POOL),
+ alarm_factory_(&eps_),
crypto_config_(QuicCryptoServerConfig::TESTING,
QuicRandom::GetInstance(),
CryptoTestUtils::ProofSourceForTesting()),
@@ -247,8 +258,9 @@ class QuicDispatcherTest : public ::testing::Test {
}
void CreateTimeWaitListManager() {
- time_wait_list_manager_ = new MockTimeWaitListManager(
- QuicDispatcherPeer::GetWriter(&dispatcher_), &dispatcher_, &helper_);
+ time_wait_list_manager_ =
+ new MockTimeWaitListManager(QuicDispatcherPeer::GetWriter(&dispatcher_),
+ &dispatcher_, &helper_, &alarm_factory_);
// dispatcher_ takes the ownership of time_wait_list_manager_.
QuicDispatcherPeer::SetTimeWaitListManager(&dispatcher_,
time_wait_list_manager_);
@@ -257,6 +269,8 @@ class QuicDispatcherTest : public ::testing::Test {
EpollServer eps_;
QuicEpollConnectionHelper helper_;
MockConnectionHelper mock_helper_;
+ QuicEpollAlarmFactory alarm_factory_;
+ MockAlarmFactory mock_alarm_factory_;
QuicConfig config_;
QuicCryptoServerConfig crypto_config_;
IPEndPoint server_address_;
@@ -274,8 +288,8 @@ TEST_F(QuicDispatcherTest, ProcessPackets) {
EXPECT_CALL(dispatcher_, CreateQuicSession(1, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, 1, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session1_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
ProcessPacket(client_address, 1, true, false, "foo");
EXPECT_EQ(client_address, dispatcher_.current_client_address());
EXPECT_EQ(server_address_, dispatcher_.current_server_address());
@@ -283,8 +297,8 @@ TEST_F(QuicDispatcherTest, ProcessPackets) {
EXPECT_CALL(dispatcher_, CreateQuicSession(2, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, 2, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session2_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session2_)));
ProcessPacket(client_address, 2, true, false, "bar");
EXPECT_CALL(*reinterpret_cast<MockConnection*>(session1_->connection()),
@@ -314,8 +328,8 @@ TEST_F(QuicDispatcherTest, StatefulVersionNegotiation) {
EXPECT_CALL(dispatcher_, CreateQuicSession(1, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, 1, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session1_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
QuicVersion version = static_cast<QuicVersion>(QuicVersionMin() - 1);
ProcessPacket(client_address, 1, true, version, "foo",
PACKET_8BYTE_CONNECTION_ID, PACKET_6BYTE_PACKET_NUMBER, 1);
@@ -327,8 +341,8 @@ TEST_F(QuicDispatcherTest, Shutdown) {
EXPECT_CALL(dispatcher_, CreateQuicSession(_, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, 1, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session1_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
ProcessPacket(client_address, 1, true, false, "foo");
@@ -347,8 +361,8 @@ TEST_F(QuicDispatcherTest, TimeWaitListManager) {
EXPECT_CALL(dispatcher_, CreateQuicSession(connection_id, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, connection_id, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session1_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
ProcessPacket(client_address, connection_id, true, false, "foo");
// Close the connection by sending public reset packet.
@@ -496,7 +510,7 @@ class QuicDispatcherStatelessRejectTest
QuicConnectionId connection_id,
const IPEndPoint& client_address) {
CreateSession(&dispatcher_, config_, connection_id, client_address,
- &mock_helper_, &crypto_config_,
+ &mock_helper_, &mock_alarm_factory_, &crypto_config_,
QuicDispatcherPeer::GetCache(&dispatcher_), &session1_);
crypto_stream1_ = new MockQuicCryptoServerStream(
@@ -534,8 +548,8 @@ TEST_F(QuicDispatcherTest, OKSeqNoPacketProcessed) {
EXPECT_CALL(dispatcher_, CreateQuicSession(1, client_address))
.WillOnce(testing::Return(CreateSession(
&dispatcher_, config_, 1, client_address, &mock_helper_,
- &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
- &session1_)));
+ &mock_alarm_factory_, &crypto_config_,
+ QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
// A packet whose packet number is the largest that is allowed to start a
// connection.
ProcessPacket(client_address, connection_id, true, false, "data",
@@ -677,14 +691,16 @@ class QuicDispatcherWriteBlockedListTest : public QuicDispatcherTest {
EXPECT_CALL(dispatcher_, CreateQuicSession(_, client_address))
.WillOnce(testing::Return(CreateSession(
- &dispatcher_, config_, 1, client_address, &helper_, &crypto_config_,
- QuicDispatcherPeer::GetCache(&dispatcher_), &session1_)));
+ &dispatcher_, config_, 1, client_address, &helper_, &alarm_factory_,
+ &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
+ &session1_)));
ProcessPacket(client_address, 1, true, false, "foo");
EXPECT_CALL(dispatcher_, CreateQuicSession(_, client_address))
.WillOnce(testing::Return(CreateSession(
- &dispatcher_, config_, 2, client_address, &helper_, &crypto_config_,
- QuicDispatcherPeer::GetCache(&dispatcher_), &session2_)));
+ &dispatcher_, config_, 2, client_address, &helper_, &alarm_factory_,
+ &crypto_config_, QuicDispatcherPeer::GetCache(&dispatcher_),
+ &session2_)));
ProcessPacket(client_address, 2, true, false, "bar");
blocked_list_ = QuicDispatcherPeer::GetWriteBlockedList(&dispatcher_);
@@ -705,6 +721,7 @@ class QuicDispatcherWriteBlockedListTest : public QuicDispatcherTest {
protected:
MockConnectionHelper helper_;
+ MockAlarmFactory alarm_factory_;
BlockingWriter* writer_;
QuicDispatcher::WriteBlockedList* blocked_list_;
};
« no previous file with comments | « net/tools/quic/quic_dispatcher.cc ('k') | net/tools/quic/quic_epoll_alarm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698