diff options
Diffstat (limited to 'sync/notifier/invalidation_notifier_unittest.cc')
| -rw-r--r-- | sync/notifier/invalidation_notifier_unittest.cc | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc index 4a07678..b0b64c7 100644 --- a/sync/notifier/invalidation_notifier_unittest.cc +++ b/sync/notifier/invalidation_notifier_unittest.cc @@ -50,10 +50,11 @@ class InvalidationNotifierTest : public testing::Test { initial_invalidation_state, MakeWeakHandle(mock_tracker_.AsWeakPtr()), "fake_client_info")); + invalidation_notifier_->AddObserver(&mock_observer_); } void ResetNotifier() { - invalidation_notifier_->UpdateRegisteredIds(&mock_observer_, ObjectIdSet()); + invalidation_notifier_->RemoveObserver(&mock_observer_); // Stopping the invalidation notifier stops its scheduler, which deletes any // pending tasks without running them. Some tasks "run and delete" another // task, so they must be run in order to avoid leaking the inner task. @@ -74,16 +75,15 @@ TEST_F(InvalidationNotifierTest, Basic) { CreateAndObserveNotifier("fake_state"); InSequence dummy; - ModelTypeSet models(PREFERENCES, BOOKMARKS, AUTOFILL); - invalidation_notifier_->UpdateRegisteredIds( - &mock_observer_, ModelTypeSetToObjectIdSet(models)); + ModelTypePayloadMap type_payloads; + type_payloads[PREFERENCES] = "payload"; + type_payloads[BOOKMARKS] = "payload"; + type_payloads[AUTOFILL] = "payload"; - const ModelTypePayloadMap& type_payloads = - ModelTypePayloadMapFromEnumSet(models, "payload"); EXPECT_CALL(mock_observer_, OnNotificationsEnabled()); - EXPECT_CALL(mock_observer_, OnIncomingNotification( - ModelTypePayloadMapToObjectIdPayloadMap(type_payloads), - REMOTE_NOTIFICATION)); + EXPECT_CALL(mock_observer_, + OnIncomingNotification(type_payloads, + REMOTE_NOTIFICATION)); EXPECT_CALL(mock_observer_, OnNotificationsDisabled(TRANSIENT_NOTIFICATION_ERROR)); EXPECT_CALL(mock_observer_, @@ -99,8 +99,14 @@ TEST_F(InvalidationNotifierTest, Basic) { invalidation_notifier_->OnNotificationsEnabled(); - invalidation_notifier_->OnInvalidate( - ModelTypePayloadMapToObjectIdPayloadMap(type_payloads)); + ObjectIdPayloadMap id_payloads; + for (ModelTypePayloadMap::const_iterator it = type_payloads.begin(); + it != type_payloads.end(); ++it) { + invalidation::ObjectId id; + ASSERT_TRUE(RealModelTypeToObjectId(it->first, &id)); + id_payloads[id] = "payload"; + } + invalidation_notifier_->OnInvalidate(id_payloads); invalidation_notifier_->OnNotificationsDisabled( TRANSIENT_NOTIFICATION_ERROR); |