Synced Notifications Layout Changes

chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc

 // Copyright (c) 2013 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 <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/notification.h"
@@ skipping 309 matching lines @@
   StubNotificationUIManager notification_manager;
 
   // Call the method under test using the pre-populated data.
   notification1_->Show(&notification_manager, NULL, NULL);
 
   const Notification notification = notification_manager.notification();
 
   // Check the base fields of the notification.
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_IMAGE, notification.type());
   EXPECT_EQ(std::string(kTitle1), UTF16ToUTF8(notification.title()));
-  EXPECT_EQ(std::string(kText1And1), UTF16ToUTF8(notification.message()));
+  EXPECT_EQ(std::string(kText1), UTF16ToUTF8(notification.message()));
   EXPECT_EQ(std::string(kExpectedOriginUrl), notification.origin_url().spec());
   EXPECT_EQ(std::string(kKey1), UTF16ToUTF8(notification.replace_id()));
 
   EXPECT_EQ(kFakeCreationTime, notification.timestamp().ToDoubleT());
   EXPECT_EQ(kNotificationPriority, notification.priority());
-
-  EXPECT_EQ(UTF8ToUTF16(kContainedTitle1), notification.items()[0].title);
-  EXPECT_EQ(UTF8ToUTF16(kContainedTitle2), notification.items()[1].title);
-  EXPECT_EQ(UTF8ToUTF16(kContainedTitle3), notification.items()[2].title);
-
-  EXPECT_EQ(UTF8ToUTF16(kContainedMessage1), notification.items()[0].message);
-  EXPECT_EQ(UTF8ToUTF16(kContainedMessage2), notification.items()[1].message);
-  EXPECT_EQ(UTF8ToUTF16(kContainedMessage3), notification.items()[2].message);
 }
 
 TEST_F(SyncedNotificationTest, DismissTest) {
 
   if (!UseRichNotifications())
     return;
 
   StubNotificationUIManager notification_manager;
 
   // Call the method under test using a dismissed notification.
@@ skipping 45 matching lines @@
 
   // When we call OnFetchComplete on the second bitmap, show should be called.
   notification1_->OnFetchComplete(GURL(kIconUrl2), &bitmap);
   EXPECT_EQ(0, notification1_->active_fetcher_count_);
 
   // Since we check Show() thoroughly in its own test, we only check cursorily.
   EXPECT_EQ(message_center::NOTIFICATION_TYPE_IMAGE,
             notification_manager.notification().type());
   EXPECT_EQ(std::string(kTitle1),
             UTF16ToUTF8(notification_manager.notification().title()));
-  EXPECT_EQ(std::string(kText1And1),
+  EXPECT_EQ(std::string(kText1),
             UTF16ToUTF8(notification_manager.notification().message()));
 
   // TODO(petewil): Check that the bitmap in the notification is what we expect.
   // This fails today, the type info is different.
   // EXPECT_TRUE(gfx::BitmapsAreEqual(
   //     image, notification1_->GetAppIconBitmap()));
 }
 
 TEST_F(SyncedNotificationTest, QueueBitmapFetchJobsTest) {
   if (!UseRichNotifications())
     return;
 
   StubNotificationUIManager notification_manager;
 
   notification1_->QueueBitmapFetchJobs(&notification_manager, NULL, NULL);
 
   // There should be 4 urls in the queue, icon, image, and two buttons.
   EXPECT_EQ(4, notification1_->active_fetcher_count_);
 }
 
 // TODO(petewil): Add a test for a notification being read and or deleted.
 
 }  // namespace notifier