ash/system/web_notification/web_notification_tray_unittest.cc - Issue 324583002: The 1st patch to disambiguate message center notifications

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 324583002: The 1st patch to disambiguate message center notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/system/chromeos/session/tray_session_length_limit.cc ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/web_notification/web_notification_tray_unittest.cc

diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc

index eaf9d06a1d0177d3d25d368b17b11336288f48d7..ff7666c1f2c16cfa0247a98b14f5214b03908250 100644

--- a/ash/system/web_notification/web_notification_tray_unittest.cc

+++ b/ash/system/web_notification/web_notification_tray_unittest.cc

@@ -157,27 +157,27 @@ TEST_F(WebNotificationTrayTest, WebNotifications) {

// Add a notification.

AddNotification("test_id1");

EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());

- EXPECT_TRUE(GetMessageCenter()->HasNotification("test_id1"));

+ EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));

AddNotification("test_id2");

EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());

- EXPECT_TRUE(GetMessageCenter()->HasNotification("test_id2"));

+ EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));

// Ensure that updating a notification does not affect the count.

UpdateNotification("test_id2", "test_id3");

UpdateNotification("test_id3", "test_id3");

EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());

- EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id2"));

+ EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));

// Ensure that Removing the first notification removes it from the tray.

RemoveNotification("test_id1");

- EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id1"));

+ EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));

EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());

// Remove the remianing notification.

RemoveNotification("test_id3");

EXPECT_EQ(0u, GetMessageCenter()->NotificationCount());

- EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id3"));

+ EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id3"));

}

TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {