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

Side by Side Diff: content/child/notifications/notification_data_conversions_unittest.cc

Issue 1644573002: Notification actions may have an icon url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/child/notifications/notification_data_conversions.h" 5 #include "content/child/notifications/notification_data_conversions.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 10 matching lines...) Expand all
21 const char kNotificationTitle[] = "My Notification"; 21 const char kNotificationTitle[] = "My Notification";
22 const char kNotificationLang[] = "nl"; 22 const char kNotificationLang[] = "nl";
23 const char kNotificationBody[] = "Hello, world!"; 23 const char kNotificationBody[] = "Hello, world!";
24 const char kNotificationTag[] = "my_tag"; 24 const char kNotificationTag[] = "my_tag";
25 const char kNotificationIconUrl[] = "https://example.com/icon.png"; 25 const char kNotificationIconUrl[] = "https://example.com/icon.png";
26 const int kNotificationVibrationPattern[] = {100, 200, 300}; 26 const int kNotificationVibrationPattern[] = {100, 200, 300};
27 const double kNotificationTimestamp = 621046800.; 27 const double kNotificationTimestamp = 621046800.;
28 const unsigned char kNotificationData[] = {0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf}; 28 const unsigned char kNotificationData[] = {0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf};
29 const char kAction1Name[] = "btn1"; 29 const char kAction1Name[] = "btn1";
30 const char kAction1Title[] = "Button 1"; 30 const char kAction1Title[] = "Button 1";
31 const char kAction1IconUrl[] = "https://example.com/action_icon_1.png";
31 const char kAction2Name[] = "btn2"; 32 const char kAction2Name[] = "btn2";
32 const char kAction2Title[] = "Button 2"; 33 const char kAction2Title[] = "Button 2";
34 const char kAction2IconUrl[] = "https://example.com/action_icon_2.png";
33 35
34 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) { 36 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
35 blink::WebNotificationData web_data; 37 blink::WebNotificationData web_data;
36 web_data.title = blink::WebString::fromUTF8(kNotificationTitle); 38 web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
37 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 39 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
38 web_data.lang = blink::WebString::fromUTF8(kNotificationLang); 40 web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
39 web_data.body = blink::WebString::fromUTF8(kNotificationBody); 41 web_data.body = blink::WebString::fromUTF8(kNotificationBody);
40 web_data.tag = blink::WebString::fromUTF8(kNotificationTag); 42 web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
41 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl)); 43 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
42 web_data.vibrate = blink::WebVector<int>( 44 web_data.vibrate = blink::WebVector<int>(
43 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern)); 45 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
44 web_data.timestamp = kNotificationTimestamp; 46 web_data.timestamp = kNotificationTimestamp;
45 web_data.silent = true; 47 web_data.silent = true;
46 web_data.requireInteraction = true; 48 web_data.requireInteraction = true;
47 web_data.data = 49 web_data.data =
48 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData)); 50 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData));
49 51
50 web_data.actions = 52 web_data.actions =
51 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2)); 53 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
52 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name); 54 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
53 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title); 55 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
56 web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl));
54 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name); 57 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
55 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title); 58 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
59 web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl));
56 60
57 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 61 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
58 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 62 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
59 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT, 63 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
60 platform_data.direction); 64 platform_data.direction);
61 EXPECT_EQ(kNotificationLang, platform_data.lang); 65 EXPECT_EQ(kNotificationLang, platform_data.lang);
62 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 66 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
63 EXPECT_EQ(kNotificationTag, platform_data.tag); 67 EXPECT_EQ(kNotificationTag, platform_data.tag);
64 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 68 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
65 EXPECT_TRUE(platform_data.silent); 69 EXPECT_TRUE(platform_data.silent);
66 EXPECT_TRUE(platform_data.require_interaction); 70 EXPECT_TRUE(platform_data.require_interaction);
67 71
68 EXPECT_THAT(platform_data.vibration_pattern, 72 EXPECT_THAT(platform_data.vibration_pattern,
69 testing::ElementsAreArray(kNotificationVibrationPattern)); 73 testing::ElementsAreArray(kNotificationVibrationPattern));
70 74
71 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime()); 75 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime());
72 ASSERT_EQ(web_data.data.size(), platform_data.data.size()); 76 ASSERT_EQ(web_data.data.size(), platform_data.data.size());
73 for (size_t i = 0; i < web_data.data.size(); ++i) 77 for (size_t i = 0; i < web_data.data.size(); ++i)
74 EXPECT_EQ(web_data.data[i], platform_data.data[i]); 78 EXPECT_EQ(web_data.data[i], platform_data.data[i]);
75 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size()); 79 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
76 EXPECT_EQ(kAction1Name, platform_data.actions[0].action); 80 EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
77 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title); 81 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
82 EXPECT_EQ(kAction1IconUrl, platform_data.actions[0].icon.spec());
78 EXPECT_EQ(kAction2Name, platform_data.actions[1].action); 83 EXPECT_EQ(kAction2Name, platform_data.actions[1].action);
79 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title); 84 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title);
85 EXPECT_EQ(kAction2IconUrl, platform_data.actions[1].icon.spec());
80 } 86 }
81 87
82 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 88 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
83 std::vector<int> vibration_pattern( 89 std::vector<int> vibration_pattern(
84 kNotificationVibrationPattern, 90 kNotificationVibrationPattern,
85 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern)); 91 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
86 92
87 std::vector<char> developer_data( 93 std::vector<char> developer_data(
88 kNotificationData, kNotificationData + arraysize(kNotificationData)); 94 kNotificationData, kNotificationData + arraysize(kNotificationData));
89 95
90 PlatformNotificationData platform_data; 96 PlatformNotificationData platform_data;
91 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 97 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
92 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 98 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
93 platform_data.lang = kNotificationLang; 99 platform_data.lang = kNotificationLang;
94 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 100 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
95 platform_data.tag = kNotificationTag; 101 platform_data.tag = kNotificationTag;
96 platform_data.icon = GURL(kNotificationIconUrl); 102 platform_data.icon = GURL(kNotificationIconUrl);
97 platform_data.vibration_pattern = vibration_pattern; 103 platform_data.vibration_pattern = vibration_pattern;
98 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp); 104 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp);
99 platform_data.silent = true; 105 platform_data.silent = true;
100 platform_data.require_interaction = true; 106 platform_data.require_interaction = true;
101 platform_data.data = developer_data; 107 platform_data.data = developer_data;
102 platform_data.actions.resize(2); 108 platform_data.actions.resize(2);
103 platform_data.actions[0].action = kAction1Name; 109 platform_data.actions[0].action = kAction1Name;
104 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title); 110 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
111 platform_data.actions[0].icon = GURL(kAction1IconUrl);
105 platform_data.actions[1].action = kAction2Name; 112 platform_data.actions[1].action = kAction2Name;
106 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title); 113 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
114 platform_data.actions[1].icon = GURL(kAction2IconUrl);
107 115
108 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 116 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
109 EXPECT_EQ(kNotificationTitle, web_data.title); 117 EXPECT_EQ(kNotificationTitle, web_data.title);
110 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 118 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
111 web_data.direction); 119 web_data.direction);
112 EXPECT_EQ(kNotificationLang, web_data.lang); 120 EXPECT_EQ(kNotificationLang, web_data.lang);
113 EXPECT_EQ(kNotificationBody, web_data.body); 121 EXPECT_EQ(kNotificationBody, web_data.body);
114 EXPECT_EQ(kNotificationTag, web_data.tag); 122 EXPECT_EQ(kNotificationTag, web_data.tag);
115 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 123 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
116 124
117 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size()); 125 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size());
118 for (size_t i = 0; i < vibration_pattern.size(); ++i) 126 for (size_t i = 0; i < vibration_pattern.size(); ++i)
119 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]); 127 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]);
120 128
121 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp); 129 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp);
122 EXPECT_TRUE(web_data.silent); 130 EXPECT_TRUE(web_data.silent);
123 EXPECT_TRUE(web_data.requireInteraction); 131 EXPECT_TRUE(web_data.requireInteraction);
124 132
125 ASSERT_EQ(developer_data.size(), web_data.data.size()); 133 ASSERT_EQ(developer_data.size(), web_data.data.size());
126 for (size_t i = 0; i < developer_data.size(); ++i) 134 for (size_t i = 0; i < developer_data.size(); ++i)
127 EXPECT_EQ(developer_data[i], web_data.data[i]); 135 EXPECT_EQ(developer_data[i], web_data.data[i]);
128 136
129 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size()); 137 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
130 EXPECT_EQ(kAction1Name, web_data.actions[0].action); 138 EXPECT_EQ(kAction1Name, web_data.actions[0].action);
131 EXPECT_EQ(kAction1Title, web_data.actions[0].title); 139 EXPECT_EQ(kAction1Title, web_data.actions[0].title);
140 EXPECT_EQ(kAction1IconUrl, web_data.actions[0].icon.string());
132 EXPECT_EQ(kAction2Name, web_data.actions[1].action); 141 EXPECT_EQ(kAction2Name, web_data.actions[1].action);
133 EXPECT_EQ(kAction2Title, web_data.actions[1].title); 142 EXPECT_EQ(kAction2Title, web_data.actions[1].title);
143 EXPECT_EQ(kAction2IconUrl, web_data.actions[1].icon.string());
134 } 144 }
135 145
136 TEST(NotificationDataConversionsTest, NotificationDataDirectionality) { 146 TEST(NotificationDataConversionsTest, NotificationDataDirectionality) {
137 std::map<blink::WebNotificationData::Direction, 147 std::map<blink::WebNotificationData::Direction,
138 PlatformNotificationData::Direction> mappings; 148 PlatformNotificationData::Direction> mappings;
139 149
140 mappings[blink::WebNotificationData::DirectionLeftToRight] = 150 mappings[blink::WebNotificationData::DirectionLeftToRight] =
141 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 151 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
142 mappings[blink::WebNotificationData::DirectionRightToLeft] = 152 mappings[blink::WebNotificationData::DirectionRightToLeft] =
143 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; 153 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 blink::WebNotificationData web_data; 205 blink::WebNotificationData web_data;
196 web_data.timestamp = 0; 206 web_data.timestamp = 0;
197 207
198 blink::WebNotificationData copied_data = 208 blink::WebNotificationData copied_data =
199 ToWebNotificationData(ToPlatformNotificationData(web_data)); 209 ToWebNotificationData(ToPlatformNotificationData(web_data));
200 EXPECT_EQ(web_data.timestamp, copied_data.timestamp); 210 EXPECT_EQ(web_data.timestamp, copied_data.timestamp);
201 } 211 }
202 } 212 }
203 213
204 } // namespace content 214 } // namespace content
OLDNEW
« no previous file with comments | « content/child/notifications/notification_data_conversions.cc ('k') | content/common/platform_notification_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698