[GCM] fixing G-settings initialization from an empty store

google_apis/gcm/engine/gservices_settings_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string_number_conversions.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/registration_info.h"
 #include "google_apis/gcm/gcm_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
-const int64 kAlternativeCheckinInterval = 2000LL;
+const int64 kAlternativeCheckinInterval = 16 * 60 * 60;
 const char kAlternativeCheckinURL[] = "http://alternative.url/checkin";
 const char kAlternativeMCSHostname[] = "http://alternative.gcm.host";
 const int kAlternativeMCSSecurePort = 443;
 const char kAlternativeRegistrationURL[] =
     "http://alternative.url/registration";
 
 const int64 kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
 const char kDefaultCheckinURL[] = "https://android.clients.google.com/checkin";
 const char kDefaultMCSHostname[] = "https://mtalk.google.com";
 const int kDefaultMCSSecurePort = 5228;
@@ skipping 88 matching lines @@
   GServicesSettings& settings() {
     return gserivces_settings_;
   }
 
   const std::map<std::string, std::string>& alternative_settings() {
     return alternative_settings_;
   }
 
   FakeGCMStore& gcm_store() { return gcm_store_; }
 
+  std::map<std::string, std::string> alternative_settings_;
+
  private:
   FakeGCMStore gcm_store_;
   GServicesSettings gserivces_settings_;
-  std::map<std::string, std::string> alternative_settings_;
 };
 
 GServicesSettingsTest::GServicesSettingsTest()
     : gserivces_settings_(&gcm_store_) {
 }
 
 GServicesSettingsTest::~GServicesSettingsTest() {}
 
 void GServicesSettingsTest::SetUp() {
   alternative_settings_["checkin_interval"] =
@@ skipping 31 matching lines @@
     setting->set_value(iter->second);
   }
 }
 
 // Verifies default values of the G-services settings and settings digest.
 TEST_F(GServicesSettingsTest, DefaultSettingsAndDigest) {
   CheckAllSetToDefault();
   EXPECT_EQ(std::string(), settings().digest());
 }
 
+// Verifies that settings are not updated when load result is empty.
+TEST_F(GServicesSettingsTest, UpdateFromEmptyLoadResult) {
+  GCMStore::LoadResult result;
+  result.gservices_digest = "digest_value";
+  settings().UpdateFromLoadResult(result);
+
+  CheckAllSetToDefault();
+  EXPECT_EQ(std::string(), settings().digest());
+}
+
+// Verifies that settings are not updated when one of them is missing.
+TEST_F(GServicesSettingsTest, UpdateFromLoadResultWithSettingMissing) {
+  GCMStore::LoadResult result;
+  result.gservices_settings = alternative_settings();
+  result.gservices_digest = "digest_value";
+  result.gservices_settings.erase("gcm_hostname");
+  settings().UpdateFromLoadResult(result);
+
+  CheckAllSetToDefault();
+  EXPECT_EQ(std::string(), settings().digest());
+}
+
 // Verifies that the settings are set correctly based on the load result.
 TEST_F(GServicesSettingsTest, UpdateFromLoadResult) {
   GCMStore::LoadResult result;
   result.gservices_settings = alternative_settings();
   result.gservices_digest = "digest_value";
   settings().UpdateFromLoadResult(result);
 
   CheckAllSetToAlternative();
   EXPECT_EQ("digest_value", settings().digest());
 }
 
 // Verifies that the settings are set correctly after parsing a checkin
 // response.
 TEST_F(GServicesSettingsTest, UpdateFromCheckinResponse) {
   checkin_proto::AndroidCheckinResponse checkin_response;
 
   checkin_response.set_digest("digest_value");
   SetWithAlternativeSettings(checkin_response);
 
   settings().UpdateFromCheckinResponse(checkin_response);
   EXPECT_TRUE(gcm_store().settings_saved());
 
   CheckAllSetToAlternative();
   EXPECT_EQ("digest_value", settings().digest());
 }
 
+// Verifies that the checkin interval is updated to minimum of the original

[Nicolas Zea, 2014/04/28 18:23:49]

"of the original" -> "if the original"

[fgorski, 2014/04/28 20:46:19]

Done.

+// value is less than minimum.
+TEST_F(GServicesSettingsTest, UpdateFromCheckinResponseMinimumCheckinInterval) {
+  checkin_proto::AndroidCheckinResponse checkin_response;
+
+  checkin_response.set_digest("digest_value");
+  // setting the checkin interval to less than minimum.

[jianli, 2014/04/28 18:15:44]

nit: 1st letter should be upper case.

[fgorski, 2014/04/28 20:46:19]

Done.

+  alternative_settings_["checkin_interval"] = base::IntToString(3600);
+  SetWithAlternativeSettings(checkin_response);
+
+  settings().UpdateFromCheckinResponse(checkin_response);
+  EXPECT_TRUE(gcm_store().settings_saved());
+
+  EXPECT_EQ(12 * 60 * 60LL, settings().checkin_interval());

[jianli, 2014/04/28 18:15:44]

Can we get this minimum value from GServicesSettings?

[fgorski, 2014/04/28 20:46:19]

Done.

+  EXPECT_EQ("digest_value", settings().digest());
+}
+
+// Verifies that settings are not updated when one of them is missing.
+TEST_F(GServicesSettingsTest, UpdateFromCheckinResponseWithSettingMissing) {
+  checkin_proto::AndroidCheckinResponse checkin_response;
+
+  checkin_response.set_digest("digest_value");
+  alternative_settings_.erase("gcm_hostname");
+  SetWithAlternativeSettings(checkin_response);
+
+  settings().UpdateFromCheckinResponse(checkin_response);
+  EXPECT_FALSE(gcm_store().settings_saved());
+
+  CheckAllSetToDefault();
+  EXPECT_EQ(std::string(), settings().digest());
+}
+
+

[Nicolas Zea, 2014/04/28 18:23:49]

remove extra newline

[fgorski, 2014/04/28 20:46:19]

Done.

 // Verifies that no update is done, when a checkin response misses digest.
 TEST_F(GServicesSettingsTest, UpdateFromCheckinResponseNoDigest) {
   checkin_proto::AndroidCheckinResponse checkin_response;
 
   SetWithAlternativeSettings(checkin_response);
   settings().UpdateFromCheckinResponse(checkin_response);
   EXPECT_FALSE(gcm_store().settings_saved());
 
   CheckAllSetToDefault();
   EXPECT_EQ(std::string(), settings().digest());
@@ skipping 10 matching lines @@
   checkin_response.set_digest("old_digest");
   SetWithAlternativeSettings(checkin_response);
   settings().UpdateFromCheckinResponse(checkin_response);
   EXPECT_FALSE(gcm_store().settings_saved());
 
   CheckAllSetToAlternative();
   EXPECT_EQ("old_digest", settings().digest());
 }
 
 }  // namespace gcm