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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_server_properties_impl_unittest.cc

Issue 9802003: SPDY - persist SPDY settings. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/http/http_server_properties_impl.cc ('k') | net/spdy/spdy_framer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_server_properties_impl_unittest.cc
===================================================================
--- net/http/http_server_properties_impl_unittest.cc (revision 128731)
+++ net/http/http_server_properties_impl_unittest.cc (working copy)
@@ -188,10 +188,8 @@
TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
HostPortPair test_host_port_pair("foo", 80);
- EXPECT_FALSE(
- impl_.HasAlternateProtocol(test_host_port_pair));
- impl_.SetAlternateProtocol(
- test_host_port_pair, 443, NPN_SPDY_1);
+ EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair));
+ impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_1);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
const PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
@@ -206,8 +204,7 @@
HostPortPair test_host_port_pair1("foo1", 80);
impl_.SetBrokenAlternateProtocol(test_host_port_pair1);
HostPortPair test_host_port_pair2("foo2", 80);
- impl_.SetAlternateProtocol(
- test_host_port_pair2, 443, NPN_SPDY_1);
+ impl_.SetAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_1);
AlternateProtocolMap alternate_protocol_map;
PortAlternateProtocolPair port_alternate_protocol_pair;
@@ -254,16 +251,14 @@
// Verify the forced protocol.
HostPortPair test_host_port_pair("foo", 80);
- EXPECT_TRUE(
- impl_.HasAlternateProtocol(test_host_port_pair));
+ EXPECT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
PortAlternateProtocolPair alternate =
impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(default_protocol.port, alternate.port);
EXPECT_EQ(default_protocol.protocol, alternate.protocol);
// Verify the real protocol overrides the forced protocol.
- impl_.SetAlternateProtocol(
- test_host_port_pair, 443, NPN_SPDY_1);
+ impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_1);
ASSERT_TRUE(impl_.HasAlternateProtocol(test_host_port_pair));
alternate = impl_.GetAlternateProtocol(test_host_port_pair);
EXPECT_EQ(443, alternate.port);
@@ -275,8 +270,7 @@
// Verify the forced protocol is off.
HostPortPair test_host_port_pair2("bar", 80);
- EXPECT_FALSE(
- impl_.HasAlternateProtocol(test_host_port_pair2));
+ EXPECT_FALSE(impl_.HasAlternateProtocol(test_host_port_pair2));
}
typedef HttpServerPropertiesImplTest SpdySettingsServerPropertiesTest;
@@ -290,148 +284,115 @@
EXPECT_TRUE(impl_.GetSpdySettings(spdy_server_google).empty());
// Check by initializing with www.google.com:443 spdy server settings.
- SpdySettings spdy_settings;
- SettingsFlagsAndId spdy_setting(SETTINGS_FLAG_PERSISTED, 1234);
- spdy_settings.push_back(std::make_pair(spdy_setting, 31337));
- spdy_settings_map[spdy_server_google] = spdy_settings;
+ SettingsMap settings_map;
+ const SpdySettingsIds id = SETTINGS_UPLOAD_BANDWIDTH;
+ const SpdySettingsFlags flags = SETTINGS_FLAG_PERSISTED;
+ const uint32 value = 31337;
+ SettingsFlagsAndValue flags_and_value(flags, value);
+ settings_map[id] = flags_and_value;
+ spdy_settings_map[spdy_server_google] = settings_map;
impl_.InitializeSpdySettingsServers(&spdy_settings_map);
- SpdySettings spdy_settings2 = impl_.GetSpdySettings(spdy_server_google);
- ASSERT_EQ(1U, spdy_settings2.size());
- SpdySetting spdy_setting2 = spdy_settings2.front();
- SettingsFlagsAndId id2_ret(spdy_setting2.first);
- EXPECT_EQ(1234U, id2_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id2_ret.flags());
- EXPECT_EQ(31337U, spdy_settings2.front().second);
-}
-TEST_F(SpdySettingsServerPropertiesTest, SetSpdySettings) {
- HostPortPair spdy_server_empty("", 443);
- SpdySettings spdy_settings0 = impl_.GetSpdySettings(spdy_server_empty);
- EXPECT_EQ(0U, spdy_settings0.size()); // Returns kEmptySpdySettings
-
- // Add www.google.com:443 as persisting.
- HostPortPair spdy_server_google("www.google.com", 443);
- SpdySettings spdy_settings1;
- SettingsFlagsAndId id1(SETTINGS_FLAG_PLEASE_PERSIST, 1234);
- spdy_settings1.push_back(std::make_pair(id1, 31337));
- EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_google, spdy_settings1));
- SpdySettings spdy_settings1_ret =
- impl_.GetSpdySettings(spdy_server_google);
- ASSERT_EQ(1U, spdy_settings1_ret.size());
- SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
- SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
- EXPECT_EQ(1234U, id1_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id1_ret.flags());
- EXPECT_EQ(31337U, spdy_setting1_ret.second);
-
- // Add mail.google.com:443 as not persisting.
- HostPortPair spdy_server_mail("mail.google.com", 443);
- SpdySettings spdy_settings2;
- SettingsFlagsAndId id2(0, 5678);
- spdy_settings2.push_back(std::make_pair(id2, 62667));
- EXPECT_FALSE(impl_.SetSpdySettings(spdy_server_mail, spdy_settings2));
- SpdySettings spdy_settings2_ret =
- impl_.GetSpdySettings(spdy_server_mail);
- EXPECT_EQ(0U, spdy_settings2_ret.size()); // Returns kEmptySpdySettings
-
- // Add docs.google.com:443 as persisting
- HostPortPair spdy_server_docs("docs.google.com", 443);
- SpdySettings spdy_settings3;
- SettingsFlagsAndId id3(SETTINGS_FLAG_PLEASE_PERSIST, 9012);
- spdy_settings3.push_back(std::make_pair(id3, 93997));
- EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_docs, spdy_settings3));
- SpdySettings spdy_settings3_ret =
- impl_.GetSpdySettings(spdy_server_docs);
- ASSERT_EQ(1U, spdy_settings3_ret.size());
- SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
- SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
- EXPECT_EQ(9012U, id3_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id3_ret.flags());
- EXPECT_EQ(93997U, spdy_setting3_ret.second);
+ const SettingsMap& settings_map2 = impl_.GetSpdySettings(spdy_server_google);
+ ASSERT_EQ(1U, settings_map2.size());
+ SettingsMap::const_iterator it = settings_map2.find(id);
+ EXPECT_TRUE(it != settings_map2.end());
+ SettingsFlagsAndValue flags_and_value2 = it->second;
+ EXPECT_EQ(flags, flags_and_value2.first);
+ EXPECT_EQ(value, flags_and_value2.second);
}
TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {
HostPortPair spdy_server_empty("", 443);
- SpdySettings spdy_settings0 = impl_.GetSpdySettings(spdy_server_empty);
- EXPECT_EQ(0U, spdy_settings0.size()); // Returns kEmptySpdySettings
+ 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);
- SettingsFlagsAndId id1(SETTINGS_FLAG_PLEASE_PERSIST, 1234);
- EXPECT_TRUE(impl_.SetSpdySetting(
- spdy_server_google, std::make_pair(id1, 31337)));
- SpdySettings spdy_settings1_ret =
+ const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
+ const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
+ const uint32 value1 = 31337;
+ EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
+ // Check the values.
+ const SettingsMap& settings_map1_ret =
impl_.GetSpdySettings(spdy_server_google);
- ASSERT_EQ(1U, spdy_settings1_ret.size());
- SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
- SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
- EXPECT_EQ(1234U, id1_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id1_ret.flags());
- EXPECT_EQ(31337U, spdy_setting1_ret.second);
+ ASSERT_EQ(1U, settings_map1_ret.size());
+ SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+ EXPECT_TRUE(it1_ret != settings_map1_ret.end());
+ SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+ EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
+ EXPECT_EQ(value1, flags_and_value1_ret.second);
// Add mail.google.com:443 as not persisting.
HostPortPair spdy_server_mail("mail.google.com", 443);
- SettingsFlagsAndId id2(0, 5678);
- EXPECT_FALSE(impl_.SetSpdySetting(
- spdy_server_mail, std::make_pair(id2, 62667)));
- SpdySettings spdy_settings2_ret =
+ const SpdySettingsIds id2 = SETTINGS_DOWNLOAD_BANDWIDTH;
+ const SpdySettingsFlags flags2 = SETTINGS_FLAG_NONE;
+ const uint32 value2 = 62667;
+ EXPECT_FALSE(impl_.SetSpdySetting(spdy_server_mail, id2, flags2, value2));
+ const SettingsMap& settings_map2_ret =
impl_.GetSpdySettings(spdy_server_mail);
- EXPECT_EQ(0U, spdy_settings2_ret.size()); // Returns kEmptySpdySettings
+ EXPECT_EQ(0U, settings_map2_ret.size()); // Returns kEmptySettingsMap.
// Add docs.google.com:443 as persisting
HostPortPair spdy_server_docs("docs.google.com", 443);
- SettingsFlagsAndId id3(SETTINGS_FLAG_PLEASE_PERSIST, 9012);
- EXPECT_TRUE(impl_.SetSpdySetting(
- spdy_server_docs, std::make_pair(id3, 93997)));
- SpdySettings spdy_settings3_ret =
+ const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
+ const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
+ const uint32 value3 = 93997;
+ SettingsFlagsAndValue flags_and_value3(flags3, value3);
+ EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
+ // Check the values.
+ const SettingsMap& settings_map3_ret =
impl_.GetSpdySettings(spdy_server_docs);
- ASSERT_EQ(1U, spdy_settings3_ret.size());
- SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
- SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
- EXPECT_EQ(9012U, id3_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id3_ret.flags());
- EXPECT_EQ(93997U, spdy_setting3_ret.second);
- // Check data for www.google.com:443.
- SpdySettings spdy_settings4_ret =
+ ASSERT_EQ(1U, settings_map3_ret.size());
+ SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
+ EXPECT_TRUE(it3_ret != settings_map3_ret.end());
+ SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
+ EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value3_ret.first);
+ EXPECT_EQ(value3, flags_and_value3_ret.second);
+
+ // Check data for www.google.com:443 (id1).
+ const SettingsMap& settings_map4_ret =
impl_.GetSpdySettings(spdy_server_google);
- ASSERT_EQ(1U, spdy_settings4_ret.size());
- SpdySetting spdy_setting4_ret = spdy_settings4_ret.front();
- SettingsFlagsAndId id4_ret(spdy_setting4_ret.first);
- EXPECT_EQ(1234U, id4_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id4_ret.flags());
- EXPECT_EQ(31337U, spdy_setting4_ret.second);
+ ASSERT_EQ(1U, settings_map4_ret.size());
+ SettingsMap::const_iterator it4_ret = settings_map4_ret.find(id1);
+ EXPECT_TRUE(it4_ret != settings_map4_ret.end());
+ SettingsFlagsAndValue flags_and_value4_ret = it4_ret->second;
+ EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value4_ret.first);
+ EXPECT_EQ(value1, flags_and_value1_ret.second);
}
TEST_F(SpdySettingsServerPropertiesTest, Clear) {
// Add www.google.com:443 as persisting.
HostPortPair spdy_server_google("www.google.com", 443);
- SpdySettings spdy_settings1;
- SettingsFlagsAndId id1(SETTINGS_FLAG_PLEASE_PERSIST, 1234);
- spdy_settings1.push_back(std::make_pair(id1, 31337));
- EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_google, spdy_settings1));
- SpdySettings spdy_settings1_ret =
+ const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
+ const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
+ const uint32 value1 = 31337;
+ EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
+ // Check the values.
+ const SettingsMap& settings_map1_ret =
impl_.GetSpdySettings(spdy_server_google);
- ASSERT_EQ(1U, spdy_settings1_ret.size());
- SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
- SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
- EXPECT_EQ(1234U, id1_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id1_ret.flags());
- EXPECT_EQ(31337U, spdy_setting1_ret.second);
+ ASSERT_EQ(1U, settings_map1_ret.size());
+ SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+ EXPECT_TRUE(it1_ret != settings_map1_ret.end());
+ SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+ EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
+ EXPECT_EQ(value1, flags_and_value1_ret.second);
// Add docs.google.com:443 as persisting
HostPortPair spdy_server_docs("docs.google.com", 443);
- SpdySettings spdy_settings3;
- SettingsFlagsAndId id3(SETTINGS_FLAG_PLEASE_PERSIST, 9012);
- spdy_settings3.push_back(std::make_pair(id3, 93997));
- EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_docs, spdy_settings3));
- SpdySettings spdy_settings3_ret =
+ const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
+ const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
+ const uint32 value3 = 93997;
+ EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
+ // Check the values.
+ const SettingsMap& settings_map3_ret =
impl_.GetSpdySettings(spdy_server_docs);
- ASSERT_EQ(1U, spdy_settings3_ret.size());
- SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
- SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
- EXPECT_EQ(9012U, id3_ret.id());
- EXPECT_EQ(SETTINGS_FLAG_PERSISTED, id3_ret.flags());
- EXPECT_EQ(93997U, spdy_setting3_ret.second);
+ ASSERT_EQ(1U, settings_map3_ret.size());
+ SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
+ EXPECT_TRUE(it3_ret != settings_map3_ret.end());
+ SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
+ EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value3_ret.first);
+ EXPECT_EQ(value3, flags_and_value3_ret.second);
impl_.Clear();
EXPECT_EQ(0U, impl_.GetSpdySettings(spdy_server_google).size());
« no previous file with comments | « net/http/http_server_properties_impl.cc ('k') | net/spdy/spdy_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698