[Sync] Rework Invalidator-related unit tests

sync/notifier/p2p_invalidator.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/p2p_invalidator.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/notifier/invalidation_handler.h"
 #include "sync/notifier/invalidation_util.h"
 
 namespace syncer {
 
-const char* kSyncP2PNotificationChannel = "http://www.google.com/chrome/sync";
+const char kSyncP2PNotificationChannel[] = "http://www.google.com/chrome/sync";
 
 namespace {
 
 const char kNotifySelf[] = "notifySelf";
 const char kNotifyOthers[] = "notifyOthers";
 const char kNotifyAll[] = "notifyAll";
 
 const char kSenderIdKey[] = "senderId";
 const char kNotificationTypeKey[] = "notificationType";
-const char kChangedTypesKey[] = "changedTypes";
+const char kIdStateMapKey[] = "idStateMap";
+const char kSourceKey[] = "source";
 
 }  // namespace
 
 std::string P2PNotificationTargetToString(P2PNotificationTarget target) {
   switch (target) {
     case NOTIFY_SELF:
       return kNotifySelf;
     case NOTIFY_OTHERS:
       return kNotifyOthers;
     case NOTIFY_ALL:
@@ skipping 12 matching lines @@
   if (target_str == kNotifyOthers) {
     return NOTIFY_OTHERS;
   }
   if (target_str == kNotifyAll) {
     return NOTIFY_ALL;
   }
   LOG(WARNING) << "Could not parse " << target_str;
   return NOTIFY_SELF;
 }
 
-P2PNotificationData::P2PNotificationData() : target_(NOTIFY_SELF) {}
+IncomingNotificationSource P2PNotificationSourceFromInteger(int source_num) {
+  if (source_num == LOCAL_NOTIFICATION) {
+    return LOCAL_NOTIFICATION;
+  }
+  return REMOTE_NOTIFICATION;
+}
+
+P2PNotificationData::P2PNotificationData()
+    : target_(NOTIFY_SELF), source_(REMOTE_NOTIFICATION) {}
 
 P2PNotificationData::P2PNotificationData(
     const std::string& sender_id,
     P2PNotificationTarget target,
-    ModelTypeSet changed_types)
+    const ObjectIdStateMap& id_state_map,
+    IncomingNotificationSource source)
     : sender_id_(sender_id),
       target_(target),
-      changed_types_(changed_types) {}
+      id_state_map_(id_state_map),
+      source_(source) {}
 
 P2PNotificationData::~P2PNotificationData() {}
 
 bool P2PNotificationData::IsTargeted(const std::string& id) const {
   switch (target_) {
     case NOTIFY_SELF:
       return sender_id_ == id;
     case NOTIFY_OTHERS:
       return sender_id_ != id;
     case NOTIFY_ALL:
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
-ModelTypeSet P2PNotificationData::GetChangedTypes() const {
-  return changed_types_;
+const ObjectIdStateMap& P2PNotificationData::GetIdStateMap() const {
+  return id_state_map_;
+}
+
+IncomingNotificationSource P2PNotificationData::GetSource() const {
+  return source_;
 }
 
 bool P2PNotificationData::Equals(const P2PNotificationData& other) const {
   return
       (sender_id_ == other.sender_id_) &&
       (target_ == other.target_) &&
-      changed_types_.Equals(other.changed_types_);
+      ObjectIdStateMapEquals(id_state_map_, other.id_state_map_) &&
+      (source_ == other.source_);
 }
 
 std::string P2PNotificationData::ToString() const {
   scoped_ptr<DictionaryValue> dict(new DictionaryValue());
   dict->SetString(kSenderIdKey, sender_id_);
   dict->SetString(kNotificationTypeKey,
                   P2PNotificationTargetToString(target_));
-  dict->Set(kChangedTypesKey, ModelTypeSetToValue(changed_types_));
+  dict->Set(kIdStateMapKey, ObjectIdStateMapToValue(id_state_map_).release());
+  dict->SetInteger(kSourceKey, source_);
   std::string json;
   base::JSONWriter::Write(dict.get(), &json);
   return json;
 }
 
 bool P2PNotificationData::ResetFromString(const std::string& str) {
   scoped_ptr<Value> data_value(base::JSONReader::Read(str));
-  if (!data_value.get()) {
-    LOG(WARNING) << "Could not parse " << str;
-    return false;
-  }
-  if (!data_value->IsType(Value::TYPE_DICTIONARY)) {
+  const base::DictionaryValue* data_dict = NULL;
+  if (!data_value.get() || !data_value->GetAsDictionary(&data_dict)) {
     LOG(WARNING) << "Could not parse " << str << " as a dictionary";
     return false;
   }
-  // TODO(akalin): Use Values::AsDictionary() when it becomes
-  // available.
-  DictionaryValue* data_dict =
-      static_cast<DictionaryValue*>(data_value.get());
   if (!data_dict->GetString(kSenderIdKey, &sender_id_)) {
     LOG(WARNING) << "Could not find string value for " << kSenderIdKey;
   }
   std::string target_str;
   if (!data_dict->GetString(kNotificationTypeKey, &target_str)) {
     LOG(WARNING) << "Could not find string value for "
                  << kNotificationTypeKey;
   }
   target_ = P2PNotificationTargetFromString(target_str);
-  ListValue* changed_types_list = NULL;
-  if (!data_dict->GetList(kChangedTypesKey, &changed_types_list)) {
-    LOG(WARNING) << "Could not find list value for "
-                 << kChangedTypesKey;
-    return false;
+  const base::ListValue* id_state_map_list = NULL;
+  if (!data_dict->GetList(kIdStateMapKey, &id_state_map_list) ||
+      !ObjectIdStateMapFromValue(*id_state_map_list, &id_state_map_)) {
+    LOG(WARNING) << "Could not parse " << kIdStateMapKey;
   }
-  changed_types_ = ModelTypeSetFromValue(*changed_types_list);
+  int source_num = 0;
+  if (!data_dict->GetInteger(kSourceKey, &source_num)) {
+    LOG(WARNING) << "Could not find integer value for " << kSourceKey;
+  }
+  source_ = P2PNotificationSourceFromInteger(source_num);
   return true;
 }
 
 P2PInvalidator::P2PInvalidator(scoped_ptr<notifier::PushClient> push_client,
                                P2PNotificationTarget send_notification_target)
     : push_client_(push_client.Pass()),
       logged_in_(false),
       notifications_enabled_(false),
       send_notification_target_(send_notification_target) {
   DCHECK(send_notification_target_ == NOTIFY_OTHERS ||
          send_notification_target_ == NOTIFY_ALL);
   push_client_->AddObserver(this);
 }
 
 P2PInvalidator::~P2PInvalidator() {
   DCHECK(thread_checker_.CalledOnValidThread());
   push_client_->RemoveObserver(this);
 }
 
 void P2PInvalidator::RegisterHandler(InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.RegisterHandler(handler);
 }
 
 void P2PInvalidator::UpdateRegisteredIds(InvalidationHandler* handler,
                                       const ObjectIdSet& ids) {
   // TODO(akalin): Handle arbitrary object IDs (http://crbug.com/140411).
   DCHECK(thread_checker_.CalledOnValidThread());
+  ObjectIdSet new_ids;
+  const ObjectIdSet& old_ids = registrar_.GetRegisteredIds(handler);
+  std::set_difference(ids.begin(), ids.end(),
+                      old_ids.begin(), old_ids.end(),
+                      std::inserter(new_ids, new_ids.end()),
+                      ObjectIdLessThan());
   registrar_.UpdateRegisteredIds(handler, ids);
-  const ModelTypeSet enabled_types =
-      ObjectIdSetToModelTypeSet(registrar_.GetAllRegisteredIds());
-  const ModelTypeSet new_enabled_types =
-      Difference(enabled_types, enabled_types_);
   const P2PNotificationData notification_data(
-      unique_id_, NOTIFY_SELF, new_enabled_types);
+      unique_id_, NOTIFY_SELF, ObjectIdSetToStateMap(new_ids, ""),
+      REMOTE_NOTIFICATION);
   SendNotificationData(notification_data);
-  enabled_types_ = enabled_types;
 }
 
 void P2PInvalidator::UnregisterHandler(InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.UnregisterHandler(handler);
 }
 
 void P2PInvalidator::SetUniqueId(const std::string& unique_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   unique_id_ = unique_id;
@@ skipping 14 matching lines @@
   // used in p2p mode (which is only used in testing).
   subscription.from = email;
   push_client_->UpdateSubscriptions(
       notifier::SubscriptionList(1, subscription));
   // If already logged in, the new credentials will take effect on the
   // next reconnection.
   push_client_->UpdateCredentials(email, token);
   logged_in_ = true;
 }
 
-void P2PInvalidator::SendNotification(ModelTypeSet changed_types) {
+void P2PInvalidator::SendNotification(const ObjectIdStateMap& id_state_map) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const P2PNotificationData notification_data(
-      unique_id_, send_notification_target_, changed_types);
+      unique_id_, send_notification_target_, id_state_map,
+      REMOTE_NOTIFICATION);
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::OnNotificationsEnabled() {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool just_turned_on = (notifications_enabled_ == false);
   notifications_enabled_ = true;
   registrar_.EmitOnNotificationsEnabled();
   if (just_turned_on) {
     const P2PNotificationData notification_data(
-        unique_id_, NOTIFY_SELF, enabled_types_);
+        unique_id_, NOTIFY_SELF,
+        ObjectIdSetToStateMap(registrar_.GetAllRegisteredIds(), ""),
+        REMOTE_NOTIFICATION);
     SendNotificationData(notification_data);
   }
 }
 
 void P2PInvalidator::OnNotificationsDisabled(
     notifier::NotificationsDisabledReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   registrar_.EmitOnNotificationsDisabled(FromNotifierReason(reason));
 }
 
@@ skipping 11 matching lines @@
   }
   if (notification.channel != kSyncP2PNotificationChannel) {
     LOG(WARNING) << "Notification from unexpected source "
                  << notification.channel;
   }
   P2PNotificationData notification_data;
   if (!notification_data.ResetFromString(notification.data)) {
     LOG(WARNING) << "Could not parse notification data from "
                  << notification.data;
     notification_data =
-        P2PNotificationData(unique_id_, NOTIFY_ALL, enabled_types_);
+        P2PNotificationData(
+            unique_id_, NOTIFY_ALL,
+            ObjectIdSetToStateMap(registrar_.GetAllRegisteredIds(), ""),
+            REMOTE_NOTIFICATION);
   }
   if (!notification_data.IsTargeted(unique_id_)) {
     DVLOG(1) << "Not a target of the notification -- "
              << "not emitting notification";
     return;
   }
-  const ModelTypeSet types_to_notify =
-      Intersection(enabled_types_, notification_data.GetChangedTypes());
-  if (types_to_notify.Empty()) {
-    DVLOG(1) << "No enabled and changed types -- not emitting notification";
-    return;
-  }
-  const ModelTypeStateMap& type_state_map = ModelTypeSetToStateMap(
-      notification_data.GetChangedTypes(), std::string());
   registrar_.DispatchInvalidationsToHandlers(
-      ModelTypeStateMapToObjectIdStateMap(type_state_map),
+      notification_data.GetIdStateMap(),
       REMOTE_NOTIFICATION);
 }
 
 void P2PInvalidator::SendNotificationDataForTest(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SendNotificationData(notification_data);
 }
 
 void P2PInvalidator::SendNotificationData(
     const P2PNotificationData& notification_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (notification_data.GetChangedTypes().Empty()) {
-    DVLOG(1) << "Not sending XMPP notification with no changed types: "
+  if (notification_data.GetIdStateMap().empty()) {
+    DVLOG(1) << "Not sending XMPP notification with empty state map: "
              << notification_data.ToString();
     return;
   }
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   push_client_->SendNotification(notification);
 }
 
 }  // namespace syncer