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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_server_properties_impl_unittest.cc

Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SHP_3
Patch Set: fix cronet && SpdyNetworkTransactionUnittests 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
« components/cronet/ios/cronet_environment.cc ('K') | « net/http/http_server_properties_impl.cc ('k') | net/http/http_server_properties_manager.h » ('j') | net/spdy/spdy_network_transaction_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 68e9c31f2f65933c535aa26131173b21cd93c18a..04f37884bf2ae4826a3dc9c325d7911691dc168c 100644
--- a/net/http/http_server_properties_impl_unittest.cc
+++ b/net/http/http_server_properties_impl_unittest.cc
@@ -56,13 +56,13 @@ struct SpdySettingsDataToVerify {
class HttpServerPropertiesImplTest : public testing::Test {
protected:
- bool HasAlternativeService(const HostPortPair& origin) {
+ bool HasAlternativeService(const url::SchemeHostPort& origin) {
const AlternativeServiceVector alternative_service_vector =
impl_.GetAlternativeServices(origin);
return !alternative_service_vector.empty();
}
- bool SetAlternativeService(const HostPortPair& origin,
+ bool SetAlternativeService(const url::SchemeHostPort& origin,
const AlternativeService& alternative_service) {
const base::Time expiration =
base::Time::Now() + base::TimeDelta::FromDays(1);
@@ -247,18 +247,16 @@ TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {
EXPECT_TRUE(impl_.SupportsRequestPriority(spdy_server_docs));
// Add www.youtube.com:443 as supporting QUIC.
- HostPortPair quic_server_youtube("www.youtube.com", 443);
url::SchemeHostPort youtube_server("https", "www.youtube.com", 443);
const AlternativeService alternative_service1(QUIC, "www.youtube.com", 443);
- SetAlternativeService(quic_server_youtube, alternative_service1);
+ SetAlternativeService(youtube_server, alternative_service1);
EXPECT_TRUE(impl_.SupportsRequestPriority(youtube_server));
// Add www.example.com:443 with two alternative services, one supporting QUIC.
- HostPortPair quic_server_example("www.example.com", 443);
url::SchemeHostPort example_server("https", "www.example.com", 443);
const AlternativeService alternative_service2(NPN_HTTP_2, "", 443);
- SetAlternativeService(quic_server_example, alternative_service2);
- SetAlternativeService(quic_server_example, alternative_service1);
+ SetAlternativeService(example_server, alternative_service2);
+ SetAlternativeService(example_server, alternative_service1);
EXPECT_TRUE(impl_.SupportsRequestPriority(example_server));
// Verify all the entries are the same after additions.
@@ -382,18 +380,18 @@ TEST_F(SpdyServerPropertiesTest, MRUOfGetSpdyServerList) {
typedef HttpServerPropertiesImplTest AlternateProtocolServerPropertiesTest;
TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
- HostPortPair test_host_port_pair("foo", 80);
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ url::SchemeHostPort test_server("http", "foo", 80);
+ EXPECT_FALSE(HasAlternativeService(test_server));
AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
- SetAlternativeService(test_host_port_pair, alternative_service);
+ SetAlternativeService(test_server, alternative_service);
const AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service, alternative_service_vector[0]);
impl_.Clear();
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ EXPECT_FALSE(HasAlternativeService(test_server));
}
TEST_F(AlternateProtocolServerPropertiesTest, ExcludeOrigin) {
@@ -416,12 +414,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, ExcludeOrigin) {
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service4, expiration));
- HostPortPair test_host_port_pair("foo", 443);
- impl_.SetAlternativeServices(test_host_port_pair,
- alternative_service_info_vector);
+ url::SchemeHostPort test_server("https", "foo", 443);
+ impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
const AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(3u, alternative_service_vector.size());
EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
EXPECT_EQ(alternative_service3, alternative_service_vector[1]);
@@ -429,31 +426,29 @@ TEST_F(AlternateProtocolServerPropertiesTest, ExcludeOrigin) {
}
TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
- // |test_host_port_pair1| has an alternative service, which will not be
+ // |test_server1| has an alternative service, which will not be
// affected by InitializeAlternativeServiceServers(), because
// |alternative_service_map| does not have an entry for
- // |test_host_port_pair1|.
- HostPortPair test_host_port_pair1("foo1", 80);
+ // |test_server1|.
+ url::SchemeHostPort test_server1("http", "foo1", 80);
const AlternativeService alternative_service1(NPN_HTTP_2, "bar1", 443);
const base::Time now = base::Time::Now();
base::Time expiration1 = now + base::TimeDelta::FromDays(1);
// 1st entry in the memory.
- impl_.SetAlternativeService(test_host_port_pair1, alternative_service1,
- expiration1);
+ impl_.SetAlternativeService(test_server1, alternative_service1, expiration1);
- // |test_host_port_pair2| has an alternative service, which will be
+ // |test_server2| has an alternative service, which will be
// overwritten by InitializeAlternativeServiceServers(), because
// |alternative_service_map| has an entry for
- // |test_host_port_pair2|.
+ // |test_server2|.
AlternativeServiceInfoVector alternative_service_info_vector;
const AlternativeService alternative_service2(NPN_SPDY_3_1, "bar2", 443);
base::Time expiration2 = now + base::TimeDelta::FromDays(2);
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service2, expiration2));
- HostPortPair test_host_port_pair2("foo2", 80);
+ url::SchemeHostPort test_server2("http", "foo2", 80);
// 0th entry in the memory.
- impl_.SetAlternativeServices(test_host_port_pair2,
- alternative_service_info_vector);
+ impl_.SetAlternativeServices(test_server2, alternative_service_info_vector);
// Prepare |alternative_service_map| to be loaded by
// InitializeAlternativeServiceServers().
@@ -465,10 +460,10 @@ TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
expiration3);
// Simulate updating data for 0th entry with data from Preferences.
alternative_service_map.Put(
- test_host_port_pair2,
+ test_server2,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info1));
- HostPortPair test_host_port_pair3("foo3", 80);
+ url::SchemeHostPort test_server3("http", "foo3", 80);
const AlternativeService alternative_service4(NPN_HTTP_2, "bar4", 1234);
base::Time expiration4 = now + base::TimeDelta::FromDays(4);
const AlternativeServiceInfo alternative_service_info2(alternative_service4,
@@ -476,11 +471,10 @@ TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
// Add an old entry from Preferences, this will be added to end of recency
// list.
alternative_service_map.Put(
- test_host_port_pair3,
+ test_server3,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info2));
- // MRU list will be test_host_port_pair2, test_host_port_pair1,
- // test_host_port_pair3.
+ // MRU list will be test_server2, test_server1, test_server3.
impl_.InitializeAlternativeServiceServers(&alternative_service_map);
// Verify alternative_service_map.
@@ -488,17 +482,17 @@ TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
ASSERT_EQ(3u, map.size());
AlternativeServiceMap::const_iterator map_it = map.begin();
- EXPECT_TRUE(map_it->first.Equals(test_host_port_pair2));
+ EXPECT_TRUE(map_it->first.Equals(test_server2));
ASSERT_EQ(1u, map_it->second.size());
EXPECT_EQ(alternative_service3, map_it->second[0].alternative_service);
EXPECT_EQ(expiration3, map_it->second[0].expiration);
++map_it;
- EXPECT_TRUE(map_it->first.Equals(test_host_port_pair1));
+ EXPECT_TRUE(map_it->first.Equals(test_server1));
ASSERT_EQ(1u, map_it->second.size());
EXPECT_EQ(alternative_service1, map_it->second[0].alternative_service);
EXPECT_EQ(expiration1, map_it->second[0].expiration);
++map_it;
- EXPECT_TRUE(map_it->first.Equals(test_host_port_pair3));
+ EXPECT_TRUE(map_it->first.Equals(test_server3));
ASSERT_EQ(1u, map_it->second.size());
EXPECT_EQ(alternative_service4, map_it->second[0].alternative_service);
EXPECT_EQ(expiration4, map_it->second[0].expiration);
@@ -508,13 +502,12 @@ TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
// InitializeAlternativeServiceServers() should not crash if there is an empty
// hostname is the mapping.
TEST_F(AlternateProtocolServerPropertiesTest, InitializeWithEmptyHostname) {
- const HostPortPair host_port_pair("foo", 443);
+ url::SchemeHostPort server("https", "foo", 443);
const AlternativeService alternative_service_with_empty_hostname(NPN_HTTP_2,
"", 1234);
const AlternativeService alternative_service_with_foo_hostname(NPN_HTTP_2,
"foo", 1234);
- SetAlternativeService(host_port_pair,
- alternative_service_with_empty_hostname);
+ SetAlternativeService(server, alternative_service_with_empty_hostname);
impl_.MarkAlternativeServiceBroken(alternative_service_with_foo_hostname);
AlternativeServiceMap alternative_service_map(
@@ -524,7 +517,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, InitializeWithEmptyHostname) {
EXPECT_TRUE(
impl_.IsAlternativeServiceBroken(alternative_service_with_foo_hostname));
const AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(host_port_pair);
+ impl_.GetAlternativeServices(server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service_with_foo_hostname,
alternative_service_vector[0]);
@@ -534,7 +527,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, InitializeWithEmptyHostname) {
// GetAlternativeServices() should remove |alternative_service_map_| elements
// with empty value.
TEST_F(AlternateProtocolServerPropertiesTest, EmptyVector) {
- HostPortPair host_port_pair("foo", 443);
+ url::SchemeHostPort server("https", "foo", 443);
const AlternativeService alternative_service(NPN_HTTP_2, "bar", 443);
base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
const AlternativeServiceInfo alternative_service_info(alternative_service,
@@ -542,7 +535,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, EmptyVector) {
AlternativeServiceMap alternative_service_map(
AlternativeServiceMap::NO_AUTO_EVICT);
alternative_service_map.Put(
- host_port_pair,
+ server,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
// Prepare |alternative_service_map_| with a single key that has a single
@@ -551,26 +544,26 @@ TEST_F(AlternateProtocolServerPropertiesTest, EmptyVector) {
// GetAlternativeServices() should remove such AlternativeServiceInfo from
// |alternative_service_map_|, emptying the AlternativeServiceInfoVector
- // corresponding to |host_port_pair|.
+ // corresponding to |server|.
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(host_port_pair);
+ impl_.GetAlternativeServices(server);
ASSERT_TRUE(alternative_service_vector.empty());
// GetAlternativeServices() should remove this key from
// |alternative_service_map_|, and SetAlternativeServices() should not crash.
impl_.SetAlternativeServices(
- host_port_pair,
+ server,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
- // There should still be no alternative service assigned to |host_port_pair|.
- alternative_service_vector = impl_.GetAlternativeServices(host_port_pair);
+ // There should still be no alternative service assigned to |server|.
+ alternative_service_vector = impl_.GetAlternativeServices(server);
ASSERT_TRUE(alternative_service_vector.empty());
}
// Regression test for https://crbug.com/516486 for the canonical host case.
TEST_F(AlternateProtocolServerPropertiesTest, EmptyVectorForCanonical) {
- HostPortPair host_port_pair("foo.c.youtube.com", 443);
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 443);
+ url::SchemeHostPort server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
const AlternativeService alternative_service(NPN_HTTP_2, "", 443);
base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
const AlternativeServiceInfo alternative_service_info(alternative_service,
@@ -578,7 +571,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, EmptyVectorForCanonical) {
AlternativeServiceMap alternative_service_map(
AlternativeServiceMap::NO_AUTO_EVICT);
alternative_service_map.Put(
- canonical_host_port_pair,
+ canonical_server,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
// Prepare |alternative_service_map_| with a single key that has a single
@@ -587,65 +580,63 @@ TEST_F(AlternateProtocolServerPropertiesTest, EmptyVectorForCanonical) {
// GetAlternativeServices() should remove such AlternativeServiceInfo from
// |alternative_service_map_|, emptying the AlternativeServiceInfoVector
- // corresponding to |canonical_host_port_pair|, even when looking up
- // alternative services for |host_port_pair|.
+ // corresponding to |canonical_server|, even when looking up
+ // alternative services for |server|.
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(host_port_pair);
+ impl_.GetAlternativeServices(server);
ASSERT_TRUE(alternative_service_vector.empty());
// GetAlternativeServices() should remove this key from
// |alternative_service_map_|, and SetAlternativeServices() should not crash.
impl_.SetAlternativeServices(
- canonical_host_port_pair,
+ canonical_server,
AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
// There should still be no alternative service assigned to
- // |canonical_host_port_pair|.
- alternative_service_vector =
- impl_.GetAlternativeServices(canonical_host_port_pair);
+ // |canonical_server|.
+ alternative_service_vector = impl_.GetAlternativeServices(canonical_server);
ASSERT_TRUE(alternative_service_vector.empty());
}
TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternativeServices) {
- HostPortPair test_host_port_pair1("foo1", 80);
+ url::SchemeHostPort test_server1("http", "foo1", 80);
const AlternativeService alternative_service1(NPN_SPDY_3_1, "foo1", 443);
- SetAlternativeService(test_host_port_pair1, alternative_service1);
- HostPortPair test_host_port_pair2("foo2", 80);
+ SetAlternativeService(test_server1, alternative_service1);
+ url::SchemeHostPort test_server2("http", "foo2", 80);
const AlternativeService alternative_service2(NPN_HTTP_2, "foo2", 1234);
- SetAlternativeService(test_host_port_pair2, alternative_service2);
+ SetAlternativeService(test_server2, alternative_service2);
const AlternativeServiceMap& map = impl_.alternative_service_map();
AlternativeServiceMap::const_iterator it = map.begin();
- EXPECT_TRUE(it->first.Equals(test_host_port_pair2));
+ EXPECT_TRUE(it->first.Equals(test_server2));
ASSERT_EQ(1u, it->second.size());
EXPECT_EQ(alternative_service2, it->second[0].alternative_service);
const AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair1);
+ impl_.GetAlternativeServices(test_server1);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
// GetAlternativeServices should reorder the AlternateProtocol map.
it = map.begin();
- EXPECT_TRUE(it->first.Equals(test_host_port_pair1));
+ EXPECT_TRUE(it->first.Equals(test_server1));
ASSERT_EQ(1u, it->second.size());
EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
}
TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
- HostPortPair test_host_port_pair("foo", 80);
+ url::SchemeHostPort test_server("http", "foo", 80);
const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
- SetAlternativeService(test_host_port_pair, alternative_service1);
+ SetAlternativeService(test_server, alternative_service1);
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service1));
// GetAlternativeServices should return the broken alternative service.
impl_.MarkAlternativeServiceBroken(alternative_service1);
- alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ alternative_service_vector = impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
@@ -658,10 +649,8 @@ TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
const AlternativeService alternative_service2(NPN_HTTP_2, "foo", 1234);
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service2, expiration));
- impl_.SetAlternativeServices(test_host_port_pair,
- alternative_service_info_vector);
- alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
+ alternative_service_vector = impl_.GetAlternativeServices(test_server);
ASSERT_EQ(2u, alternative_service_vector.size());
EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
EXPECT_EQ(alternative_service2, alternative_service_vector[1]);
@@ -669,9 +658,8 @@ TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service_vector[1]));
// SetAlternativeService should add a broken alternative service to the map.
- SetAlternativeService(test_host_port_pair, alternative_service1);
- alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ SetAlternativeService(test_server, alternative_service1);
+ alternative_service_vector = impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service_vector[0]));
@@ -694,12 +682,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, MaxAge) {
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service2, now + one_day));
- HostPortPair test_host_port_pair("foo", 80);
- impl_.SetAlternativeServices(test_host_port_pair,
- alternative_service_info_vector);
+ url::SchemeHostPort test_server("http", "foo", 80);
+ impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
}
@@ -721,17 +708,52 @@ TEST_F(AlternateProtocolServerPropertiesTest, MaxAgeCanonical) {
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service2, now + one_day));
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
- impl_.SetAlternativeServices(canonical_host_port_pair,
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
+ impl_.SetAlternativeServices(canonical_server,
alternative_service_info_vector);
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
}
+TEST_F(AlternateProtocolServerPropertiesTest, AlternativeServiceWithScheme) {
+ AlternativeServiceInfoVector alternative_service_info_vector;
+ const AlternativeService alternative_service1(NPN_SPDY_3_1, "foo", 443);
+ base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
+ alternative_service_info_vector.push_back(
+ AlternativeServiceInfo(alternative_service1, expiration));
+ const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
+ alternative_service_info_vector.push_back(
+ AlternativeServiceInfo(alternative_service2, expiration));
+ // Set Alt-Svc list for |http_server|.
+ url::SchemeHostPort http_server("http", "foo", 80);
+ impl_.SetAlternativeServices(http_server, alternative_service_info_vector);
+
+ const net::AlternativeServiceMap& map = impl_.alternative_service_map();
+ net::AlternativeServiceMap::const_iterator it = map.begin();
+ EXPECT_TRUE(it->first.Equals(http_server));
+ ASSERT_EQ(2u, it->second.size());
+ EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
+ EXPECT_EQ(alternative_service2, it->second[1].alternative_service);
+
+ // Check Alt-Svc list should not be set for |https_server|.
+ url::SchemeHostPort https_server("https", "foo", 80);
+ EXPECT_EQ(0u, impl_.GetAlternativeServices(https_server).size());
+
+ // Set Alt-Svc list for |https_server|.
+ impl_.SetAlternativeServices(https_server, alternative_service_info_vector);
+ EXPECT_EQ(2u, impl_.GetAlternativeServices(https_server).size());
+ EXPECT_EQ(2u, impl_.GetAlternativeServices(http_server).size());
+
+ // Clear Alt-Svc list for |http_server|.
+ impl_.ClearAlternativeServices(http_server);
+ EXPECT_EQ(0u, impl_.GetAlternativeServices(http_server).size());
+ EXPECT_EQ(2u, impl_.GetAlternativeServices(https_server).size());
+}
+
TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternativeServices) {
AlternativeServiceInfoVector alternative_service_info_vector;
const AlternativeService alternative_service1(NPN_SPDY_3_1, "foo", 443);
@@ -741,18 +763,17 @@ TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternativeServices) {
const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
alternative_service_info_vector.push_back(
AlternativeServiceInfo(alternative_service2, expiration));
- HostPortPair test_host_port_pair("foo", 80);
- impl_.SetAlternativeServices(test_host_port_pair,
- alternative_service_info_vector);
+ url::SchemeHostPort test_server("http", "foo", 80);
+ impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
const net::AlternativeServiceMap& map = impl_.alternative_service_map();
net::AlternativeServiceMap::const_iterator it = map.begin();
- EXPECT_TRUE(it->first.Equals(test_host_port_pair));
+ EXPECT_TRUE(it->first.Equals(test_server));
ASSERT_EQ(2u, it->second.size());
EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
EXPECT_EQ(alternative_service2, it->second[1].alternative_service);
- impl_.ClearAlternativeServices(test_host_port_pair);
+ impl_.ClearAlternativeServices(test_server);
EXPECT_TRUE(map.empty());
}
@@ -761,14 +782,13 @@ TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternativeServices) {
// particular, an alternative service mapped to an origin shadows alternative
// services of canonical hosts.
TEST_F(AlternateProtocolServerPropertiesTest, BrokenShadowsCanonical) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
1234);
- SetAlternativeService(canonical_host_port_pair,
- canonical_alternative_service);
+ SetAlternativeService(canonical_server, canonical_alternative_service);
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(canonical_alternative_service, alternative_service_vector[0]);
@@ -776,31 +796,30 @@ TEST_F(AlternateProtocolServerPropertiesTest, BrokenShadowsCanonical) {
impl_.MarkAlternativeServiceBroken(broken_alternative_service);
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(broken_alternative_service));
- SetAlternativeService(test_host_port_pair, broken_alternative_service);
- alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ SetAlternativeService(test_server, broken_alternative_service);
+ alternative_service_vector = impl_.GetAlternativeServices(test_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(broken_alternative_service, alternative_service_vector[0]);
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(broken_alternative_service));
}
TEST_F(AlternateProtocolServerPropertiesTest, ClearBroken) {
- HostPortPair test_host_port_pair("foo", 80);
+ url::SchemeHostPort test_server("http", "foo", 80);
const AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
- SetAlternativeService(test_host_port_pair, alternative_service);
+ SetAlternativeService(test_server, alternative_service);
impl_.MarkAlternativeServiceBroken(alternative_service);
- ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
+ ASSERT_TRUE(HasAlternativeService(test_server));
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
// ClearAlternativeServices should leave a broken alternative service marked
// as such.
- impl_.ClearAlternativeServices(test_host_port_pair);
+ impl_.ClearAlternativeServices(test_server);
EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
}
TEST_F(AlternateProtocolServerPropertiesTest, MarkRecentlyBroken) {
- HostPortPair host_port_pair("foo", 80);
+ url::SchemeHostPort server("http", "foo", 80);
const AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
- SetAlternativeService(host_port_pair, alternative_service);
+ SetAlternativeService(server, alternative_service);
EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
@@ -815,11 +834,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, MarkRecentlyBroken) {
}
TEST_F(AlternateProtocolServerPropertiesTest, Canonical) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
+ EXPECT_FALSE(HasAlternativeService(test_server));
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
- EXPECT_FALSE(HasAlternativeService(canonical_host_port_pair));
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
+ EXPECT_FALSE(HasAlternativeService(canonical_server));
AlternativeServiceInfoVector alternative_service_info_vector;
const AlternativeService canonical_alternative_service1(
@@ -830,94 +849,89 @@ TEST_F(AlternateProtocolServerPropertiesTest, Canonical) {
const AlternativeService canonical_alternative_service2(NPN_HTTP_2, "", 443);
alternative_service_info_vector.push_back(
AlternativeServiceInfo(canonical_alternative_service2, expiration));
- impl_.SetAlternativeServices(canonical_host_port_pair,
+ impl_.SetAlternativeServices(canonical_server,
alternative_service_info_vector);
- // Since |test_host_port_pair| does not have an alternative service itself,
- // GetAlternativeServices should return those of |canonical_host_port_pair|.
+ // Since |test_server| does not have an alternative service itself,
+ // GetAlternativeServices should return those of |canonical_server|.
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(test_server);
ASSERT_EQ(2u, alternative_service_vector.size());
EXPECT_EQ(canonical_alternative_service1, alternative_service_vector[0]);
// Since |canonical_alternative_service2| has an empty host,
// GetAlternativeServices should substitute the hostname of its |origin|
// argument.
- EXPECT_EQ(test_host_port_pair.host(), alternative_service_vector[1].host);
+ EXPECT_EQ(test_server.host(), alternative_service_vector[1].host);
EXPECT_EQ(canonical_alternative_service2.protocol,
alternative_service_vector[1].protocol);
EXPECT_EQ(canonical_alternative_service2.port,
alternative_service_vector[1].port);
// Verify the canonical suffix.
+ EXPECT_EQ(".c.youtube.com", impl_.GetCanonicalSuffix(test_server.host()));
EXPECT_EQ(".c.youtube.com",
- impl_.GetCanonicalSuffix(test_host_port_pair.host()));
- EXPECT_EQ(".c.youtube.com",
- impl_.GetCanonicalSuffix(canonical_host_port_pair.host()));
+ impl_.GetCanonicalSuffix(canonical_server.host()));
}
TEST_F(AlternateProtocolServerPropertiesTest, ClearCanonical) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
1234);
- SetAlternativeService(canonical_host_port_pair,
- canonical_alternative_service);
- impl_.ClearAlternativeServices(canonical_host_port_pair);
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ SetAlternativeService(canonical_server, canonical_alternative_service);
+ impl_.ClearAlternativeServices(canonical_server);
+ EXPECT_FALSE(HasAlternativeService(test_server));
}
TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
1234);
- SetAlternativeService(canonical_host_port_pair,
- canonical_alternative_service);
+ SetAlternativeService(canonical_server, canonical_alternative_service);
impl_.MarkAlternativeServiceBroken(canonical_alternative_service);
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ EXPECT_FALSE(HasAlternativeService(test_server));
}
// Adding an alternative service for a new host overrides canonical host.
TEST_F(AlternateProtocolServerPropertiesTest, CanonicalOverride) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- HostPortPair bar_host_port_pair("bar.c.youtube.com", 80);
+ url::SchemeHostPort foo_server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort bar_server("https", "bar.c.youtube.com", 443);
AlternativeService bar_alternative_service(QUIC, "bar.c.youtube.com", 1234);
- SetAlternativeService(bar_host_port_pair, bar_alternative_service);
+ SetAlternativeService(bar_server, bar_alternative_service);
AlternativeServiceVector alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ impl_.GetAlternativeServices(foo_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(bar_alternative_service, alternative_service_vector[0]);
- HostPortPair qux_host_port_pair("qux.c.youtube.com", 80);
+ url::SchemeHostPort qux_server("https", "qux.c.youtube.com", 443);
AlternativeService qux_alternative_service(QUIC, "qux.c.youtube.com", 443);
- SetAlternativeService(qux_host_port_pair, qux_alternative_service);
- alternative_service_vector =
- impl_.GetAlternativeServices(test_host_port_pair);
+ SetAlternativeService(qux_server, qux_alternative_service);
+ alternative_service_vector = impl_.GetAlternativeServices(foo_server);
ASSERT_EQ(1u, alternative_service_vector.size());
EXPECT_EQ(qux_alternative_service, alternative_service_vector[0]);
}
TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
- HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
- HostPortPair canonical_host_port_pair("bar.c.youtube.com", 80);
+ url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
+ url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
1234);
- SetAlternativeService(canonical_host_port_pair,
- canonical_alternative_service);
+ SetAlternativeService(canonical_server, canonical_alternative_service);
impl_.Clear();
- EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
+ EXPECT_FALSE(HasAlternativeService(test_server));
}
TEST_F(AlternateProtocolServerPropertiesTest,
ExpireBrokenAlternateProtocolMappings) {
- HostPortPair host_port_pair("foo", 443);
+ url::SchemeHostPort server("https", "foo", 443);
AlternativeService alternative_service(QUIC, "foo", 443);
- SetAlternativeService(host_port_pair, alternative_service);
- EXPECT_TRUE(HasAlternativeService(host_port_pair));
+ SetAlternativeService(server, alternative_service);
+ EXPECT_TRUE(HasAlternativeService(server));
EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
@@ -935,20 +949,20 @@ TEST_F(AlternateProtocolServerPropertiesTest,
// Regression test for https://crbug.com/505413.
TEST_F(AlternateProtocolServerPropertiesTest, RemoveExpiredBrokenAltSvc) {
- HostPortPair foo_host_port_pair("foo", 443);
+ url::SchemeHostPort foo_server("https", "foo", 443);
AlternativeService bar_alternative_service(QUIC, "bar", 443);
- SetAlternativeService(foo_host_port_pair, bar_alternative_service);
- EXPECT_TRUE(HasAlternativeService(foo_host_port_pair));
+ SetAlternativeService(foo_server, bar_alternative_service);
+ EXPECT_TRUE(HasAlternativeService(foo_server));
- HostPortPair bar_host_port_pair1("bar", 80);
+ url::SchemeHostPort bar_server1("http", "bar", 80);
AlternativeService nohost_alternative_service(QUIC, "", 443);
- SetAlternativeService(bar_host_port_pair1, nohost_alternative_service);
- EXPECT_TRUE(HasAlternativeService(bar_host_port_pair1));
+ SetAlternativeService(bar_server1, nohost_alternative_service);
+ EXPECT_TRUE(HasAlternativeService(bar_server1));
- HostPortPair bar_host_port_pair2("bar", 443);
+ url::SchemeHostPort bar_server2("https", "bar", 443);
AlternativeService baz_alternative_service(QUIC, "baz", 1234);
- SetAlternativeService(bar_host_port_pair2, baz_alternative_service);
- EXPECT_TRUE(HasAlternativeService(bar_host_port_pair2));
+ SetAlternativeService(bar_server2, baz_alternative_service);
+ EXPECT_TRUE(HasAlternativeService(bar_server2));
// Mark "bar:443" as broken.
base::TimeTicks past =
@@ -960,11 +974,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, RemoveExpiredBrokenAltSvc) {
HttpServerPropertiesImplPeer::ExpireBrokenAlternateProtocolMappings(impl_);
// "foo:443" should have no alternative service now.
- EXPECT_FALSE(HasAlternativeService(foo_host_port_pair));
+ EXPECT_FALSE(HasAlternativeService(foo_server));
// "bar:80" should have no alternative service now.
- EXPECT_FALSE(HasAlternativeService(bar_host_port_pair1));
+ EXPECT_FALSE(HasAlternativeService(bar_server1));
// The alternative service of "bar:443" should be unaffected.
- EXPECT_TRUE(HasAlternativeService(bar_host_port_pair2));
+ EXPECT_TRUE(HasAlternativeService(bar_server2));
EXPECT_TRUE(
impl_.WasAlternativeServiceRecentlyBroken(bar_alternative_service));
« components/cronet/ios/cronet_environment.cc ('K') | « net/http/http_server_properties_impl.cc ('k') | net/http/http_server_properties_manager.h » ('j') | net/spdy/spdy_network_transaction_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698