[Sync] Rework unit tests for ChromeInvalidationClient

sync/notifier/registration_manager_unittest.cc

 // Copyright (c) 2012 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 "sync/notifier/registration_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <deque>
@@ skipping 154 matching lines @@
          ++it) {
       fake_invalidation_client_.LoseRegistration(*it);
       fake_registration_manager_.DisableId(*it);
     }
   }
 
   // Used by MarkRegistrationLostBackoff* tests.
   void RunBackoffTest(double jitter) {
     fake_registration_manager_.SetJitter(jitter);
     ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount);
-    fake_registration_manager_.SetRegisteredIds(ids);
+    fake_registration_manager_.UpdateRegisteredIds(ids);
 
     // Lose some ids.
     ObjectIdSet lost_ids = GetSequenceOfIds(2);
     LoseRegistrations(lost_ids);
     ExpectPendingRegistrations(
         lost_ids, 0.0,
         fake_registration_manager_.GetPendingRegistrationsForTest());
 
     // Trigger another failure to start delaying.
     fake_registration_manager_.FirePendingRegistrationsForTest();
@@ skipping 37 matching lines @@
   FakeInvalidationClient fake_invalidation_client_;
   FakeRegistrationManager fake_registration_manager_;
 
  private:
   // Needed by timers in RegistrationManager.
   MessageLoop message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationManagerTest);
 };
 
-// Basic test of SetRegisteredIds to make sure we properly register new IDs and
-// unregister any IDs no longer in the set.
-TEST_F(RegistrationManagerTest, SetRegisteredIds) {
+// Basic test of UpdateRegisteredIds to make sure we properly register
+// new IDs and unregister any IDs no longer in the set.
+TEST_F(RegistrationManagerTest, UpdateRegisteredIds) {
   ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount - 1);
 
   EXPECT_TRUE(fake_registration_manager_.GetRegisteredIdsForTest().empty());
   EXPECT_TRUE(fake_invalidation_client_.GetRegisteredIdsForTest().empty());
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   EXPECT_EQ(ids, fake_registration_manager_.GetRegisteredIdsForTest());
   EXPECT_EQ(ids, fake_invalidation_client_.GetRegisteredIdsForTest());
 
   ids.insert(GetIdForIndex(kObjectIdsCount - 1));
   ids.erase(GetIdForIndex(kObjectIdsCount - 2));
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   EXPECT_EQ(ids, fake_registration_manager_.GetRegisteredIdsForTest());
   EXPECT_EQ(ids, fake_invalidation_client_.GetRegisteredIdsForTest());
 }
 
 int GetRoundedBackoff(double retry_interval, double jitter) {
   const double kInitialRetryInterval = 3.0;
   const double kMinRetryInterval = 2.0;
   const double kMaxRetryInterval = 20.0;
   const double kBackoffExponent = 2.0;
   const double kMaxJitter = 0.5;
@@ skipping 26 matching lines @@
   // Test ceiling.
   EXPECT_EQ(19, GetRoundedBackoff(13.0, -1.0));
   EXPECT_EQ(20, GetRoundedBackoff(13.0,  0.0));
   EXPECT_EQ(20, GetRoundedBackoff(13.0, +1.0));
 }
 
 // Losing a registration should queue automatic re-registration.
 TEST_F(RegistrationManagerTest, MarkRegistrationLost) {
   ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount);
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   EXPECT_TRUE(
       fake_registration_manager_.GetPendingRegistrationsForTest().empty());
 
   // Lose some ids.
   ObjectIdSet lost_ids = GetSequenceOfIds(3);
   ObjectIdSet non_lost_ids = GetSequenceOfIdsStartingAt(3, kObjectIdsCount - 3);
   LoseRegistrations(lost_ids);
   ExpectPendingRegistrations(
       lost_ids, 0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
@@ skipping 12 matching lines @@
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffMid) {
   RunBackoffTest(0.0);
 }
 
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffHigh) {
   RunBackoffTest(+1.0);
 }
 
 // Exponential backoff on lost registrations should be reset to zero if
-// SetRegisteredIds is called.
+// UpdateRegisteredIds is called.
 TEST_F(RegistrationManagerTest, MarkRegistrationLostBackoffReset) {
   ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount);
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
 
   // Lose some ids.
   ObjectIdSet lost_ids = GetSequenceOfIds(2);
   LoseRegistrations(lost_ids);
   ExpectPendingRegistrations(
       lost_ids, 0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 
   // Trigger another failure to start delaying.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   LoseRegistrations(lost_ids);
   double expected_delay =
       RegistrationManager::kInitialRegistrationDelaySeconds;
   ExpectPendingRegistrations(
       lost_ids, expected_delay,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 
   // Set ids again.
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   ExpectPendingRegistrations(
       ObjectIdSet(),
       0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 }
 
 TEST_F(RegistrationManagerTest, MarkAllRegistrationsLost) {
   ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount);
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
 
   fake_invalidation_client_.LoseAllRegistrations();
   fake_registration_manager_.MarkAllRegistrationsLost();
 
   EXPECT_TRUE(fake_registration_manager_.GetRegisteredIdsForTest().empty());
   EXPECT_TRUE(fake_invalidation_client_.GetRegisteredIdsForTest().empty());
 
   ExpectPendingRegistrations(
       ids, 0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 
   // Trigger another failure to start delaying.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   fake_invalidation_client_.LoseAllRegistrations();
   fake_registration_manager_.MarkAllRegistrationsLost();
   double expected_delay =
       RegistrationManager::kInitialRegistrationDelaySeconds;
   ExpectPendingRegistrations(
       ids, expected_delay,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 
   // Pretend we waited long enough to re-register.
   fake_registration_manager_.FirePendingRegistrationsForTest();
   EXPECT_EQ(ids, fake_registration_manager_.GetRegisteredIdsForTest());
   EXPECT_EQ(ids, fake_invalidation_client_.GetRegisteredIdsForTest());
 }
 
-// IDs that are disabled should not be re-registered by SetRegisteredIds or
+// IDs that are disabled should not be re-registered by UpdateRegisteredIds or
 // automatic re-registration if that registration is lost.
 TEST_F(RegistrationManagerTest, DisableId) {
   ObjectIdSet ids = GetSequenceOfIds(kObjectIdsCount);
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   EXPECT_TRUE(
       fake_registration_manager_.GetPendingRegistrationsForTest().empty());
 
   // Disable some ids.
   ObjectIdSet disabled_ids = GetSequenceOfIds(3);
   ObjectIdSet enabled_ids = GetSequenceOfIdsStartingAt(3, kObjectIdsCount - 3);
   DisableIds(disabled_ids);
   ExpectPendingRegistrations(
       ObjectIdSet(),
       0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
   EXPECT_EQ(enabled_ids, fake_registration_manager_.GetRegisteredIdsForTest());
   EXPECT_EQ(enabled_ids, fake_invalidation_client_.GetRegisteredIdsForTest());
 
-  fake_registration_manager_.SetRegisteredIds(ids);
+  fake_registration_manager_.UpdateRegisteredIds(ids);
   EXPECT_EQ(enabled_ids, fake_registration_manager_.GetRegisteredIdsForTest());
 
   fake_registration_manager_.MarkRegistrationLost(
       *disabled_ids.begin());
   ExpectPendingRegistrations(
       ObjectIdSet(),
       0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 
   fake_registration_manager_.MarkAllRegistrationsLost();
   ExpectPendingRegistrations(
       enabled_ids, 0.0,
       fake_registration_manager_.GetPendingRegistrationsForTest());
 }
 
 }  // namespace
 }  // namespace syncer