net/tools/quic/quic_simple_server_stream_test.cc - Issue 2532083005: Rename QuicInMemoryCache to QuicHttpResponseCache.

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

Issue 2532083005: Rename QuicInMemoryCache to QuicHttpResponseCache. (Closed)

Patch Set: Created 4 years, 1 month 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

Index: net/tools/quic/quic_simple_server_stream_test.cc

diff --git a/net/tools/quic/quic_simple_server_stream_test.cc b/net/tools/quic/quic_simple_server_stream_test.cc

index 4ed547e17763c7339fc1101db19c663a564fa66c..d0764a21f15c7908cdd2be62113d7e6e519dc244 100644

--- a/net/tools/quic/quic_simple_server_stream_test.cc

+++ b/net/tools/quic/quic_simple_server_stream_test.cc

@@ -22,7 +22,7 @@

#include "net/quic/test_tools/quic_test_utils.h"

#include "net/test/gtest_util.h"

#include "net/tools/epoll_server/epoll_server.h"

-#include "net/tools/quic/quic_in_memory_cache.h"

+#include "net/tools/quic/quic_http_response_cache.h"

#include "net/tools/quic/quic_simple_server_session.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -55,8 +55,8 @@ class QuicSimpleServerStreamPeer : public QuicSimpleServerStream {

public:

QuicSimpleServerStreamPeer(QuicStreamId stream_id,

QuicSpdySession* session,

- QuicInMemoryCache* in_memory_cache)

- : QuicSimpleServerStream(stream_id, session, in_memory_cache) {}

+ QuicHttpResponseCache* response_cache)

+ : QuicSimpleServerStream(stream_id, session, response_cache) {}

~QuicSimpleServerStreamPeer() override{};

@@ -96,14 +96,14 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {

MockQuicCryptoServerStreamHelper* helper,

QuicCryptoServerConfig* crypto_config,

QuicCompressedCertsCache* compressed_certs_cache,

- QuicInMemoryCache* in_memory_cache)

+ QuicHttpResponseCache* response_cache)

: QuicSimpleServerSession(DefaultQuicConfig(),

connection,

owner,

helper,

crypto_config,

compressed_certs_cache,

- in_memory_cache) {

+ response_cache) {

set_max_open_incoming_streams(kMaxStreamsForTest);

set_max_open_outgoing_streams(kMaxStreamsForTest);

ON_CALL(*this, WritevData(_, _, _, _, _, _))

@@ -155,7 +155,7 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {

// Matchers cannot be used on non-copyable types like SpdyHeaderBlock.

void PromisePushResources(

const string& request_url,

- const std::list<QuicInMemoryCache::ServerPushInfo>& resources,

+ const std::list<QuicHttpResponseCache::ServerPushInfo>& resources,

QuicStreamId original_stream_id,

const SpdyHeaderBlock& original_request_headers) override {

original_request_headers_ = original_request_headers.Clone();

@@ -164,7 +164,7 @@ class MockQuicSimpleServerSession : public QuicSimpleServerSession {

}

MOCK_METHOD4(PromisePushResourcesMock,

void(const string&,

- const std::list<QuicInMemoryCache::ServerPushInfo>&,

+ const std::list<QuicHttpResponseCache::ServerPushInfo>&,

QuicStreamId,

const SpdyHeaderBlock&));

@@ -198,7 +198,7 @@ class QuicSimpleServerStreamTest

&session_helper_,

crypto_config_.get(),

&compressed_certs_cache_,

- &in_memory_cache_),

+ &response_cache_),

body_("hello world") {

header_list_.OnHeaderBlockStart();

header_list_.OnHeader(":authority", "www.google.com");

@@ -215,7 +215,7 @@ class QuicSimpleServerStreamTest

session_.config()->SetInitialSessionFlowControlWindowToSend(

kInitialSessionFlowControlWindowForTest);

stream_ = new QuicSimpleServerStreamPeer(::net::test::kClientDataStreamId1,

- &session_, &in_memory_cache_);

+ &session_, &response_cache_);

// Register stream_ in dynamic_stream_map_ and pass ownership to session_.

session_.ActivateStream(base::WrapUnique(stream_));

}

@@ -236,7 +236,7 @@ class QuicSimpleServerStreamTest

StrictMock<MockQuicCryptoServerStreamHelper> session_helper_;

std::unique_ptr<QuicCryptoServerConfig> crypto_config_;

QuicCompressedCertsCache compressed_certs_cache_;

- QuicInMemoryCache in_memory_cache_;

+ QuicHttpResponseCache response_cache_;

StrictMock<MockQuicSimpleServerSession> session_;

QuicSimpleServerStreamPeer* stream_; // Owned by session_.

string headers_string_;

@@ -324,8 +324,8 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus) {

response_headers_[":status"] = "200 OK";

response_headers_["content-length"] = "5";

string body = "Yummm";

- in_memory_cache_.AddResponse("www.google.com", "/bar",

- std::move(response_headers_), body);

+ response_cache_.AddResponse("www.google.com", "/bar",

+ std::move(response_headers_), body);

stream_->set_fin_received(true);

@@ -355,8 +355,8 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus2) {

response_headers_[":status"] = "+200";

response_headers_["content-length"] = "5";

string body = "Yummm";

- in_memory_cache_.AddResponse("www.google.com", "/bar",

- std::move(response_headers_), body);

+ response_cache_.AddResponse("www.google.com", "/bar",

+ std::move(response_headers_), body);

stream_->set_fin_received(true);

@@ -376,7 +376,7 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithIllegalResponseStatus2) {

TEST_P(QuicSimpleServerStreamTest, SendPushResponseWith404Response) {

// Create a new promised stream with even id().

QuicSimpleServerStreamPeer* promised_stream =

- new QuicSimpleServerStreamPeer(2, &session_, &in_memory_cache_);

+ new QuicSimpleServerStreamPeer(2, &session_, &response_cache_);

session_.ActivateStream(base::WrapUnique(promised_stream));

// Send a push response with response status 404, which will be regarded as

@@ -391,8 +391,8 @@ TEST_P(QuicSimpleServerStreamTest, SendPushResponseWith404Response) {

response_headers_[":status"] = "404";

response_headers_["content-length"] = "8";

string body = "NotFound";

- in_memory_cache_.AddResponse("www.google.com", "/bar",

- std::move(response_headers_), body);

+ response_cache_.AddResponse("www.google.com", "/bar",

+ std::move(response_headers_), body);

InSequence s;

EXPECT_CALL(session_,

@@ -413,8 +413,8 @@ TEST_P(QuicSimpleServerStreamTest, SendResponseWithValidHeaders) {

response_headers_[":status"] = "200";

response_headers_["content-length"] = "5";

string body = "Yummm";

- in_memory_cache_.AddResponse("www.google.com", "/bar",

- std::move(response_headers_), body);

+ response_cache_.AddResponse("www.google.com", "/bar",

+ std::move(response_headers_), body);

stream_->set_fin_received(true);

InSequence s;

@@ -438,11 +438,11 @@ TEST_P(QuicSimpleServerStreamTest, SendReponseWithPushResources) {

string request_path = "/foo";

string body = "Yummm";

string url = host + "/bar";

- QuicInMemoryCache::ServerPushInfo push_info(GURL(url), SpdyHeaderBlock(),

- kDefaultPriority, "Push body");

- std::list<QuicInMemoryCache::ServerPushInfo> push_resources;

+ QuicHttpResponseCache::ServerPushInfo push_info(

+ GURL(url), SpdyHeaderBlock(), kDefaultPriority, "Push body");

+ std::list<QuicHttpResponseCache::ServerPushInfo> push_resources;

push_resources.push_back(push_info);

- in_memory_cache_.AddSimpleResponseWithServerPushResources(

+ response_cache_.AddSimpleResponseWithServerPushResources(

host, request_path, 200, body, push_resources);

SpdyHeaderBlock* request_headers = stream_->mutable_headers();

@@ -481,7 +481,7 @@ TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) {

// Create a server initiated stream and pass it to session_.

QuicSimpleServerStreamPeer* server_initiated_stream =

new QuicSimpleServerStreamPeer(kServerInitiatedStreamId, &session_,

- &in_memory_cache_);

+ &response_cache_);

session_.ActivateStream(base::WrapUnique(server_initiated_stream));

const string kHost = "www.foo.com";

@@ -496,8 +496,8 @@ TEST_P(QuicSimpleServerStreamTest, PushResponseOnServerInitiatedStream) {

response_headers_[":status"] = "200";

response_headers_["content-length"] = "5";

const string kBody = "Hello";

- in_memory_cache_.AddResponse(kHost, kPath, std::move(response_headers_),

- kBody);

+ response_cache_.AddResponse(kHost, kPath, std::move(response_headers_),

+ kBody);

// Call PushResponse() should trigger stream to fetch response from cache

// and send it back.

« no previous file with comments | « net/tools/quic/quic_simple_server_stream.cc ('k') | net/tools/quic/quic_simple_server_test.cc » ('j') | no next file with comments »