Implement message center on Windows

ash/system/web_notification/web_notification_tray_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 "ash/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "ash/test/ash_test_base.h"
+#include "base/stringprintf.h"
+#include "base/utf_string_conversions.h"
 #include "ui/message_center/message_center_bubble.h"
+#include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_popup_bubble.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/notifications/notification_types.h"
-#include "ash/test/ash_test_base.h"
-#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace ash {
 
 namespace {
 
+// Must be called only when expecting a clean message center.
 WebNotificationTray* GetWebNotificationTray() {
   return Shell::GetPrimaryRootWindowController()->status_area_widget()->
       web_notification_tray();
 }
 
+message_center::MessageCenter* get_message_center() {
+  return GetWebNotificationTray()->message_center();
+}
+
+
 class TestDelegate : public message_center::MessageCenter::Delegate {
  public:
   TestDelegate(message_center::MessageCenter* message_center)
     : message_center_(message_center) {
     message_center_->SetDelegate(this);
   }
   virtual ~TestDelegate() {
     message_center_->SetDelegate(NULL);
     message_center_->notification_list()->RemoveAllNotifications();
   }
@@ skipping 11 matching lines @@
   }
 
   virtual void ShowSettings(const std::string& notifcation_id) {
   }
 
   virtual void OnClicked(const std::string& notifcation_id) {
   }
 
   void AddNotification(WebNotificationTray* tray, const std::string& id) {
     notification_ids_.insert(id);
-    tray->message_center()->AddNotification(
+    get_message_center()->AddNotification(
         ui::notifications::NOTIFICATION_TYPE_SIMPLE,
         id,
         ASCIIToUTF16("Test Web Notification"),
         ASCIIToUTF16("Notification message body."),
         ASCIIToUTF16("www.test.org"),
         "" /* extension id */,
         NULL /* optional_fields */);
   }
 
   void UpdateNotification(WebNotificationTray* tray,
                           const std::string& old_id,
                           const std::string& new_id) {
     notification_ids_.erase(old_id);
     notification_ids_.insert(new_id);
-    tray->message_center()->UpdateNotification(
+    get_message_center()->UpdateNotification(
         old_id, new_id,
         ASCIIToUTF16("Updated Web Notification"),
         ASCIIToUTF16("Updated message body."),
         NULL);
   }
 
   void RemoveNotification(WebNotificationTray* tray, const std::string& id) {
-    tray->message_center()->RemoveNotification(id);
+    get_message_center()->RemoveNotification(id);
     notification_ids_.erase(id);
   }
 
   bool HasNotificationId(const std::string& id) {
     return notification_ids_.find(id) != notification_ids_.end();
   }
 
  private:
   std::set<std::string> notification_ids_;
   message_center::MessageCenter* message_center_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDelegate);
 };
 
 }  // namespace
 
 typedef test::AshTestBase WebNotificationTrayTest;
 
 TEST_F(WebNotificationTrayTest, WebNotifications) {
   WebNotificationTray* tray = GetWebNotificationTray();
   message_center::MessageCenter* message_center = tray->message_center();
   scoped_ptr<TestDelegate> delegate(new TestDelegate(message_center));
   ASSERT_TRUE(tray->GetWidget());
 
   // Add a notification.
   delegate->AddNotification(tray, "test_id1");
-  EXPECT_EQ(1u, tray->message_center()->NotificationCount());
+  EXPECT_EQ(1u, get_message_center()->NotificationCount());
   EXPECT_TRUE(message_center->notification_list()->HasNotification("test_id1"));
   delegate->AddNotification(tray, "test_id2");
   delegate->AddNotification(tray, "test_id2");
-  EXPECT_EQ(2u, tray->message_center()->NotificationCount());
+  EXPECT_EQ(2u, get_message_center()->NotificationCount());
   EXPECT_TRUE(message_center->notification_list()->HasNotification("test_id2"));
 
   // Ensure that updating a notification does not affect the count.
   delegate->UpdateNotification(tray, "test_id2", "test_id3");
   delegate->UpdateNotification(tray, "test_id3", "test_id3");
-  EXPECT_EQ(2u, tray->message_center()->NotificationCount());
+  EXPECT_EQ(2u, get_message_center()->NotificationCount());
   EXPECT_FALSE(delegate->HasNotificationId("test_id2"));
   EXPECT_FALSE(message_center->notification_list()->HasNotification(
       "test_id2"));
   EXPECT_TRUE(delegate->HasNotificationId("test_id3"));
 
   // Ensure that Removing the first notification removes it from the tray.
   delegate->RemoveNotification(tray, "test_id1");
   EXPECT_FALSE(delegate->HasNotificationId("test_id1"));
   EXPECT_FALSE(message_center->notification_list()->HasNotification(
       "test_id1"));
-  EXPECT_EQ(1u, tray->message_center()->NotificationCount());
+  EXPECT_EQ(1u, get_message_center()->NotificationCount());
 
   // Remove the remianing notification.
   delegate->RemoveNotification(tray, "test_id3");
-  EXPECT_EQ(0u, tray->message_center()->NotificationCount());
+  EXPECT_EQ(0u, get_message_center()->NotificationCount());
   EXPECT_FALSE(message_center->notification_list()->HasNotification(
       "test_id3"));
 }
 
 TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
   WebNotificationTray* tray = GetWebNotificationTray();
-  scoped_ptr<TestDelegate> delegate(new TestDelegate(tray->message_center()));
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(get_message_center()));
 
   ASSERT_TRUE(tray->GetWidget());
 
   // Adding a notification should show the popup bubble.
   delegate->AddNotification(tray, "test_id1");
-  EXPECT_TRUE(tray->popup_bubble() != NULL);
+  EXPECT_TRUE(tray->IsPopupVisible());
 
   // Updating a notification should not hide the popup bubble.
   delegate->AddNotification(tray, "test_id2");
   delegate->UpdateNotification(tray, "test_id2", "test_id3");
-  EXPECT_TRUE(tray->popup_bubble() != NULL);
+  EXPECT_TRUE(tray->IsPopupVisible());
 
   // Removing the first notification should not hide the popup bubble.
   delegate->RemoveNotification(tray, "test_id1");
-  EXPECT_TRUE(tray->popup_bubble() != NULL);
+  EXPECT_TRUE(tray->IsPopupVisible());
 
   // Removing the visible notification should hide the popup bubble.
   delegate->RemoveNotification(tray, "test_id3");
-  EXPECT_TRUE(tray->popup_bubble() == NULL);
+  EXPECT_FALSE(tray->IsPopupVisible());
 }
 
 using message_center::NotificationList;
 
 
 TEST_F(WebNotificationTrayTest, ManyMessageCenterNotifications) {
 #if defined(OS_WIN)
   // This test seems to tickle a race condition on Metro/Ash causing the test
   // suite to crash.
   // TODO(robertshield): Fix this. http://crbug.com/170418
   if (base::win::GetVersion() >= base::win::VERSION_WIN8)
     return;
 #endif
 
   WebNotificationTray* tray = GetWebNotificationTray();
-  scoped_ptr<TestDelegate> delegate(new TestDelegate(tray->message_center()));
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(get_message_center()));
 
   // Add the max visible notifications +1, ensure the correct visible number.
   size_t notifications_to_add =
       NotificationList::kMaxVisibleMessageCenterNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = StringPrintf("test_id%d", static_cast<int>(i));
     delegate->AddNotification(tray, id);
   }
-  tray->ShowMessageCenterBubble();
+  tray->message_center_tray_->ShowMessageCenterBubble();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(tray->message_center_bubble() != NULL);
   EXPECT_EQ(notifications_to_add,
-            tray->message_center()->NotificationCount());
+            get_message_center()->NotificationCount());
   EXPECT_EQ(NotificationList::kMaxVisibleMessageCenterNotifications,
             tray->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
 }
 
 TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
 #if defined(OS_WIN)
   // This test seems to tickle a race condition on Metro/Ash causing the test
   // suite to crash.
   // TODO(robertshield): Fix this. http://crbug.com/170418
   if (base::win::GetVersion() >= base::win::VERSION_WIN8)
     return;
 #endif
 
   WebNotificationTray* tray = GetWebNotificationTray();
-  scoped_ptr<TestDelegate> delegate(new TestDelegate(tray->message_center()));
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(get_message_center()));
 
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add =
       NotificationList::kMaxVisiblePopupNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = StringPrintf("test_id%d", static_cast<int>(i));
     delegate->AddNotification(tray, id);
   }
   // Hide and reshow the bubble so that it is updated immediately, not delayed.
-  tray->HidePopupBubble();
-  tray->ShowPopupBubble();
-  EXPECT_TRUE(tray->popup_bubble() != NULL);
+  tray->SetHidePopupBubble(true);
+  tray->SetHidePopupBubble(false);
+  EXPECT_TRUE(tray->IsPopupVisible());
   EXPECT_EQ(notifications_to_add,
-            tray->message_center()->NotificationCount());
-  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
-            tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
+            get_message_center()->NotificationCount());
+  // EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
+  //          tray->GetPopupBubbleForTest()->NumMessageViewsForTest());

[stevenjb, 2013/01/23 23:14:18]

??

[dewittj, 2013/01/25 00:49:04]

Done.

+  get_message_center()->SetDelegate(NULL);
+  get_message_center()->notification_list()->RemoveAllNotifications();
 }
 
 }  // namespace ash