Widen Data Pipes and newer protobufs

chrome/browser/notifications/sync_notifier/chrome_notifier_service_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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
 #include "chrome/browser/notifications/sync_notifier/synced_notification.h"
@@ skipping 34 matching lines @@
 const int64 kFakeCreationTime = 42;
 const sync_pb::CoalescedSyncedNotification_ReadState kDismissed =
     sync_pb::CoalescedSyncedNotification_ReadState_DISMISSED;
 const sync_pb::CoalescedSyncedNotification_ReadState kUnread =
     sync_pb::CoalescedSyncedNotification_ReadState_UNREAD;
 
 // Extract notification id from syncer::SyncData.
 std::string GetNotificationId(const SyncData& sync_data) {
   SyncedNotificationSpecifics specifics = sync_data.GetSpecifics().
       synced_notification();
+
   return specifics.coalesced_notification().key();
 }
 
 // Stub out the NotificationUIManager for unit testing.
 class StubNotificationUIManager : public NotificationUIManager {
  public:
   StubNotificationUIManager() {}
   virtual ~StubNotificationUIManager() {}
 
   // Adds a notification to be displayed. Virtual for unit test override.
@@ skipping 147 matching lines @@
       const std::string& key,
       const std::string& external_id,
       sync_pb::CoalescedSyncedNotification_ReadState read_state) {
     // CreateLocalData makes a copy of this, so this can safely live
     // on the stack.
     EntitySpecifics entity_specifics;
 
     SyncedNotificationSpecifics* specifics =
         entity_specifics.mutable_synced_notification();
 
-    specifics->mutable_coalesced_notification()->
+    specifics->
+        mutable_coalesced_notification()->
         set_app_id(app_id);
 
-    specifics->mutable_coalesced_notification()->
+    specifics->
+        mutable_coalesced_notification()->
         set_key(key);
 
-    specifics->mutable_coalesced_notification()->
+    specifics->
+        mutable_coalesced_notification()->
         mutable_render_info()->
         mutable_expanded_info()->
         mutable_simple_expanded_layout()->
         set_title(message);
 
     specifics->
         mutable_coalesced_notification()->
         set_creation_time_msec(kFakeCreationTime);
 
     specifics->
@@ skipping 115 matching lines @@
 
   // Merge the local and remote data.
   notifier.MergeDataAndStartSyncing(
       SYNCED_NOTIFICATIONS,
       initial_data,
       PassProcessor(),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
 
   // Ensure the local store now has all local and remote notifications.
   EXPECT_EQ(7U, notifier.GetAllSyncData(SYNCED_NOTIFICATIONS).size());
-  EXPECT_TRUE(notifier.FindNotificationById(kKey1));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey2));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey3));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey4));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey5));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey6));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey7));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey1));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey2));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey3));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey4));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey5));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey6));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey7));
 
   // Test the type conversion and construction functions.
   for (SyncDataList::const_iterator iter = initial_data.begin();
       iter != initial_data.end(); ++iter) {
     scoped_ptr<SyncedNotification> notification1(
         ChromeNotifierService::CreateNotificationFromSyncData(*iter));
     // TODO(petewil): Revisit this when we add version info to notifications.
-    const std::string& id = notification1->notification_id();
-    const SyncedNotification* notification2 = notifier.FindNotificationById(id);
+    const std::string& key = notification1->key();
+    const SyncedNotification* notification2 =
+        notifier.FindNotificationByKey(key);
     EXPECT_TRUE(NULL != notification2);
     EXPECT_TRUE(notification1->EqualsIgnoringReadState(*notification2));
     EXPECT_EQ(notification1->read_state(), notification2->read_state());
   }
-  EXPECT_TRUE(notifier.FindNotificationById(kKey1));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey2));
-  EXPECT_TRUE(notifier.FindNotificationById(kKey3));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey1));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey2));
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey3));
 }
 
 // Test the local store having the read bit unset, the remote store having
 // it set.
 TEST_F(ChromeNotifierServiceTest, ModelAssocBothNonEmptyReadMismatch1) {
   StubNotificationUIManager notification_manager;
   ChromeNotifierService notifier(NULL, &notification_manager);
 
   // Create some local fake data.
   scoped_ptr<SyncedNotification> n1(CreateNotification(
@@ skipping 11 matching lines @@
   notifier.MergeDataAndStartSyncing(
       syncer::SYNCED_NOTIFICATIONS,
       initial_data,
       PassProcessor(),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
 
   // Ensure the local store still has only two notifications, and the read
   // state of the first is now read.
   EXPECT_EQ(2U, notifier.GetAllSyncData(syncer::SYNCED_NOTIFICATIONS).size());
   SyncedNotification* notification1 =
-      notifier.FindNotificationById(kKey1);
+      notifier.FindNotificationByKey(kKey1);
   EXPECT_FALSE(NULL == notification1);
-  EXPECT_EQ(SyncedNotification::kDismissed, notification1->read_state());
-  EXPECT_TRUE(notifier.FindNotificationById(kKey2));
-  EXPECT_FALSE(notifier.FindNotificationById(kKey3));
+  EXPECT_EQ(kDismissed, notification1->read_state());
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey2));
+  EXPECT_FALSE(notifier.FindNotificationByKey(kKey3));
 
   // Ensure no new data will be sent to the remote store for notification1.
   EXPECT_EQ(0U, processor()->change_list_size());
   EXPECT_FALSE(processor()->ContainsId(kKey1));
 }
 
 // Test when the local store has the read bit set, and the remote store has
 // it unset.
 TEST_F(ChromeNotifierServiceTest, ModelAssocBothNonEmptyReadMismatch2) {
   StubNotificationUIManager notification_manager;
@@ skipping 15 matching lines @@
   notifier.MergeDataAndStartSyncing(
       syncer::SYNCED_NOTIFICATIONS,
       initial_data,
       PassProcessor(),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
 
   // Ensure the local store still has only two notifications, and the read
   // state of the first is now read.
   EXPECT_EQ(2U, notifier.GetAllSyncData(syncer::SYNCED_NOTIFICATIONS).size());
   SyncedNotification* notification1 =
-      notifier.FindNotificationById(kKey1);
+      notifier.FindNotificationByKey(kKey1);
   EXPECT_FALSE(NULL == notification1);
-  EXPECT_EQ(SyncedNotification::kDismissed, notification1->read_state());
-  EXPECT_TRUE(notifier.FindNotificationById(kKey2));
-  EXPECT_FALSE(notifier.FindNotificationById(kKey3));
+  EXPECT_EQ(kDismissed, notification1->read_state());
+  EXPECT_TRUE(notifier.FindNotificationByKey(kKey2));
+  EXPECT_FALSE(notifier.FindNotificationByKey(kKey3));
 
   // Ensure the new data will be sent to the remote store for notification1.
   EXPECT_EQ(1U, processor()->change_list_size());
   EXPECT_TRUE(processor()->ContainsId(kKey1));
   EXPECT_EQ(SyncChange::ACTION_UPDATE, processor()->GetChangeById(
       kKey1).change_type());
 }
 
 // We have a notification in the local store, we get an updated version
 // of the same notification remotely, it should take precedence.
@@ skipping 13 matching lines @@
   // Merge the local and remote data.
   notifier.MergeDataAndStartSyncing(
       syncer::SYNCED_NOTIFICATIONS,
       initial_data,
       PassProcessor(),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
 
   // Ensure the local store still has only one notification
   EXPECT_EQ(1U, notifier.GetAllSyncData(syncer::SYNCED_NOTIFICATIONS).size());
   SyncedNotification* notification1 =
-      notifier.FindNotificationById(kKey1);
+      notifier.FindNotificationByKey(kKey1);
+
   EXPECT_FALSE(NULL == notification1);
-  EXPECT_EQ(SyncedNotification::kUnread, notification1->read_state());
+  EXPECT_EQ(kUnread, notification1->read_state());
   EXPECT_EQ("One", notification1->title());
-  EXPECT_EQ("Eleven", notification1->first_external_id());
 
   // Ensure no new data will be sent to the remote store for notification1.
   EXPECT_EQ(0U, processor()->change_list_size());
   EXPECT_FALSE(processor()->ContainsId(kKey1));
 }
 
 // TODO(petewil): There are more tests to add, such as when we add an API
 // to allow data entry from the client, we might have a more up to date
 // item on the client than the server, or we might have a merge conflict.