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

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

Issue 1855443002: Implement receiving side of web notification inline replies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added test and removed unnecessary code. Created 4 years, 8 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 12 matching lines...) Expand all
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 char kNotificationBadgeUrl[] = "https://example.com/badge.png"; 26 const char kNotificationBadgeUrl[] = "https://example.com/badge.png";
27 const int kNotificationVibrationPattern[] = {100, 200, 300}; 27 const int kNotificationVibrationPattern[] = {100, 200, 300};
28 const double kNotificationTimestamp = 621046800.; 28 const double kNotificationTimestamp = 621046800.;
29 const unsigned char kNotificationData[] = {0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf}; 29 const unsigned char kNotificationData[] = {0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf};
30 const char kAction1Name[] = "btn1"; 30 const char kAction1Name[] = "btn1";
31 const char kAction1Title[] = "Button 1"; 31 const char kAction1Title[] = "Button 1";
32 const char kAction1IconUrl[] = "https://example.com/action_icon_1.png"; 32 const char kAction1IconUrl[] = "https://example.com/action_icon_1.png";
33 const char kAction1Placeholder[] = "Run into the... friendliness pellets.";
33 const char kAction2Name[] = "btn2"; 34 const char kAction2Name[] = "btn2";
34 const char kAction2Title[] = "Button 2"; 35 const char kAction2Title[] = "Button 2";
35 const char kAction2IconUrl[] = "https://example.com/action_icon_2.png"; 36 const char kAction2IconUrl[] = "https://example.com/action_icon_2.png";
36 37
37 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) { 38 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
38 blink::WebNotificationData web_data; 39 blink::WebNotificationData web_data;
39 web_data.title = blink::WebString::fromUTF8(kNotificationTitle); 40 web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
40 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 41 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
41 web_data.lang = blink::WebString::fromUTF8(kNotificationLang); 42 web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
42 web_data.body = blink::WebString::fromUTF8(kNotificationBody); 43 web_data.body = blink::WebString::fromUTF8(kNotificationBody);
43 web_data.tag = blink::WebString::fromUTF8(kNotificationTag); 44 web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
44 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl)); 45 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
45 web_data.badge = blink::WebURL(GURL(kNotificationBadgeUrl)); 46 web_data.badge = blink::WebURL(GURL(kNotificationBadgeUrl));
46 web_data.vibrate = blink::WebVector<int>( 47 web_data.vibrate = blink::WebVector<int>(
47 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern)); 48 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
48 web_data.timestamp = kNotificationTimestamp; 49 web_data.timestamp = kNotificationTimestamp;
49 web_data.renotify = true; 50 web_data.renotify = true;
50 web_data.silent = true; 51 web_data.silent = true;
51 web_data.requireInteraction = true; 52 web_data.requireInteraction = true;
52 web_data.data = 53 web_data.data =
53 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData)); 54 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData));
54 55
55 web_data.actions = 56 web_data.actions =
56 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2)); 57 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
58 web_data.actions[0].type = blink::WebNotificationAction::Button;
57 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name); 59 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
58 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title); 60 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
59 web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl)); 61 web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl));
62 web_data.actions[0].placeholder =
63 blink::WebString::fromUTF8(kAction1Placeholder);
64 web_data.actions[1].type = blink::WebNotificationAction::Text;
60 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name); 65 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
61 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title); 66 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
62 web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl)); 67 web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl));
68 web_data.actions[1].placeholder = blink::WebString();
63 69
64 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 70 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
65 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 71 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
66 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT, 72 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
67 platform_data.direction); 73 platform_data.direction);
68 EXPECT_EQ(kNotificationLang, platform_data.lang); 74 EXPECT_EQ(kNotificationLang, platform_data.lang);
69 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 75 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
70 EXPECT_EQ(kNotificationTag, platform_data.tag); 76 EXPECT_EQ(kNotificationTag, platform_data.tag);
71 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 77 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
72 EXPECT_EQ(kNotificationBadgeUrl, platform_data.badge.spec()); 78 EXPECT_EQ(kNotificationBadgeUrl, platform_data.badge.spec());
73 EXPECT_TRUE(platform_data.renotify); 79 EXPECT_TRUE(platform_data.renotify);
74 EXPECT_TRUE(platform_data.silent); 80 EXPECT_TRUE(platform_data.silent);
75 EXPECT_TRUE(platform_data.require_interaction); 81 EXPECT_TRUE(platform_data.require_interaction);
76 82
77 EXPECT_THAT(platform_data.vibration_pattern, 83 EXPECT_THAT(platform_data.vibration_pattern,
78 testing::ElementsAreArray(kNotificationVibrationPattern)); 84 testing::ElementsAreArray(kNotificationVibrationPattern));
79 85
80 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime()); 86 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime());
81 ASSERT_EQ(web_data.data.size(), platform_data.data.size()); 87 ASSERT_EQ(web_data.data.size(), platform_data.data.size());
82 for (size_t i = 0; i < web_data.data.size(); ++i) 88 for (size_t i = 0; i < web_data.data.size(); ++i)
83 EXPECT_EQ(web_data.data[i], platform_data.data[i]); 89 EXPECT_EQ(web_data.data[i], platform_data.data[i]);
84 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size()); 90 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
91 EXPECT_EQ(PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON,
92 platform_data.actions[0].type);
85 EXPECT_EQ(kAction1Name, platform_data.actions[0].action); 93 EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
86 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title); 94 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
87 EXPECT_EQ(kAction1IconUrl, platform_data.actions[0].icon.spec()); 95 EXPECT_EQ(kAction1IconUrl, platform_data.actions[0].icon.spec());
96 EXPECT_EQ(base::ASCIIToUTF16(kAction1Placeholder),
97 platform_data.actions[0].placeholder.string());
98 EXPECT_FALSE(platform_data.actions[0].placeholder.is_null());
99 EXPECT_EQ(PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT,
100 platform_data.actions[1].type);
88 EXPECT_EQ(kAction2Name, platform_data.actions[1].action); 101 EXPECT_EQ(kAction2Name, platform_data.actions[1].action);
89 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title); 102 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title);
90 EXPECT_EQ(kAction2IconUrl, platform_data.actions[1].icon.spec()); 103 EXPECT_EQ(kAction2IconUrl, platform_data.actions[1].icon.spec());
104 EXPECT_TRUE(platform_data.actions[1].placeholder.is_null());
91 } 105 }
92 106
93 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 107 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
94 std::vector<int> vibration_pattern( 108 std::vector<int> vibration_pattern(
95 kNotificationVibrationPattern, 109 kNotificationVibrationPattern,
96 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern)); 110 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
97 111
98 std::vector<char> developer_data( 112 std::vector<char> developer_data(
99 kNotificationData, kNotificationData + arraysize(kNotificationData)); 113 kNotificationData, kNotificationData + arraysize(kNotificationData));
100 114
101 PlatformNotificationData platform_data; 115 PlatformNotificationData platform_data;
102 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 116 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
103 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 117 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
104 platform_data.lang = kNotificationLang; 118 platform_data.lang = kNotificationLang;
105 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 119 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
106 platform_data.tag = kNotificationTag; 120 platform_data.tag = kNotificationTag;
107 platform_data.icon = GURL(kNotificationIconUrl); 121 platform_data.icon = GURL(kNotificationIconUrl);
108 platform_data.badge = GURL(kNotificationBadgeUrl); 122 platform_data.badge = GURL(kNotificationBadgeUrl);
109 platform_data.vibration_pattern = vibration_pattern; 123 platform_data.vibration_pattern = vibration_pattern;
110 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp); 124 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp);
111 platform_data.renotify = true; 125 platform_data.renotify = true;
112 platform_data.silent = true; 126 platform_data.silent = true;
113 platform_data.require_interaction = true; 127 platform_data.require_interaction = true;
114 platform_data.data = developer_data; 128 platform_data.data = developer_data;
115 platform_data.actions.resize(2); 129 platform_data.actions.resize(2);
130 platform_data.actions[0].type = PLATFORM_NOTIFICATION_ACTION_TYPE_BUTTON;
116 platform_data.actions[0].action = kAction1Name; 131 platform_data.actions[0].action = kAction1Name;
117 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title); 132 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
118 platform_data.actions[0].icon = GURL(kAction1IconUrl); 133 platform_data.actions[0].icon = GURL(kAction1IconUrl);
134 platform_data.actions[0].placeholder =
135 base::NullableString16(base::ASCIIToUTF16(kAction1Placeholder), false);
136 platform_data.actions[1].type = PLATFORM_NOTIFICATION_ACTION_TYPE_TEXT;
119 platform_data.actions[1].action = kAction2Name; 137 platform_data.actions[1].action = kAction2Name;
120 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title); 138 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
121 platform_data.actions[1].icon = GURL(kAction2IconUrl); 139 platform_data.actions[1].icon = GURL(kAction2IconUrl);
140 platform_data.actions[1].placeholder = base::NullableString16();
122 141
123 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 142 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
124 EXPECT_EQ(kNotificationTitle, web_data.title); 143 EXPECT_EQ(kNotificationTitle, web_data.title);
125 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 144 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
126 web_data.direction); 145 web_data.direction);
127 EXPECT_EQ(kNotificationLang, web_data.lang); 146 EXPECT_EQ(kNotificationLang, web_data.lang);
128 EXPECT_EQ(kNotificationBody, web_data.body); 147 EXPECT_EQ(kNotificationBody, web_data.body);
129 EXPECT_EQ(kNotificationTag, web_data.tag); 148 EXPECT_EQ(kNotificationTag, web_data.tag);
130 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 149 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
131 EXPECT_EQ(kNotificationBadgeUrl, web_data.badge.string()); 150 EXPECT_EQ(kNotificationBadgeUrl, web_data.badge.string());
132 151
133 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size()); 152 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size());
134 for (size_t i = 0; i < vibration_pattern.size(); ++i) 153 for (size_t i = 0; i < vibration_pattern.size(); ++i)
135 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]); 154 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]);
136 155
137 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp); 156 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp);
138 EXPECT_TRUE(web_data.renotify); 157 EXPECT_TRUE(web_data.renotify);
139 EXPECT_TRUE(web_data.silent); 158 EXPECT_TRUE(web_data.silent);
140 EXPECT_TRUE(web_data.requireInteraction); 159 EXPECT_TRUE(web_data.requireInteraction);
141 160
142 ASSERT_EQ(developer_data.size(), web_data.data.size()); 161 ASSERT_EQ(developer_data.size(), web_data.data.size());
143 for (size_t i = 0; i < developer_data.size(); ++i) 162 for (size_t i = 0; i < developer_data.size(); ++i)
144 EXPECT_EQ(developer_data[i], web_data.data[i]); 163 EXPECT_EQ(developer_data[i], web_data.data[i]);
145 164
146 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size()); 165 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
166 EXPECT_EQ(blink::WebNotificationAction::Button, web_data.actions[0].type);
147 EXPECT_EQ(kAction1Name, web_data.actions[0].action); 167 EXPECT_EQ(kAction1Name, web_data.actions[0].action);
148 EXPECT_EQ(kAction1Title, web_data.actions[0].title); 168 EXPECT_EQ(kAction1Title, web_data.actions[0].title);
149 EXPECT_EQ(kAction1IconUrl, web_data.actions[0].icon.string()); 169 EXPECT_EQ(kAction1IconUrl, web_data.actions[0].icon.string());
170 EXPECT_EQ(kAction1Placeholder, web_data.actions[0].placeholder);
171 EXPECT_EQ(blink::WebNotificationAction::Text, web_data.actions[1].type);
150 EXPECT_EQ(kAction2Name, web_data.actions[1].action); 172 EXPECT_EQ(kAction2Name, web_data.actions[1].action);
151 EXPECT_EQ(kAction2Title, web_data.actions[1].title); 173 EXPECT_EQ(kAction2Title, web_data.actions[1].title);
152 EXPECT_EQ(kAction2IconUrl, web_data.actions[1].icon.string()); 174 EXPECT_EQ(kAction2IconUrl, web_data.actions[1].icon.string());
175 EXPECT_TRUE(web_data.actions[1].placeholder.isNull());
153 } 176 }
154 177
155 TEST(NotificationDataConversionsTest, NotificationDataDirectionality) { 178 TEST(NotificationDataConversionsTest, NotificationDataDirectionality) {
156 std::map<blink::WebNotificationData::Direction, 179 std::map<blink::WebNotificationData::Direction,
157 PlatformNotificationData::Direction> mappings; 180 PlatformNotificationData::Direction> mappings;
158 181
159 mappings[blink::WebNotificationData::DirectionLeftToRight] = 182 mappings[blink::WebNotificationData::DirectionLeftToRight] =
160 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 183 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
161 mappings[blink::WebNotificationData::DirectionRightToLeft] = 184 mappings[blink::WebNotificationData::DirectionRightToLeft] =
162 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; 185 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 blink::WebNotificationData web_data; 237 blink::WebNotificationData web_data;
215 web_data.timestamp = 0; 238 web_data.timestamp = 0;
216 239
217 blink::WebNotificationData copied_data = 240 blink::WebNotificationData copied_data =
218 ToWebNotificationData(ToPlatformNotificationData(web_data)); 241 ToWebNotificationData(ToPlatformNotificationData(web_data));
219 EXPECT_EQ(web_data.timestamp, copied_data.timestamp); 242 EXPECT_EQ(web_data.timestamp, copied_data.timestamp);
220 } 243 }
221 } 244 }
222 245
223 } // namespace content 246 } // 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