Implement message center on Windows

chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.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.
+
+

[Pete Williamson, 2013/01/24 19:41:59]

I'm happy to see this unit test.  It seems like there is some new code not
covered by unit tests in other files - let's add a TODO to write some tests for
them.

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

Done.

+#include "chrome/browser/ui/views/message_center/web_notification_tray_win.h"
+
+#include <set>
+
+#include "ash/root_window_controller.h"
+#include "ash/system/status_area_widget.h"
+#include "ash/system/tray/system_tray_item.h"
+#include "base/stringprintf.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/test/test_utils.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 "ui/views/controls/label.h"
+#include "ui/views/layout/fill_layout.h"
+#include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
+
+namespace ui {
+
+namespace {
+
+class TestDelegate : public message_center::MessageCenter::Delegate {
+ public:
+  explicit 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();
+  }
+
+  // WebNotificationTray::Delegate overrides.
+  virtual void NotificationRemoved(const std::string& notifcation_id) {
+    notification_ids_.erase(notifcation_id);
+  }
+
+  virtual void DisableExtension(const std::string& notifcation_id) {
+  }
+
+  virtual void DisableNotificationsFromSource(
+      const std::string& notifcation_id) {
+  }
+
+  virtual void ShowSettings(const std::string& notifcation_id) {
+  }
+
+  virtual void OnClicked(const std::string& notifcation_id) {
+  }
+
+  void AddNotification(const std::string& id) {
+    notification_ids_.insert(id);
+    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(const std::string& old_id,
+                          const std::string& new_id) {
+    notification_ids_.erase(old_id);
+    notification_ids_.insert(new_id);
+    message_center_->UpdateNotification(
+        old_id, new_id,
+        ASCIIToUTF16("Updated Web Notification"),
+        ASCIIToUTF16("Updated message body."),
+        NULL);
+  }
+
+  void RemoveNotification(const std::string& id) {
+    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_;

[Pete Williamson, 2013/01/24 19:41:59]

Consider adding a comment:
// The message_center pointer is owned by the caller, we do not free it here.

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

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(TestDelegate);
+};
+
+}  // namespace
+
+typedef InProcessBrowserTest WebNotificationTrayWinTest;
+
+IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest, WebNotifications) {
+  WebNotificationTrayWin* tray = new WebNotificationTrayWin();
+  message_center::MessageCenter* message_center = tray->message_center();

[Pete Williamson, 2013/01/24 19:41:59]

scoped_ptr would be better here, then you can remove the delete call below. 
(same comment for the other tests)

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

Done.

+  scoped_ptr<TestDelegate> delegate(new TestDelegate(message_center));
+
+  // Add a notification.
+  delegate->AddNotification("test_id1");
+  EXPECT_EQ(1u, message_center->NotificationCount());
+  EXPECT_TRUE(message_center->notification_list()->HasNotification("test_id1"));

[Pete Williamson, 2013/01/24 19:41:59]

Extra credit - you could add
EXPECT_FALSE(message_center->notification_list()->HasNotification("test_id2"));

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

Done.

+  delegate->AddNotification("test_id2");
+  delegate->AddNotification("test_id2");
+  EXPECT_EQ(2u, message_center->NotificationCount());
+  EXPECT_TRUE(message_center->notification_list()->HasNotification("test_id2"));
+
+  // Ensure that updating a notification does not affect the count.
+  delegate->UpdateNotification("test_id2", "test_id3");
+  delegate->UpdateNotification("test_id3", "test_id3");
+  EXPECT_EQ(2u, 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("test_id1");
+  EXPECT_FALSE(delegate->HasNotificationId("test_id1"));
+  EXPECT_FALSE(message_center->notification_list()->HasNotification(
+      "test_id1"));
+  EXPECT_EQ(1u, message_center->NotificationCount());
+
+  // Remove the remianing notification.
+  delegate->RemoveNotification("test_id3");
+  EXPECT_EQ(0u, message_center->NotificationCount());
+  EXPECT_FALSE(message_center->notification_list()->HasNotification(
+      "test_id3"));
+
+  delete tray;
+}
+
+IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest, WebNotificationPopupBubble) {
+  WebNotificationTrayWin* tray = new WebNotificationTrayWin();
+  message_center::MessageCenter* message_center = tray->message_center();
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(message_center));
+
+  // Adding a notification should show the popup bubble.
+  delegate->AddNotification("test_id1");
+  EXPECT_TRUE(tray->message_center_tray_->popups_visible());
+
+  // Updating a notification should not hide the popup bubble.
+  delegate->AddNotification("test_id2");
+  delegate->UpdateNotification("test_id2", "test_id3");
+  EXPECT_TRUE(tray->message_center_tray_->popups_visible());
+
+  // Removing the first notification should not hide the popup bubble.
+  delegate->RemoveNotification("test_id1");
+  EXPECT_TRUE(tray->message_center_tray_->popups_visible());
+
+  // Removing the visible notification should hide the popup bubble.
+  delegate->RemoveNotification("test_id3");
+  EXPECT_FALSE(tray->message_center_tray_->popups_visible());
+
+  delete tray;
+}
+
+using message_center::NotificationList;
+
+IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest,
+                       ManyMessageCenterNotifications) {
+  WebNotificationTrayWin* tray = new WebNotificationTrayWin();
+  message_center::MessageCenter* message_center = tray->message_center();
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(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(id);
+  }
+  tray->message_center_tray_->ShowMessageCenterBubble();
+  content::RunAllPendingInMessageLoop();
+  EXPECT_TRUE(tray->message_center_bubble_.get() != NULL);
+  EXPECT_EQ(notifications_to_add,
+            message_center->NotificationCount());
+  EXPECT_EQ(NotificationList::kMaxVisibleMessageCenterNotifications,
+            tray->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
+
+  delete tray;
+}
+
+IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest, ManyPopupNotifications) {
+  WebNotificationTrayWin* tray = new WebNotificationTrayWin();
+  message_center::MessageCenter* message_center = tray->message_center();
+  scoped_ptr<TestDelegate> delegate(new TestDelegate(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(id);
+  }
+  // Hide and reshow the bubble so that it is updated immediately, not delayed.
+  tray->message_center_tray_->HidePopupBubble();
+  tray->message_center_tray_->ShowPopupBubble();
+  EXPECT_TRUE(tray->message_center_tray_->popups_visible());
+  EXPECT_EQ(notifications_to_add,
+            message_center->NotificationCount());
+  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
+            tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
+  message_center->SetDelegate(NULL);
+  message_center->notification_list()->RemoveAllNotifications();
+
+  delete tray;
+}
+
+}  // namespace ash
+