Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: ui/message_center/cocoa/status_item_view_unittest.mm

Issue 21308002: Update Mac notification tray behavior. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mac tests. Created 7 years, 5 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 | « ui/message_center/cocoa/status_item_view.mm ('k') | ui/message_center/notification.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/status_item_view_unittest.mm
diff --git a/ui/message_center/cocoa/status_item_view_unittest.mm b/ui/message_center/cocoa/status_item_view_unittest.mm
index 519fdd515c71b3419e68fe0fa766481c65dfa463..424d20f3514aa0fa008c55e0339b263167f2cc6c 100644
--- a/ui/message_center/cocoa/status_item_view_unittest.mm
+++ b/ui/message_center/cocoa/status_item_view_unittest.mm
@@ -52,30 +52,21 @@ TEST_F(StatusItemViewTest, Callback) {
TEST_F(StatusItemViewTest, UnreadCount) {
CGFloat initial_width = NSWidth([view_ frame]);
- CGFloat width = initial_width;
- [view_ setUnreadCount:2];
+ [view_ setUnreadCount:2 withQuietMode:NO];
[view_ display];
- EXPECT_GT(NSWidth([view_ frame]), width);
- width = NSWidth([view_ frame]);
+ EXPECT_EQ(NSWidth([view_ frame]), initial_width);
- [view_ setUnreadCount:10];
+ [view_ setUnreadCount:0 withQuietMode:NO];
[view_ display];
- EXPECT_GT(NSWidth([view_ frame]), width);
- width = NSWidth([view_ frame]);
+ EXPECT_EQ(NSWidth([view_ frame]), initial_width);
- CGFloat max_width = width;
-
- [view_ setUnreadCount:0];
+ [view_ setUnreadCount:1000 withQuietMode:YES];
[view_ display];
- EXPECT_LT(NSWidth([view_ frame]), width);
- width = NSWidth([view_ frame]);
- EXPECT_CGFLOAT_EQ(width, initial_width);
+ EXPECT_EQ(NSWidth([view_ frame]), initial_width);
- [view_ setUnreadCount:1000];
+ [view_ setUnreadCount:0 withQuietMode:YES];
[view_ display];
- EXPECT_GT(NSWidth([view_ frame]), width);
- width = NSWidth([view_ frame]);
- EXPECT_CGFLOAT_EQ(width, max_width);
+ EXPECT_EQ(NSWidth([view_ frame]), initial_width);
}
TEST_F(StatusItemViewTest, Highlight) {
« no previous file with comments | « ui/message_center/cocoa/status_item_view.mm ('k') | ui/message_center/notification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698