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

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

Issue 1656243002: Implementation of renotify flag for Notifications. (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 26 matching lines...) Expand all
37 blink::WebNotificationData web_data; 37 blink::WebNotificationData web_data;
38 web_data.title = blink::WebString::fromUTF8(kNotificationTitle); 38 web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
39 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 39 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
40 web_data.lang = blink::WebString::fromUTF8(kNotificationLang); 40 web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
41 web_data.body = blink::WebString::fromUTF8(kNotificationBody); 41 web_data.body = blink::WebString::fromUTF8(kNotificationBody);
42 web_data.tag = blink::WebString::fromUTF8(kNotificationTag); 42 web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
43 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl)); 43 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
44 web_data.vibrate = blink::WebVector<int>( 44 web_data.vibrate = blink::WebVector<int>(
45 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern)); 45 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
46 web_data.timestamp = kNotificationTimestamp; 46 web_data.timestamp = kNotificationTimestamp;
47 web_data.renotify = true;
47 web_data.silent = true; 48 web_data.silent = true;
48 web_data.requireInteraction = true; 49 web_data.requireInteraction = true;
49 web_data.data = 50 web_data.data =
50 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData)); 51 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData));
51 52
52 web_data.actions = 53 web_data.actions =
53 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2)); 54 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
54 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name); 55 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
55 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title); 56 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
56 web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl)); 57 web_data.actions[0].icon = blink::WebURL(GURL(kAction1IconUrl));
57 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name); 58 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
58 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title); 59 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
59 web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl)); 60 web_data.actions[1].icon = blink::WebURL(GURL(kAction2IconUrl));
60 61
61 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 62 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
62 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 63 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
63 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT, 64 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
64 platform_data.direction); 65 platform_data.direction);
65 EXPECT_EQ(kNotificationLang, platform_data.lang); 66 EXPECT_EQ(kNotificationLang, platform_data.lang);
66 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 67 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
67 EXPECT_EQ(kNotificationTag, platform_data.tag); 68 EXPECT_EQ(kNotificationTag, platform_data.tag);
68 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 69 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
70 EXPECT_TRUE(platform_data.renotify);
69 EXPECT_TRUE(platform_data.silent); 71 EXPECT_TRUE(platform_data.silent);
70 EXPECT_TRUE(platform_data.require_interaction); 72 EXPECT_TRUE(platform_data.require_interaction);
71 73
72 EXPECT_THAT(platform_data.vibration_pattern, 74 EXPECT_THAT(platform_data.vibration_pattern,
73 testing::ElementsAreArray(kNotificationVibrationPattern)); 75 testing::ElementsAreArray(kNotificationVibrationPattern));
74 76
75 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime()); 77 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime());
76 ASSERT_EQ(web_data.data.size(), platform_data.data.size()); 78 ASSERT_EQ(web_data.data.size(), platform_data.data.size());
77 for (size_t i = 0; i < web_data.data.size(); ++i) 79 for (size_t i = 0; i < web_data.data.size(); ++i)
78 EXPECT_EQ(web_data.data[i], platform_data.data[i]); 80 EXPECT_EQ(web_data.data[i], platform_data.data[i]);
(...skipping 16 matching lines...) Expand all
95 97
96 PlatformNotificationData platform_data; 98 PlatformNotificationData platform_data;
97 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 99 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
98 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 100 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
99 platform_data.lang = kNotificationLang; 101 platform_data.lang = kNotificationLang;
100 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 102 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
101 platform_data.tag = kNotificationTag; 103 platform_data.tag = kNotificationTag;
102 platform_data.icon = GURL(kNotificationIconUrl); 104 platform_data.icon = GURL(kNotificationIconUrl);
103 platform_data.vibration_pattern = vibration_pattern; 105 platform_data.vibration_pattern = vibration_pattern;
104 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp); 106 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp);
107 platform_data.renotify = true;
105 platform_data.silent = true; 108 platform_data.silent = true;
106 platform_data.require_interaction = true; 109 platform_data.require_interaction = true;
107 platform_data.data = developer_data; 110 platform_data.data = developer_data;
108 platform_data.actions.resize(2); 111 platform_data.actions.resize(2);
109 platform_data.actions[0].action = kAction1Name; 112 platform_data.actions[0].action = kAction1Name;
110 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title); 113 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
111 platform_data.actions[0].icon = GURL(kAction1IconUrl); 114 platform_data.actions[0].icon = GURL(kAction1IconUrl);
112 platform_data.actions[1].action = kAction2Name; 115 platform_data.actions[1].action = kAction2Name;
113 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title); 116 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
114 platform_data.actions[1].icon = GURL(kAction2IconUrl); 117 platform_data.actions[1].icon = GURL(kAction2IconUrl);
115 118
116 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 119 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
117 EXPECT_EQ(kNotificationTitle, web_data.title); 120 EXPECT_EQ(kNotificationTitle, web_data.title);
118 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 121 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
119 web_data.direction); 122 web_data.direction);
120 EXPECT_EQ(kNotificationLang, web_data.lang); 123 EXPECT_EQ(kNotificationLang, web_data.lang);
121 EXPECT_EQ(kNotificationBody, web_data.body); 124 EXPECT_EQ(kNotificationBody, web_data.body);
122 EXPECT_EQ(kNotificationTag, web_data.tag); 125 EXPECT_EQ(kNotificationTag, web_data.tag);
123 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 126 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
124 127
125 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size()); 128 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size());
126 for (size_t i = 0; i < vibration_pattern.size(); ++i) 129 for (size_t i = 0; i < vibration_pattern.size(); ++i)
127 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]); 130 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]);
128 131
129 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp); 132 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp);
133 EXPECT_TRUE(web_data.renotify);
130 EXPECT_TRUE(web_data.silent); 134 EXPECT_TRUE(web_data.silent);
131 EXPECT_TRUE(web_data.requireInteraction); 135 EXPECT_TRUE(web_data.requireInteraction);
132 136
133 ASSERT_EQ(developer_data.size(), web_data.data.size()); 137 ASSERT_EQ(developer_data.size(), web_data.data.size());
134 for (size_t i = 0; i < developer_data.size(); ++i) 138 for (size_t i = 0; i < developer_data.size(); ++i)
135 EXPECT_EQ(developer_data[i], web_data.data[i]); 139 EXPECT_EQ(developer_data[i], web_data.data[i]);
136 140
137 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size()); 141 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
138 EXPECT_EQ(kAction1Name, web_data.actions[0].action); 142 EXPECT_EQ(kAction1Name, web_data.actions[0].action);
139 EXPECT_EQ(kAction1Title, web_data.actions[0].title); 143 EXPECT_EQ(kAction1Title, web_data.actions[0].title);
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 blink::WebNotificationData web_data; 209 blink::WebNotificationData web_data;
206 web_data.timestamp = 0; 210 web_data.timestamp = 0;
207 211
208 blink::WebNotificationData copied_data = 212 blink::WebNotificationData copied_data =
209 ToWebNotificationData(ToPlatformNotificationData(web_data)); 213 ToWebNotificationData(ToPlatformNotificationData(web_data));
210 EXPECT_EQ(web_data.timestamp, copied_data.timestamp); 214 EXPECT_EQ(web_data.timestamp, copied_data.timestamp);
211 } 215 }
212 } 216 }
213 217
214 } // namespace content 218 } // 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