net/http/http_server_properties_impl_unittest.cc - Issue 1858093002: Alt-Svc 8: Change Supports SPDY list using SHP as the key.

Unified Diff: net/http/http_server_properties_impl_unittest.cc

Issue 1858093002: Alt-Svc 8: Change Supports SPDY list using SHP as the key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alt_svc_7

Patch Set: server pref changes 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

Index: net/http/http_server_properties_impl_unittest.cc

diff --git a/net/http/http_server_properties_impl_unittest.cc b/net/http/http_server_properties_impl_unittest.cc

index 95c83d1000d1eacdd5f5490b11ba3e6394b49003..4ad35bb8d85098cac2199f0a8ae62236a721b564 100644

--- a/net/http/http_server_properties_impl_unittest.cc

+++ b/net/http/http_server_properties_impl_unittest.cc

@@ -49,7 +49,7 @@ const SpdySettingsIds kSpdySettingsId = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags kSpdySettingsFlags = SETTINGS_FLAG_PERSISTED;

struct SpdySettingsDataToVerify {

- HostPortPair spdy_server;

+ url::SchemeHostPort spdy_server;

uint32_t value;

};

@@ -68,9 +68,10 @@ class HttpServerPropertiesImplTest : public testing::Test {

return impl_.SetAlternativeService(origin, alternative_service, expiration);

}

- void InitializeSpdySettingsUploadBandwidth(SpdySettingsMap* spdy_settings_map,

- const HostPortPair& spdy_server,

- uint32_t value) {

+ void InitializeSpdySettingsUploadBandwidth(

+ SpdySettingsMap* spdy_settings_map,

+ const url::SchemeHostPort& spdy_server,

+ uint32_t value) {

SettingsMap settings_map;

settings_map[kSpdySettingsId] =

SettingsFlagsAndValue(kSpdySettingsFlags, value);

@@ -103,21 +104,21 @@ class HttpServerPropertiesImplTest : public testing::Test {

typedef HttpServerPropertiesImplTest SpdyServerPropertiesTest;

TEST_F(SpdyServerPropertiesTest, Initialize) {

- HostPortPair spdy_server_google("www.google.com", 443);

+ // HostPortPair spdy_server_google("www.google.com", 443);

url::SchemeHostPort google_server("https", "www.google.com", 443);

- std::string spdy_server_g = spdy_server_google.ToString();

+ std::string spdy_server_g = google_server.ToString();

- HostPortPair spdy_server_photos("photos.google.com", 443);

+ // HostPortPair spdy_server_photos("photos.google.com", 443);

url::SchemeHostPort photos_server("https", "photos.google.com", 443);

- std::string spdy_server_p = spdy_server_photos.ToString();

+ std::string spdy_server_p = photos_server.ToString();

- HostPortPair spdy_server_docs("docs.google.com", 443);

+ // HostPortPair spdy_server_docs("docs.google.com", 443);

url::SchemeHostPort docs_server("https", "docs.google.com", 443);

- std::string spdy_server_d = spdy_server_docs.ToString();

+ std::string spdy_server_d = docs_server.ToString();

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ // HostPortPair spdy_server_mail("mail.google.com", 443);

url::SchemeHostPort mail_server("https", "mail.google.com", 443);

- std::string spdy_server_m = spdy_server_mail.ToString();

+ std::string spdy_server_m = mail_server.ToString();

// Check by initializing NULL spdy servers.

impl_.InitializeSpdyServers(NULL, true);

@@ -210,9 +211,9 @@ TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {

EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_empty));

// Add www.google.com:443 as supporting SPDY.

- HostPortPair spdy_server_google("www.google.com", 443);

+ // HostPortPair spdy_server_google("www.google.com", 443);

url::SchemeHostPort google_server("https", "www.google.com", 443);

- impl_.SetSupportsSpdy(spdy_server_google, true);

+ impl_.SetSupportsSpdy(google_server, true);

EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));

// Add mail.google.com:443 as not supporting SPDY.

@@ -220,9 +221,9 @@ TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {

EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));

// Add docs.google.com:443 as supporting SPDY.

- HostPortPair spdy_server_docs("docs.google.com", 443);

+ // HostPortPair spdy_server_docs("docs.google.com", 443);

url::SchemeHostPort docs_server("https", "docs.google.com", 443);

- impl_.SetSupportsSpdy(spdy_server_docs, true);

+ impl_.SetSupportsSpdy(docs_server, true);

EXPECT_TRUE(impl_.SupportsRequestPriority(docs_server));

// Add www.youtube.com:443 as supporting QUIC.

@@ -248,12 +249,12 @@ TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {

TEST_F(SpdyServerPropertiesTest, Clear) {

// Add www.google.com:443 and mail.google.com:443 as supporting SPDY.

- HostPortPair spdy_server_google("www.google.com", 443);

+ // HostPortPair spdy_server_google("www.google.com", 443);

url::SchemeHostPort google_server("https", "www.google.com", 443);

- impl_.SetSupportsSpdy(spdy_server_google, true);

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ impl_.SetSupportsSpdy(google_server, true);

+ // HostPortPair spdy_server_mail("mail.google.com", 443);

url::SchemeHostPort mail_server("https", "mail.google.com", 443);

- impl_.SetSupportsSpdy(spdy_server_mail, true);

+ impl_.SetSupportsSpdy(mail_server, true);

EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));

EXPECT_TRUE(impl_.SupportsRequestPriority(mail_server));

@@ -271,42 +272,42 @@ TEST_F(SpdyServerPropertiesTest, GetSpdyServerList) {

EXPECT_EQ(0U, spdy_server_list.GetSize());

// Check empty server is not added.

- HostPortPair spdy_server_empty(std::string(), 443);

+ // HostPortPair spdy_server_empty(std::string(), 443);

url::SchemeHostPort empty_server("https", std::string(), 443);

- impl_.SetSupportsSpdy(spdy_server_empty, true);

+ impl_.SetSupportsSpdy(empty_server, true);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

EXPECT_EQ(0U, spdy_server_list.GetSize());

std::string string_value_g;

std::string string_value_m;

- HostPortPair spdy_server_google("www.google.com", 443);

+ // HostPortPair spdy_server_google("www.google.com", 443);

url::SchemeHostPort google_server("https", "www.google.com", 443);

- std::string spdy_server_g = spdy_server_google.ToString();

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ std::string spdy_server_g = google_server.ToString();

+ // HostPortPair spdy_server_mail("mail.google.com", 443);

url::SchemeHostPort mail_server("https", "mail.google.com", 443);

- std::string spdy_server_m = spdy_server_mail.ToString();

+ std::string spdy_server_m = mail_server.ToString();

// Add www.google.com:443 as not supporting SPDY.

- impl_.SetSupportsSpdy(spdy_server_google, false);

+ impl_.SetSupportsSpdy(google_server, false);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

EXPECT_EQ(0U, spdy_server_list.GetSize());

// Add www.google.com:443 as supporting SPDY.

- impl_.SetSupportsSpdy(spdy_server_google, true);

+ impl_.SetSupportsSpdy(google_server, true);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

ASSERT_EQ(1U, spdy_server_list.GetSize());

ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));

ASSERT_EQ(spdy_server_g, string_value_g);

// Add mail.google.com:443 as not supporting SPDY.

- impl_.SetSupportsSpdy(spdy_server_mail, false);

+ impl_.SetSupportsSpdy(mail_server, false);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

ASSERT_EQ(1U, spdy_server_list.GetSize());

ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));

ASSERT_EQ(spdy_server_g, string_value_g);

// Add mail.google.com:443 as supporting SPDY.

- impl_.SetSupportsSpdy(spdy_server_mail, true);

+ impl_.SetSupportsSpdy(mail_server, true);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

ASSERT_EQ(2U, spdy_server_list.GetSize());

@@ -328,15 +329,15 @@ TEST_F(SpdyServerPropertiesTest, MRUOfGetSpdyServerList) {

std::string string_value_g;

std::string string_value_m;

- HostPortPair spdy_server_google("www.google.com", 443);

+ // HostPortPair spdy_server_google("www.google.com", 443);

url::SchemeHostPort google_server("https", "www.google.com", 443);

- std::string spdy_server_g = spdy_server_google.ToString();

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ std::string spdy_server_g = google_server.ToString();

+ // HostPortPair spdy_server_mail("mail.google.com", 443);

url::SchemeHostPort mail_server("https", "mail.google.com", 443);

- std::string spdy_server_m = spdy_server_mail.ToString();

+ std::string spdy_server_m = mail_server.ToString();

// Add www.google.com:443 as supporting SPDY.

- impl_.SetSupportsSpdy(spdy_server_google, true);

+ impl_.SetSupportsSpdy(google_server, true);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

ASSERT_EQ(1U, spdy_server_list.GetSize());

ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));

@@ -344,7 +345,7 @@ TEST_F(SpdyServerPropertiesTest, MRUOfGetSpdyServerList) {

// Add mail.google.com:443 as supporting SPDY. Verify mail.google.com:443 and

// www.google.com:443 are in the list.

- impl_.SetSupportsSpdy(spdy_server_mail, true);

+ impl_.SetSupportsSpdy(mail_server, true);

impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);

ASSERT_EQ(2U, spdy_server_list.GetSize());

ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_m));

@@ -1001,10 +1002,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, RemoveExpiredBrokenAltSvc) {

typedef HttpServerPropertiesImplTest SpdySettingsServerPropertiesTest;

TEST_F(SpdySettingsServerPropertiesTest, Initialize) {

- HostPortPair spdy_server_google("www.google.com", 443);

- HostPortPair spdy_server_photos("photos.google.com", 443);

- HostPortPair spdy_server_docs("docs.google.com", 443);

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);

+ url::SchemeHostPort spdy_server_photos("https", "photos.google.com", 443);

+ url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);

+ url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);

// Check by initializing empty spdy settings.

SpdySettingsMap spdy_settings_map(SpdySettingsMap::NO_AUTO_EVICT);

@@ -1066,12 +1068,12 @@ TEST_F(SpdySettingsServerPropertiesTest, Initialize) {

}

TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {

- HostPortPair spdy_server_empty(std::string(), 443);

+ url::SchemeHostPort spdy_server_empty("https", std::string(), 443);

const SettingsMap& settings_map0 = impl_.GetSpdySettings(spdy_server_empty);

EXPECT_EQ(0U, settings_map0.size()); // Returns kEmptySettingsMap.

// Add www.google.com:443 as persisting.

- HostPortPair spdy_server_google("www.google.com", 443);

+ url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

@@ -1087,7 +1089,7 @@ TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {

EXPECT_EQ(value1, flags_and_value1_ret.second);

// Add mail.google.com:443 as not persisting.

- HostPortPair spdy_server_mail("mail.google.com", 443);

+ url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);

const SpdySettingsIds id2 = SETTINGS_DOWNLOAD_BANDWIDTH;

const SpdySettingsFlags flags2 = SETTINGS_FLAG_NONE;

const uint32_t value2 = 62667;

@@ -1097,7 +1099,7 @@ TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {

EXPECT_EQ(0U, settings_map2_ret.size()); // Returns kEmptySettingsMap.

// Add docs.google.com:443 as persisting

- HostPortPair spdy_server_docs("docs.google.com", 443);

+ url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);

const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;

const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value3 = 93997;

@@ -1138,7 +1140,7 @@ TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {

TEST_F(SpdySettingsServerPropertiesTest, Clear) {

// Add www.google.com:443 as persisting.

- HostPortPair spdy_server_google("www.google.com", 443);

+ url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

@@ -1154,7 +1156,7 @@ TEST_F(SpdySettingsServerPropertiesTest, Clear) {

EXPECT_EQ(value1, flags_and_value1_ret.second);

// Add docs.google.com:443 as persisting

- HostPortPair spdy_server_docs("docs.google.com", 443);

+ url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);

const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;

const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value3 = 93997;

@@ -1176,14 +1178,14 @@ TEST_F(SpdySettingsServerPropertiesTest, Clear) {

TEST_F(SpdySettingsServerPropertiesTest, MRUOfGetSpdySettings) {

// Add www.google.com:443 as persisting.

- HostPortPair spdy_server_google("www.google.com", 443);

+ url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);

const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;

const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value1 = 31337;

EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));

// Add docs.google.com:443 as persisting

- HostPortPair spdy_server_docs("docs.google.com", 443);

+ url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);

const SpdySettingsIds id2 = SETTINGS_ROUND_TRIP_TIME;

const SpdySettingsFlags flags2 = SETTINGS_FLAG_PLEASE_PERSIST;

const uint32_t value2 = 93997;

@@ -1263,7 +1265,7 @@ TEST_F(SupportsQuicServerPropertiesTest, SetSupportsQuic) {

typedef HttpServerPropertiesImplTest ServerNetworkStatsServerPropertiesTest;

TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {

- HostPortPair google_server("www.google.com", 443);

+ url::SchemeHostPort google_server("https", "www.google.com", 443);

// Check by initializing empty ServerNetworkStats.

ServerNetworkStatsMap init_server_network_stats_map(

@@ -1288,7 +1290,7 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {

// |docs_server| has a ServerNetworkStats, which will be overwritten by

// InitializeServerNetworkStats(), because |server_network_stats_map| has an

// entry for |docs_server|.

- HostPortPair docs_server("docs.google.com", 443);

+ url::SchemeHostPort docs_server("https", "docs.google.com", 443);

ServerNetworkStats stats_docs;

stats_docs.srtt = base::TimeDelta::FromMicroseconds(20);

stats_docs.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(200);

@@ -1306,7 +1308,7 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {

new_stats_docs.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(250);

server_network_stats_map.Put(docs_server, new_stats_docs);

// Add data for mail.google.com:443.

- HostPortPair mail_server("mail.google.com", 443);

+ url::SchemeHostPort mail_server("https", "mail.google.com", 443);

ServerNetworkStats stats_mail;

stats_mail.srtt = base::TimeDelta::FromMicroseconds(30);

stats_mail.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(300);

@@ -1330,7 +1332,7 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {

}

TEST_F(ServerNetworkStatsServerPropertiesTest, SetServerNetworkStats) {

- HostPortPair foo_server("foo", 80);

+ url::SchemeHostPort foo_server("http", "foo", 80);

const ServerNetworkStats* stats = impl_.GetServerNetworkStats(foo_server);

EXPECT_EQ(NULL, stats);

« no previous file with comments | « net/http/http_server_properties_impl.cc ('k') | net/http/http_server_properties_manager.h » ('j') | no next file with comments »