| Index: content/child/notifications/notification_data_conversions_unittest.cc
|
| diff --git a/content/child/notifications/notification_data_conversions_unittest.cc b/content/child/notifications/notification_data_conversions_unittest.cc
|
| index 24642f2d12de62232b936f4aa3e29a668729e13b..31c904aa90abfbb176c456c6e8dcfb2c8f71329a 100644
|
| --- a/content/child/notifications/notification_data_conversions_unittest.cc
|
| +++ b/content/child/notifications/notification_data_conversions_unittest.cc
|
| @@ -30,9 +30,11 @@ const unsigned char kNotificationData[] = {0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf};
|
| const char kAction1Name[] = "btn1";
|
| const char kAction1Title[] = "Button 1";
|
| const char kAction1IconUrl[] = "https://example.com/action_icon_1.png";
|
| +const char kAction1Placeholder[] = "Run into the...";
|
| const char kAction2Name[] = "btn2";
|
| const char kAction2Title[] = "Button 2";
|
| const char kAction2IconUrl[] = "https://example.com/action_icon_2.png";
|
| +const char kAction2Placeholder[] = "...friendliness pellets.";
|
|
|
| TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
|
| blink::WebNotificationData web_data;
|
| @@ -54,12 +56,18 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
|
|
|
| web_data.actions =
|
| blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
|
| + web_data.actions[0].type = "button";
|
| web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
|
| web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
|
| web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl));
|
| + web_data.actions[0].placeholder =
|
| + blink::WebString::fromUTF8(kAction1Placeholder);
|
| + web_data.actions[1].type = "text";
|
| web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
|
| web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
|
| web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl));
|
| + web_data.actions[1].placeholder =
|
| + blink::WebString::fromUTF8(kAction2Placeholder);
|
|
|
| PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
|
| EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
|
| @@ -82,12 +90,20 @@ TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
|
| for (size_t i = 0; i < web_data.data.size(); ++i)
|
| EXPECT_EQ(web_data.data[i], platform_data.data[i]);
|
| ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
|
| + EXPECT_EQ(PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON,
|
| + platform_data.actions[0].type);
|
| EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
|
| EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
|
| EXPECT_EQ(kAction1IconUrl, platform_data.actions[0].icon.spec());
|
| + EXPECT_EQ(base::ASCIIToUTF16(kAction1Placeholder),
|
| + platform_data.actions[0].placeholder);
|
| + EXPECT_EQ(PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT,
|
| + platform_data.actions[1].type);
|
| EXPECT_EQ(kAction2Name, platform_data.actions[1].action);
|
| EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title);
|
| EXPECT_EQ(kAction2IconUrl, platform_data.actions[1].icon.spec());
|
| + EXPECT_EQ(base::ASCIIToUTF16(kAction2Placeholder),
|
| + platform_data.actions[1].placeholder);
|
| }
|
|
|
| TEST(NotificationDataConversionsTest, ToWebNotificationData) {
|
| @@ -113,12 +129,18 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
|
| platform_data.require_interaction = true;
|
| platform_data.data = developer_data;
|
| platform_data.actions.resize(2);
|
| + platform_data.actions[0].type = PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
|
| platform_data.actions[0].action = kAction1Name;
|
| platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
|
| platform_data.actions[0].icon = GURL(kAction1IconUrl);
|
| + platform_data.actions[0].placeholder =
|
| + base::ASCIIToUTF16(kAction1Placeholder);
|
| + platform_data.actions[1].type = PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
|
| platform_data.actions[1].action = kAction2Name;
|
| platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
|
| platform_data.actions[1].icon = GURL(kAction2IconUrl);
|
| + platform_data.actions[1].placeholder =
|
| + base::ASCIIToUTF16(kAction2Placeholder);
|
|
|
| blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
|
| EXPECT_EQ(kNotificationTitle, web_data.title);
|
| @@ -144,12 +166,16 @@ TEST(NotificationDataConversionsTest, ToWebNotificationData) {
|
| EXPECT_EQ(developer_data[i], web_data.data[i]);
|
|
|
| ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
|
| + EXPECT_EQ("button", web_data.actions[0].type);
|
| EXPECT_EQ(kAction1Name, web_data.actions[0].action);
|
| EXPECT_EQ(kAction1Title, web_data.actions[0].title);
|
| EXPECT_EQ(kAction1IconUrl, web_data.actions[0].icon.string());
|
| + EXPECT_EQ(kAction1Placeholder, web_data.actions[0].placeholder);
|
| + EXPECT_EQ("text", web_data.actions[1].type);
|
| EXPECT_EQ(kAction2Name, web_data.actions[1].action);
|
| EXPECT_EQ(kAction2Title, web_data.actions[1].title);
|
| EXPECT_EQ(kAction2IconUrl, web_data.actions[1].icon.string());
|
| + EXPECT_EQ(kAction2Placeholder, web_data.actions[1].placeholder);
|
| }
|
|
|
| TEST(NotificationDataConversionsTest, NotificationDataDirectionality) {
|
|
|