| 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 d6c2c1c9e0b6f050ab4d552cd200474e0f55859a..a750babd2cb2d4f312cdd125cbfb2f20a4b9d683 100644
|
| --- a/net/http/http_server_properties_impl_unittest.cc
|
| +++ b/net/http/http_server_properties_impl_unittest.cc
|
| @@ -28,8 +28,8 @@ namespace {
|
| class HttpServerPropertiesImplTest : public testing::Test {
|
| protected:
|
| bool HasAlternateProtocol(const HostPortPair& server) {
|
| - const AlternateProtocolInfo alternate = impl_.GetAlternateProtocol(server);
|
| - return alternate.protocol != UNINITIALIZED_ALTERNATE_PROTOCOL;
|
| + const AlternateProtocols alternates = impl_.GetAlternateProtocols(server);
|
| + return !alternates.empty();
|
| }
|
|
|
| HttpServerPropertiesImpl impl_;
|
| @@ -100,7 +100,7 @@ TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {
|
|
|
| // Add www.youtube.com:443 as supporting QUIC.
|
| HostPortPair quic_server_youtube("www.youtube.com", 443);
|
| - impl_.SetAlternateProtocol(quic_server_youtube, 443, QUIC, 1);
|
| + impl_.AddAlternateProtocol(quic_server_youtube, 443, QUIC, 1);
|
| EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_youtube));
|
|
|
| // Verify all the entries are the same after additions.
|
| @@ -225,12 +225,12 @@ typedef HttpServerPropertiesImplTest AlternateProtocolServerPropertiesTest;
|
| TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
|
| HostPortPair test_host_port_pair("foo", 80);
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - const AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_EQ(443, alternate.port);
|
| - EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| + const AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(443, alternate_protocols[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, alternate_protocols[0].protocol);
|
|
|
| impl_.Clear();
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| @@ -238,112 +238,187 @@ TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, DefaultProbabilityExcluded) {
|
| HostPortPair test_host_port_pair("foo", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .99);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 0.99);
|
|
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, Probability) {
|
| - impl_.SetAlternateProtocolProbabilityThreshold(.25);
|
| + impl_.SetAlternateProtocolProbabilityThreshold(0.25);
|
|
|
| HostPortPair test_host_port_pair("foo", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .5);
|
| -
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - const AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_EQ(443, alternate.port);
|
| - EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
|
| - EXPECT_EQ(.5, alternate.probability);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 0.5);
|
| +
|
| + const AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(443, alternate_protocols[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, alternate_protocols[0].protocol);
|
| + EXPECT_EQ(0.5, alternate_protocols[0].probability);
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, ProbabilityExcluded) {
|
| - impl_.SetAlternateProtocolProbabilityThreshold(.75);
|
| + impl_.SetAlternateProtocolProbabilityThreshold(0.75);
|
|
|
| HostPortPair test_host_port_pair("foo", 80);
|
|
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .5);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 0.5);
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
|
| HostPortPair test_host_port_pair1("foo1", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
|
| - impl_.SetBrokenAlternateProtocol(test_host_port_pair1);
|
| + impl_.AddAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
|
| + AlternateProtocolInfo alternate_protocol(123, NPN_SPDY_3, 1.0);
|
| + impl_.SetBrokenAlternateProtocol(test_host_port_pair1, alternate_protocol);
|
| HostPortPair test_host_port_pair2("foo2", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_3, 1.0);
|
| + impl_.AddAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_3, 1.0);
|
|
|
| AlternateProtocolMap alternate_protocol_map(
|
| AlternateProtocolMap::NO_AUTO_EVICT);
|
| AlternateProtocolInfo alternate(123, NPN_SPDY_3, 1);
|
| - alternate_protocol_map.Put(test_host_port_pair2, alternate);
|
| + alternate_protocol_map.Put(test_host_port_pair2,
|
| + AlternateProtocols(/*size=*/1, alternate));
|
| HostPortPair test_host_port_pair3("foo3", 80);
|
| alternate.port = 1234;
|
| - alternate_protocol_map.Put(test_host_port_pair3, alternate);
|
| + alternate_protocol_map.Put(test_host_port_pair3,
|
| + AlternateProtocols(/*size=*/1, alternate));
|
| impl_.InitializeAlternateProtocolServers(&alternate_protocol_map);
|
|
|
| // Verify test_host_port_pair3 is the MRU server.
|
| const AlternateProtocolMap& map = impl_.alternate_protocol_map();
|
| AlternateProtocolMap::const_iterator it = map.begin();
|
| EXPECT_TRUE(it->first.Equals(test_host_port_pair3));
|
| - EXPECT_EQ(1234, it->second.port);
|
| - EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
|
| -
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair1));
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair2));
|
| - alternate = impl_.GetAlternateProtocol(test_host_port_pair1);
|
| - EXPECT_TRUE(alternate.is_broken);
|
| - alternate = impl_.GetAlternateProtocol(test_host_port_pair2);
|
| - EXPECT_EQ(123, alternate.port);
|
| - EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
|
| + ASSERT_EQ(1u, it->second.size());
|
| + EXPECT_EQ(1234, it->second[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, it->second[0].protocol);
|
| +
|
| + AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair1);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_TRUE(alternate_protocols[0].is_broken);
|
| + alternate_protocols = impl_.GetAlternateProtocols(test_host_port_pair2);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(123, alternate_protocols[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, alternate_protocols[0].protocol);
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternateProtocol) {
|
| HostPortPair test_host_port_pair1("foo1", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
|
| + impl_.AddAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
|
| HostPortPair test_host_port_pair2("foo2", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1.0);
|
| + impl_.AddAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1.0);
|
|
|
| const AlternateProtocolMap& map = impl_.alternate_protocol_map();
|
| AlternateProtocolMap::const_iterator it = map.begin();
|
| EXPECT_TRUE(it->first.Equals(test_host_port_pair2));
|
| - EXPECT_EQ(1234, it->second.port);
|
| - EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
|
| -
|
| - // GetAlternateProtocol should reorder the AlternateProtocol map.
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair1);
|
| + ASSERT_EQ(1u, it->second.size());
|
| + EXPECT_EQ(1234, it->second[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, it->second[0].protocol);
|
| +
|
| + // GetAlternateProtocols should reorder the AlternateProtocol map.
|
| + const AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair1);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + const AlternateProtocolInfo alternate = alternate_protocols[0];
|
| EXPECT_EQ(443, alternate.port);
|
| EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
|
| it = map.begin();
|
| EXPECT_TRUE(it->first.Equals(test_host_port_pair1));
|
| - EXPECT_EQ(443, it->second.port);
|
| - EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
|
| + ASSERT_EQ(1u, it->second.size());
|
| + EXPECT_EQ(443, it->second[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, it->second[0].protocol);
|
| +}
|
| +
|
| +TEST_F(AlternateProtocolServerPropertiesTest, RemoveAlternateProtocol) {
|
| + HostPortPair test_host_port_pair("foo", 80);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1);
|
| +
|
| + const net::AlternateProtocolMap& map = impl_.alternate_protocol_map();
|
| + net::AlternateProtocolMap::const_iterator it = map.begin();
|
| + EXPECT_TRUE(it->first.Equals(test_host_port_pair));
|
| + ASSERT_EQ(2u, it->second.size());
|
| + EXPECT_EQ(443, it->second[0].port);
|
| + EXPECT_EQ(1234, it->second[1].port);
|
| +
|
| + // Adding an identical entry does nothing.
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1);
|
| + it = map.begin();
|
| + ASSERT_EQ(2u, it->second.size());
|
| +
|
| + // Add a third one.
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 123, NPN_SPDY_3, 1);
|
| + it = map.begin();
|
| + ASSERT_EQ(3u, it->second.size());
|
| + EXPECT_EQ(123, it->second[2].port);
|
| +
|
| + // Remove one by one.
|
| + impl_.RemoveAlternateProtocol(test_host_port_pair,
|
| + AlternateProtocolInfo(1234, NPN_SPDY_3, 1));
|
| + it = map.begin();
|
| + ASSERT_EQ(2u, it->second.size());
|
| + EXPECT_EQ(443, it->second[0].port);
|
| + EXPECT_EQ(123, it->second[1].port);
|
| +
|
| + impl_.RemoveAlternateProtocol(test_host_port_pair,
|
| + AlternateProtocolInfo(443, NPN_SPDY_3, 1));
|
| + it = map.begin();
|
| + ASSERT_EQ(1u, it->second.size());
|
| + EXPECT_EQ(123, it->second[0].port);
|
| +
|
| + impl_.RemoveAlternateProtocol(test_host_port_pair,
|
| + AlternateProtocolInfo(123, NPN_SPDY_3, 1));
|
| + ASSERT_EQ(0u, map.size());
|
| +}
|
| +
|
| +TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternateProtocols) {
|
| + HostPortPair test_host_port_pair("foo", 80);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1);
|
| +
|
| + const net::AlternateProtocolMap& map = impl_.alternate_protocol_map();
|
| + net::AlternateProtocolMap::const_iterator it = map.begin();
|
| + EXPECT_TRUE(it->first.Equals(test_host_port_pair));
|
| + ASSERT_EQ(2u, it->second.size());
|
| + EXPECT_EQ(443, it->second[0].port);
|
| + EXPECT_EQ(1234, it->second[1].port);
|
| +
|
| + impl_.ClearAlternateProtocols(test_host_port_pair);
|
| + EXPECT_EQ(0u, impl_.alternate_protocol_map().size());
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
|
| HostPortPair test_host_port_pair("foo", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| - impl_.SetBrokenAlternateProtocol(test_host_port_pair);
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_TRUE(alternate.is_broken);
|
| -
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1.0);
|
| - alternate = impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_TRUE(alternate.is_broken) << "Second attempt should be ignored.";
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 123, NPN_SPDY_3, 1.0);
|
| + AlternateProtocolInfo alternate(123, NPN_SPDY_3, 1);
|
| + impl_.SetBrokenAlternateProtocol(test_host_port_pair, alternate);
|
| + AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_TRUE(alternate_protocols[0].is_broken);
|
| +
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 123, NPN_SPDY_3, 1);
|
| + alternate_protocols = impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size())
|
| + << "Second attempt should be ignored.";
|
| + EXPECT_TRUE(alternate_protocols[0].is_broken);
|
| +
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1.0);
|
| + alternate_protocols = impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(2u, alternate_protocols.size()) << "Different port should be fine.";
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, ClearBroken) {
|
| HostPortPair test_host_port_pair("foo", 80);
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| - impl_.SetBrokenAlternateProtocol(test_host_port_pair);
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_TRUE(alternate.is_broken);
|
| - impl_.ClearAlternateProtocol(test_host_port_pair);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 123, NPN_SPDY_3, 1.0);
|
| + AlternateProtocolInfo alternate(123, NPN_SPDY_3, 1);
|
| + impl_.SetBrokenAlternateProtocol(test_host_port_pair, alternate);
|
| + AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_TRUE(alternate_protocols[0].is_broken);
|
| + impl_.ClearAlternateProtocols(test_host_port_pair);
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| }
|
|
|
| @@ -355,18 +430,18 @@ TEST_F(AlternateProtocolServerPropertiesTest, Forced) {
|
|
|
| // Verify the forced protocol.
|
| HostPortPair test_host_port_pair("foo", 80);
|
| - EXPECT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_EQ(default_protocol.port, alternate.port);
|
| - EXPECT_EQ(default_protocol.protocol, alternate.protocol);
|
| + AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(default_protocol.port, alternate_protocols[0].port);
|
| + EXPECT_EQ(default_protocol.protocol, alternate_protocols[0].protocol);
|
|
|
| // Verify the real protocol overrides the forced protocol.
|
| - impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - alternate = impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_EQ(443, alternate.port);
|
| - EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
|
| + impl_.AddAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
|
| + alternate_protocols = impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(443, alternate_protocols[0].port);
|
| + EXPECT_EQ(NPN_SPDY_3, alternate_protocols[0].protocol);
|
|
|
| // Turn off the static, forced alternate protocol so that tests don't
|
| // have this state.
|
| @@ -386,14 +461,14 @@ TEST_F(AlternateProtocolServerPropertiesTest, Canonical) {
|
|
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol, 1.0);
|
| // Verify the forced protocol.
|
| - ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_EQ(canonical_protocol.port, alternate.port);
|
| - EXPECT_EQ(canonical_protocol.protocol, alternate.protocol);
|
| + AlternateProtocols alternate_protocols =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternate_protocols.size());
|
| + EXPECT_EQ(canonical_protocol.port, alternate_protocols[0].port);
|
| + EXPECT_EQ(canonical_protocol.protocol, alternate_protocols[0].protocol);
|
|
|
| // Verify the canonical suffix.
|
| EXPECT_EQ(".c.youtube.com",
|
| @@ -409,7 +484,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBelowThreshold) {
|
| HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 0.01);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol,
|
| canonical_protocol.probability);
|
| EXPECT_FALSE(HasAlternateProtocol(canonical_port_pair));
|
| @@ -423,7 +498,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, CanonicalAboveThreshold) {
|
| HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 0.03);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol,
|
| canonical_protocol.probability);
|
| EXPECT_TRUE(HasAlternateProtocol(canonical_port_pair));
|
| @@ -436,11 +511,11 @@ TEST_F(AlternateProtocolServerPropertiesTest, ClearCanonical) {
|
|
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol,
|
| canonical_protocol.probability);
|
|
|
| - impl_.ClearAlternateProtocol(canonical_port_pair);
|
| + impl_.ClearAlternateProtocols(canonical_port_pair);
|
| EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| }
|
|
|
| @@ -450,28 +525,15 @@ TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken) {
|
|
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| - canonical_protocol.protocol,
|
| - canonical_protocol.probability);
|
| -
|
| - impl_.SetBrokenAlternateProtocol(canonical_port_pair);
|
| - EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
|
| -}
|
| -
|
| -TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken2) {
|
| - HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
|
| - HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
|
| -
|
| - AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
|
| -
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol,
|
| canonical_protocol.probability);
|
|
|
| - impl_.SetBrokenAlternateProtocol(test_host_port_pair);
|
| - AlternateProtocolInfo alternate =
|
| - impl_.GetAlternateProtocol(test_host_port_pair);
|
| - EXPECT_TRUE(alternate.is_broken);
|
| + impl_.SetBrokenAlternateProtocol(test_host_port_pair, canonical_protocol);
|
| + AlternateProtocols alternates =
|
| + impl_.GetAlternateProtocols(test_host_port_pair);
|
| + ASSERT_EQ(1u, alternates.size());
|
| + EXPECT_TRUE(alternates[0].is_broken);
|
| }
|
|
|
| TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
|
| @@ -480,7 +542,7 @@ TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
|
|
|
| AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
|
|
|
| - impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| + impl_.AddAlternateProtocol(canonical_port_pair, canonical_protocol.port,
|
| canonical_protocol.protocol,
|
| canonical_protocol.probability);
|
|
|
|
|