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

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: Fix LayoutTests interface tests 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 24 matching lines...) Expand all
35 blink::WebNotificationData web_data; 35 blink::WebNotificationData web_data;
36 web_data.title = blink::WebString::fromUTF8(kNotificationTitle); 36 web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
37 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 37 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
38 web_data.lang = blink::WebString::fromUTF8(kNotificationLang); 38 web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
39 web_data.body = blink::WebString::fromUTF8(kNotificationBody); 39 web_data.body = blink::WebString::fromUTF8(kNotificationBody);
40 web_data.tag = blink::WebString::fromUTF8(kNotificationTag); 40 web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
41 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl)); 41 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
42 web_data.vibrate = blink::WebVector<int>( 42 web_data.vibrate = blink::WebVector<int>(
43 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern)); 43 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
44 web_data.timestamp = kNotificationTimestamp; 44 web_data.timestamp = kNotificationTimestamp;
45 web_data.renotify = true;
45 web_data.silent = true; 46 web_data.silent = true;
46 web_data.requireInteraction = true; 47 web_data.requireInteraction = true;
47 web_data.data = 48 web_data.data =
48 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData)); 49 blink::WebVector<char>(kNotificationData, arraysize(kNotificationData));
49 50
50 web_data.actions = 51 web_data.actions =
51 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2)); 52 blink::WebVector<blink::WebNotificationAction>(static_cast<size_t>(2));
52 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name); 53 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
53 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title); 54 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
54 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name); 55 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
55 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title); 56 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
56 57
57 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 58 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
58 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 59 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
59 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT, 60 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
60 platform_data.direction); 61 platform_data.direction);
61 EXPECT_EQ(kNotificationLang, platform_data.lang); 62 EXPECT_EQ(kNotificationLang, platform_data.lang);
62 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 63 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
63 EXPECT_EQ(kNotificationTag, platform_data.tag); 64 EXPECT_EQ(kNotificationTag, platform_data.tag);
64 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 65 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
66 EXPECT_TRUE(platform_data.renotify);
65 EXPECT_TRUE(platform_data.silent); 67 EXPECT_TRUE(platform_data.silent);
66 EXPECT_TRUE(platform_data.require_interaction); 68 EXPECT_TRUE(platform_data.require_interaction);
67 69
68 EXPECT_THAT(platform_data.vibration_pattern, 70 EXPECT_THAT(platform_data.vibration_pattern,
69 testing::ElementsAreArray(kNotificationVibrationPattern)); 71 testing::ElementsAreArray(kNotificationVibrationPattern));
70 72
71 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime()); 73 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime());
72 ASSERT_EQ(web_data.data.size(), platform_data.data.size()); 74 ASSERT_EQ(web_data.data.size(), platform_data.data.size());
73 for (size_t i = 0; i < web_data.data.size(); ++i) 75 for (size_t i = 0; i < web_data.data.size(); ++i)
74 EXPECT_EQ(web_data.data[i], platform_data.data[i]); 76 EXPECT_EQ(web_data.data[i], platform_data.data[i]);
75 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size()); 77 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
76 EXPECT_EQ(kAction1Name, platform_data.actions[0].action); 78 EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
77 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title); 79 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
78 EXPECT_EQ(kAction2Name, platform_data.actions[1].action); 80 EXPECT_EQ(kAction2Name, platform_data.actions[1].action);
79 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title); 81 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title);
80 } 82 }
81 83
82 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 84 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
Michael van Ouwerkerk 2016/02/08 17:18:22 Please also add coverage for this case.
harkness 2016/02/09 11:06:30 Done.
83 std::vector<int> vibration_pattern( 85 std::vector<int> vibration_pattern(
84 kNotificationVibrationPattern, 86 kNotificationVibrationPattern,
85 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern)); 87 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
86 88
87 std::vector<char> developer_data( 89 std::vector<char> developer_data(
88 kNotificationData, kNotificationData + arraysize(kNotificationData)); 90 kNotificationData, kNotificationData + arraysize(kNotificationData));
89 91
90 PlatformNotificationData platform_data; 92 PlatformNotificationData platform_data;
91 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 93 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
92 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 94 platform_data.direction = PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 blink::WebNotificationData web_data; 197 blink::WebNotificationData web_data;
196 web_data.timestamp = 0; 198 web_data.timestamp = 0;
197 199
198 blink::WebNotificationData copied_data = 200 blink::WebNotificationData copied_data =
199 ToWebNotificationData(ToPlatformNotificationData(web_data)); 201 ToWebNotificationData(ToPlatformNotificationData(web_data));
200 EXPECT_EQ(web_data.timestamp, copied_data.timestamp); 202 EXPECT_EQ(web_data.timestamp, copied_data.timestamp);
201 } 203 }
202 } 204 }
203 205
204 } // namespace content 206 } // 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