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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/message_center/cocoa/notification_controller_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.mm ('k') | ui/message_center/cocoa/popup_collection_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/notification_controller_unittest.mm
diff --git a/ui/message_center/cocoa/notification_controller_unittest.mm b/ui/message_center/cocoa/notification_controller_unittest.mm
index 41573e1528c0199da328a21ce04e5f0ecd13f9a3..5b5999c25adc4212acbcdfd6761b337d30bb2bf6 100644
--- a/ui/message_center/cocoa/notification_controller_unittest.mm
+++ b/ui/message_center/cocoa/notification_controller_unittest.mm
@@ -117,14 +117,10 @@ class NotificationControllerTest : public ui::CocoaTest {
TEST_F(NotificationControllerTest, BasicLayout) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "",
+ message_center::NOTIFICATION_TYPE_SIMPLE, "",
ASCIIToUTF16("Added to circles"),
- ASCIIToUTF16("Jonathan and 5 others"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
+ ASCIIToUTF16("Jonathan and 5 others"), gfx::Image(), base::string16(),
+ GURL(), DummyNotifierId(), message_center::RichNotificationData(),
NULL));
gfx::Image testIcon([TestIcon() retain]);
notification->set_icon(testIcon);
@@ -147,18 +143,14 @@ TEST_F(NotificationControllerTest, BasicLayout) {
TEST_F(NotificationControllerTest, OverflowText) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "",
+ message_center::NOTIFICATION_TYPE_SIMPLE, "",
ASCIIToUTF16("This is a much longer title that should wrap "
"multiple lines."),
ASCIIToUTF16("And even the message is long. This sure is a wordy "
"notification. Are you really going to read this "
"entire thing?"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
base::scoped_nsobject<MCNotificationController> controller(
[[MCNotificationController alloc] initWithNotification:notification.get()
messageCenter:NULL]);
@@ -171,15 +163,9 @@ TEST_F(NotificationControllerTest, OverflowText) {
TEST_F(NotificationControllerTest, Close) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "an_id",
- base::string16(),
- base::string16(),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ message_center::NOTIFICATION_TYPE_SIMPLE, "an_id", base::string16(),
+ base::string16(), gfx::Image(), base::string16(), GURL(),
+ DummyNotifierId(), message_center::RichNotificationData(), NULL));
MockMessageCenter message_center;
base::scoped_nsobject<MCNotificationController> controller(
@@ -197,16 +183,12 @@ TEST_F(NotificationControllerTest, Close) {
TEST_F(NotificationControllerTest, Update) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_SIMPLE,
- "",
+ message_center::NOTIFICATION_TYPE_SIMPLE, "",
ASCIIToUTF16("A simple title"),
ASCIIToUTF16("This message isn't too long and should fit in the"
"default bounds."),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
- NULL));
+ gfx::Image(), base::string16(), GURL(), DummyNotifierId(),
+ message_center::RichNotificationData(), NULL));
base::scoped_nsobject<MCNotificationController> controller(
[[MCNotificationController alloc] initWithNotification:notification.get()
messageCenter:NULL]);
@@ -238,15 +220,9 @@ TEST_F(NotificationControllerTest, Buttons) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_BASE_FORMAT,
- "an_id",
- base::string16(),
- base::string16(),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- optional,
- NULL));
+ message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+ base::string16(), base::string16(), gfx::Image(), base::string16(),
+ GURL(), DummyNotifierId(), optional, NULL));
MockMessageCenter message_center;
base::scoped_nsobject<MCNotificationController> controller(
@@ -263,14 +239,9 @@ TEST_F(NotificationControllerTest, Buttons) {
TEST_F(NotificationControllerTest, Image) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_BASE_FORMAT,
- "an_id",
- base::string16(),
- base::string16(),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- message_center::RichNotificationData(),
+ message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+ base::string16(), base::string16(), gfx::Image(), base::string16(),
+ GURL(), DummyNotifierId(), message_center::RichNotificationData(),
NULL));
NSImage* image = [NSImage imageNamed:NSImageNameFolder];
notification->set_image(gfx::Image([image retain]));
@@ -306,15 +277,10 @@ TEST_F(NotificationControllerTest, List) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_BASE_FORMAT,
- "an_id",
+ message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
UTF8ToUTF16("Notification Title"),
- UTF8ToUTF16("Notification Message - should be hidden"),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- optional,
- NULL));
+ UTF8ToUTF16("Notification Message - should be hidden"), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(), optional, NULL));
MockMessageCenter message_center;
base::scoped_nsobject<MCNotificationController> controller(
@@ -337,15 +303,9 @@ TEST_F(NotificationControllerTest, NoMessage) {
scoped_ptr<message_center::Notification> notification(
new message_center::Notification(
- message_center::NOTIFICATION_TYPE_BASE_FORMAT,
- "an_id",
- UTF8ToUTF16("Notification Title"),
- UTF8ToUTF16(""),
- gfx::Image(),
- base::string16(),
- DummyNotifierId(),
- optional,
- NULL));
+ message_center::NOTIFICATION_TYPE_BASE_FORMAT, "an_id",
+ UTF8ToUTF16("Notification Title"), UTF8ToUTF16(""), gfx::Image(),
+ base::string16(), GURL(), DummyNotifierId(), optional, NULL));
MockMessageCenter message_center;
base::scoped_nsobject<MCNotificationController> controller(
@@ -363,15 +323,10 @@ TEST_F(NotificationControllerTest, MessageSize) {
std::string id("id");
NotifierId notifier_id(NotifierId::APPLICATION, "notifier");
scoped_ptr<Notification> notification(new Notification(
- NOTIFICATION_TYPE_BASE_FORMAT,
- id,
- base::UTF8ToUTF16(""),
+ NOTIFICATION_TYPE_BASE_FORMAT, id, base::UTF8ToUTF16(""),
ASCIIToUTF16("And\neven\nthe\nmessage is long.\nThis sure is wordy"),
- gfx::Image(),
- base::string16() /* display_source */,
- notifier_id,
- data,
- NULL /* delegate */));
+ gfx::Image(), base::string16() /* display_source */, GURL(), notifier_id,
+ data, NULL /* delegate */));
base::scoped_nsobject<MCNotificationController> controller(
[[MCNotificationController alloc] initWithNotification:notification.get()
@@ -422,7 +377,7 @@ TEST_F(NotificationControllerTest, MessageSize) {
EXPECT_EQ(1u, compute_message_lines());
// Same as above, but context message takes away from message lines.
- notification->set_context_message(base::UTF8ToUTF16("foo"));
+ notification->set_context_message(UTF8ToUTF16("foo"));
notification->set_title(ASCIIToUTF16(""));
[controller updateNotification:notification.get()];
EXPECT_EQ(1u, compute_message_lines());
« no previous file with comments | « ui/message_center/cocoa/notification_controller.mm ('k') | ui/message_center/cocoa/popup_collection_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698