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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1292003004: Elide origins displayed on web notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Style nit Created 5 years, 4 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/notification_controller_unittest.mm ('k') | ui/message_center/cocoa/popup_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/popup_collection_unittest.mm
diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm
index 80c38740647c595ad9059f438dc397093ad74d35..274d375b6acacc22f717e912f3e67da6a0c5930e 100644
--- a/ui/message_center/cocoa/popup_collection_unittest.mm
+++ b/ui/message_center/cocoa/popup_collection_unittest.mm
@@ -49,45 +49,30 @@ class PopupCollectionTest : public ui::CocoaTest {
void AddThreeNotifications() {
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
ASCIIToUTF16("This is the first notification to"
" be displayed"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "2",
- ASCIIToUTF16("Two"),
- ASCIIToUTF16("This is the second notification."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "2", ASCIIToUTF16("Two"),
+ ASCIIToUTF16("This is the second notification."), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "3",
- ASCIIToUTF16("Three"),
+ message_center::NOTIFICATION_TYPE_SIMPLE, "3", ASCIIToUTF16("Three"),
ASCIIToUTF16("This is the third notification "
"that has a much longer body "
"than the other notifications. It "
"may not fit on the screen if we "
"set the screen size too small or "
"if the notification is way too big"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
WaitForAnimationEnded();
}
@@ -134,15 +119,10 @@ TEST_F(PopupCollectionTest, AttemptFourOneOffscreen) {
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "4",
- ASCIIToUTF16("Four"),
- ASCIIToUTF16("This is the fourth notification."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "4", ASCIIToUTF16("Four"),
+ ASCIIToUTF16("This is the fourth notification."), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
WaitForAnimationEnded();
@@ -183,15 +163,9 @@ TEST_F(PopupCollectionTest, LayoutSpacing) {
optional.priority = message_center::HIGH_PRIORITY;
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "4",
- ASCIIToUTF16("Four"),
- ASCIIToUTF16("This is the fourth notification."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- optional,
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "4", ASCIIToUTF16("Four"),
+ ASCIIToUTF16("This is the fourth notification."), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(), optional, NULL));
center_->AddNotification(notification.Pass());
WaitForAnimationEnded();
EXPECT_TRUE(CheckSpacingBetween([popups objectAtIndex:2],
@@ -220,38 +194,28 @@ TEST_F(PopupCollectionTest, TinyScreen) {
EXPECT_EQ(0u, [[collection_ popups] count]);
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
ASCIIToUTF16("This is the first notification to"
- " be displayed"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ " be displayed"),
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
WaitForAnimationEnded();
EXPECT_EQ(1u, [[collection_ popups] count]);
// Now give the notification a longer message so that it no longer fits.
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
ASCIIToUTF16("This is now a very very very very "
- "very very very very very very very "
- "very very very very very very very "
- "very very very very very very very "
- "very very very very very very very "
- "very very very very very very very "
- "very very very very very very very "
- "long notification."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ "very very very very very very very "
+ "very very very very very very very "
+ "very very very very very very very "
+ "very very very very very very very "
+ "very very very very very very very "
+ "very very very very very very very "
+ "long notification."),
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->UpdateNotification("1", notification.Pass());
WaitForAnimationEnded();
EXPECT_EQ(0u, [[collection_ popups] count]);
@@ -283,19 +247,15 @@ TEST_F(PopupCollectionTest, UpdateIconAndBody) {
NSRect old_frame = [[controller view] frame];
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1",
ASCIIToUTF16("One is going to get a much longer "
- "title than it previously had."),
+ "title than it previously had."),
ASCIIToUTF16("This is the first notification to "
- "be displayed, but it will also be "
- "updated to have a significantly "
- "longer body"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ "be displayed, but it will also be "
+ "updated to have a significantly "
+ "longer body"),
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
WaitForAnimationEnded();
EXPECT_GT(NSHeight([[controller view] frame]), NSHeight(old_frame));
@@ -314,15 +274,10 @@ TEST_F(PopupCollectionTest, UpdateIconAndBody) {
TEST_F(PopupCollectionTest, UpdatePriority) {
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
- ASCIIToUTF16("This notification should not yet toast."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
+ ASCIIToUTF16("This notification should not yet toast."), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
notification->set_priority(-1);
center_->AddNotification(notification.Pass());
@@ -332,15 +287,10 @@ TEST_F(PopupCollectionTest, UpdatePriority) {
// Raise priority -1 to 1. Notification should display.
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
- ASCIIToUTF16("This notification should now toast"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
+ ASCIIToUTF16("This notification should now toast"), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
notification->set_priority(1);
center_->UpdateNotification("1", notification.Pass());
@@ -352,16 +302,11 @@ TEST_F(PopupCollectionTest, CloseCollectionBeforeNewPopupAnimationEnds) {
// Add a notification and don't wait for the animation to finish.
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
ASCIIToUTF16("This is the first notification to"
" be displayed"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
center_->AddNotification(notification.Pass());
// Release the popup collection before the animation ends. No crash should
@@ -386,15 +331,9 @@ TEST_F(PopupCollectionTest, CloseCollectionBeforeUpdatePopupAnimationEnds) {
// Update a notification and don't wait for the animation to finish.
scoped_ptr<message_center::Notification> notification;
notification.reset(new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "1",
- ASCIIToUTF16("One"),
- ASCIIToUTF16("New message."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "1", ASCIIToUTF16("One"),
+ ASCIIToUTF16("New message."), gfx::Image(), base::string16(), GURL(),
+ DummyNotifierId(), message_center::RichNotificationData(), NULL));
center_->UpdateNotification("1", notification.Pass());
// Release the popup collection before the animation ends. No crash should
« no previous file with comments | « ui/message_center/cocoa/notification_controller_unittest.mm ('k') | ui/message_center/cocoa/popup_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698