SPDY - persist SPDY settings.

net/http/http_server_properties_impl_unittest.cc

Index: net/http/http_server_properties_impl_unittest.cc
===================================================================
--- net/http/http_server_properties_impl_unittest.cc	(revision 127896)
+++ net/http/http_server_properties_impl_unittest.cc	(working copy)
@@ -290,148 +290,121 @@
   EXPECT_TRUE(impl_.GetSpdySettings(spdy_server_google).empty());
 
   // Check by initializing with www.google.com:443 spdy server settings.
-  spdy::SpdySettings spdy_settings;
-  spdy::SettingsFlagsAndId spdy_setting(spdy::SETTINGS_FLAG_PERSISTED, 1234);
-  spdy_settings.push_back(std::make_pair(spdy_setting, 31337));
-  spdy_settings_map[spdy_server_google] = spdy_settings;
+  spdy::SettingsMap settings_map;
+  const uint32 id = 1234;
+  const uint8 flags = spdy::SETTINGS_FLAG_PERSISTED;
+  const uint32 value = 31337;
+  spdy::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);
-  spdy::SpdySettings spdy_settings2 = impl_.GetSpdySettings(spdy_server_google);
-  ASSERT_EQ(1U, spdy_settings2.size());
-  spdy::SpdySetting spdy_setting2 = spdy_settings2.front();
-  spdy::SettingsFlagsAndId id2_ret(spdy_setting2.first);
-  EXPECT_EQ(1234U, id2_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id2_ret.flags());
-  EXPECT_EQ(31337U, spdy_settings2.front().second);
-}
 
-TEST_F(SpdySettingsServerPropertiesTest, SetSpdySettings) {

[Ryan Hamilton, 2012/03/21 16:24:41]

What happened to this test?  Is it now redundant?

[ramant (doing other things), 2012/03/23 04:11:25]

It is redundant. tx.

-  HostPortPair spdy_server_empty("", 443);
-  spdy::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);
-  spdy::SpdySettings spdy_settings1;
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
-  spdy_settings1.push_back(std::make_pair(id1, 31337));
-  EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_google, spdy_settings1));
-  spdy::SpdySettings spdy_settings1_ret =
+  const spdy::SettingsMap& settings_map2 =
       impl_.GetSpdySettings(spdy_server_google);
-  ASSERT_EQ(1U, spdy_settings1_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::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);
-  spdy::SpdySettings spdy_settings2;
-  spdy::SettingsFlagsAndId id2(0, 5678);
-  spdy_settings2.push_back(std::make_pair(id2, 62667));
-  EXPECT_FALSE(impl_.SetSpdySettings(spdy_server_mail, spdy_settings2));
-  spdy::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);
-  spdy::SpdySettings spdy_settings3;
-  spdy::SettingsFlagsAndId id3(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 9012);
-  spdy_settings3.push_back(std::make_pair(id3, 93997));
-  EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_docs, spdy_settings3));
-  spdy::SpdySettings spdy_settings3_ret =
-      impl_.GetSpdySettings(spdy_server_docs);
-  ASSERT_EQ(1U, spdy_settings3_ret.size());
-  spdy::SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
-  spdy::SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
-  EXPECT_EQ(9012U, id3_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id3_ret.flags());
-  EXPECT_EQ(93997U, spdy_setting3_ret.second);
+  ASSERT_EQ(1U, settings_map2.size());
+  spdy::SettingsMap::const_iterator it = settings_map2.find(id);
+  EXPECT_NE(it, settings_map2.end());
+  spdy::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);
-  spdy::SpdySettings spdy_settings0 = impl_.GetSpdySettings(spdy_server_empty);
-  EXPECT_EQ(0U, spdy_settings0.size());    // Returns kEmptySpdySettings
+  const spdy::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);
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
-  EXPECT_TRUE(impl_.SetSpdySetting(
-      spdy_server_google, std::make_pair(id1, 31337)));
-  spdy::SpdySettings spdy_settings1_ret =
+  const uint32 id1 = 1234;
+  const uint8 flags1 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value1 = 31337;
+  spdy::SettingsFlagsAndValue flags_and_value1(flags1, value1);
+  EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags_and_value1));
+  // Check the values.
+  const spdy::SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
-  ASSERT_EQ(1U, spdy_settings1_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting1_ret.second);
+  ASSERT_EQ(1U, settings_map1_ret.size());
+  spdy::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+  EXPECT_NE(it1_ret, settings_map1_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+  EXPECT_EQ(spdy::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);
-  spdy::SettingsFlagsAndId id2(0, 5678);
-  EXPECT_FALSE(impl_.SetSpdySetting(
-      spdy_server_mail, std::make_pair(id2, 62667)));
-  spdy::SpdySettings spdy_settings2_ret =
+  const uint32 id2 = 5678;
+  const uint8 flags2 = 0;
+  const uint32 value2 = 62667;
+  spdy::SettingsFlagsAndValue flags_and_value2(flags2, value2);
+  EXPECT_FALSE(impl_.SetSpdySetting(spdy_server_mail, id2, flags_and_value2));
+  const spdy::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);
-  spdy::SettingsFlagsAndId id3(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 9012);
-  EXPECT_TRUE(impl_.SetSpdySetting(
-      spdy_server_docs, std::make_pair(id3, 93997)));
-  spdy::SpdySettings spdy_settings3_ret =
+  const uint32 id3 = 9012;
+  const uint8 flags3 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value3 = 93997;
+  spdy::SettingsFlagsAndValue flags_and_value3(flags3, value3);
+  EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags_and_value3));
+  // Check the values.
+  const spdy::SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
-  ASSERT_EQ(1U, spdy_settings3_ret.size());
-  spdy::SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
-  spdy::SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
-  EXPECT_EQ(9012U, id3_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id3_ret.flags());
-  EXPECT_EQ(93997U, spdy_setting3_ret.second);
-  // Check data for www.google.com:443.
-  spdy::SpdySettings spdy_settings4_ret =
+  ASSERT_EQ(1U, settings_map3_ret.size());
+  spdy::SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
+  EXPECT_NE(it3_ret, settings_map3_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
+  EXPECT_EQ(spdy::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 spdy::SettingsMap& settings_map4_ret =
       impl_.GetSpdySettings(spdy_server_google);
-  ASSERT_EQ(1U, spdy_settings4_ret.size());
-  spdy::SpdySetting spdy_setting4_ret = spdy_settings4_ret.front();
-  spdy::SettingsFlagsAndId id4_ret(spdy_setting4_ret.first);
-  EXPECT_EQ(1234U, id4_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id4_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting4_ret.second);
+  ASSERT_EQ(1U, settings_map4_ret.size());
+  spdy::SettingsMap::const_iterator it4_ret = settings_map4_ret.find(id1);
+  EXPECT_NE(it4_ret, settings_map4_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value4_ret = it4_ret->second;
+  EXPECT_EQ(spdy::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);
-  spdy::SpdySettings spdy_settings1;
-  spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 1234);
-  spdy_settings1.push_back(std::make_pair(id1, 31337));
-  EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_google, spdy_settings1));
-  spdy::SpdySettings spdy_settings1_ret =
+  const uint32 id1 = 1234;
+  const uint8 flags1 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value1 = 31337;
+  spdy::SettingsFlagsAndValue flags_and_value1(flags1, value1);
+  EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags_and_value1));
+  // Check the values.
+  const spdy::SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
-  ASSERT_EQ(1U, spdy_settings1_ret.size());
-  spdy::SpdySetting spdy_setting1_ret = spdy_settings1_ret.front();
-  spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
-  EXPECT_EQ(1234U, id1_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
-  EXPECT_EQ(31337U, spdy_setting1_ret.second);
+  ASSERT_EQ(1U, settings_map1_ret.size());
+  spdy::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
+  EXPECT_NE(it1_ret, settings_map1_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
+  EXPECT_EQ(spdy::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);
-  spdy::SpdySettings spdy_settings3;
-  spdy::SettingsFlagsAndId id3(spdy::SETTINGS_FLAG_PLEASE_PERSIST, 9012);
-  spdy_settings3.push_back(std::make_pair(id3, 93997));
-  EXPECT_TRUE(impl_.SetSpdySettings(spdy_server_docs, spdy_settings3));
-  spdy::SpdySettings spdy_settings3_ret =
+  const uint32 id3 = 9012;
+  const uint8 flags3 = spdy::SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32 value3 = 93997;
+  spdy::SettingsFlagsAndValue flags_and_value3(flags3, value3);
+  EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags_and_value3));
+  // Check the values.
+  const spdy::SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
-  ASSERT_EQ(1U, spdy_settings3_ret.size());
-  spdy::SpdySetting spdy_setting3_ret = spdy_settings3_ret.front();
-  spdy::SettingsFlagsAndId id3_ret(spdy_setting3_ret.first);
-  EXPECT_EQ(9012U, id3_ret.id());
-  EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id3_ret.flags());
-  EXPECT_EQ(93997U, spdy_setting3_ret.second);
+  ASSERT_EQ(1U, settings_map3_ret.size());
+  spdy::SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
+  EXPECT_NE(it3_ret, settings_map3_ret.end());
+  spdy::SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
+  EXPECT_EQ(spdy::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());