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

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

Issue 1388483002: Implement the Notification `timestamp` property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/common/platform_notification_data.h" 10 #include "content/public/common/platform_notification_data.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/WebKit/public/platform/WebString.h" 13 #include "third_party/WebKit/public/platform/WebString.h"
14 #include "third_party/WebKit/public/platform/WebURL.h" 14 #include "third_party/WebKit/public/platform/WebURL.h"
15 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h" 15 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 const char kNotificationTitle[] = "My Notification"; 19 const char kNotificationTitle[] = "My Notification";
20 const char kNotificationLang[] = "nl"; 20 const char kNotificationLang[] = "nl";
21 const char kNotificationBody[] = "Hello, world!"; 21 const char kNotificationBody[] = "Hello, world!";
22 const char kNotificationTag[] = "my_tag"; 22 const char kNotificationTag[] = "my_tag";
23 const char kNotificationIconUrl[] = "https://example.com/icon.png"; 23 const char kNotificationIconUrl[] = "https://example.com/icon.png";
24 const int kNotificationVibrationPattern[] = { 100, 200, 300 }; 24 const int kNotificationVibrationPattern[] = { 100, 200, 300 };
25 const double kNotificationTimestamp = 621046800.;
25 const unsigned char kNotificationData[] = { 0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf }; 26 const unsigned char kNotificationData[] = { 0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf };
26 const char kAction1Name[] = "btn1"; 27 const char kAction1Name[] = "btn1";
27 const char kAction1Title[] = "Button 1"; 28 const char kAction1Title[] = "Button 1";
28 const char kAction2Name[] = "btn2"; 29 const char kAction2Name[] = "btn2";
29 const char kAction2Title[] = "Button 2"; 30 const char kAction2Title[] = "Button 2";
30 31
31 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) { 32 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
32 blink::WebNotificationData web_data; 33 blink::WebNotificationData web_data;
33 web_data.title = blink::WebString::fromUTF8(kNotificationTitle); 34 web_data.title = blink::WebString::fromUTF8(kNotificationTitle);
34 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 35 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
35 web_data.lang = blink::WebString::fromUTF8(kNotificationLang); 36 web_data.lang = blink::WebString::fromUTF8(kNotificationLang);
36 web_data.body = blink::WebString::fromUTF8(kNotificationBody); 37 web_data.body = blink::WebString::fromUTF8(kNotificationBody);
37 web_data.tag = blink::WebString::fromUTF8(kNotificationTag); 38 web_data.tag = blink::WebString::fromUTF8(kNotificationTag);
38 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl)); 39 web_data.icon = blink::WebURL(GURL(kNotificationIconUrl));
39 web_data.vibrate = blink::WebVector<int>( 40 web_data.vibrate = blink::WebVector<int>(
40 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern)); 41 kNotificationVibrationPattern, arraysize(kNotificationVibrationPattern));
42 web_data.timestamp = kNotificationTimestamp;
41 web_data.silent = true; 43 web_data.silent = true;
42 web_data.requireInteraction = true; 44 web_data.requireInteraction = true;
43 web_data.data = blink::WebVector<char>(kNotificationData, 45 web_data.data = blink::WebVector<char>(kNotificationData,
44 arraysize(kNotificationData)); 46 arraysize(kNotificationData));
45 47
46 web_data.actions = blink::WebVector<blink::WebNotificationAction>( 48 web_data.actions = blink::WebVector<blink::WebNotificationAction>(
47 static_cast<size_t>(2)); 49 static_cast<size_t>(2));
48 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name); 50 web_data.actions[0].action = blink::WebString::fromUTF8(kAction1Name);
49 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title); 51 web_data.actions[0].title = blink::WebString::fromUTF8(kAction1Title);
50 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name); 52 web_data.actions[1].action = blink::WebString::fromUTF8(kAction2Name);
51 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title); 53 web_data.actions[1].title = blink::WebString::fromUTF8(kAction2Title);
52 54
53 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 55 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
54 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 56 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
55 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT, 57 EXPECT_EQ(PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT,
56 platform_data.direction); 58 platform_data.direction);
57 EXPECT_EQ(kNotificationLang, platform_data.lang); 59 EXPECT_EQ(kNotificationLang, platform_data.lang);
58 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 60 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
59 EXPECT_EQ(kNotificationTag, platform_data.tag); 61 EXPECT_EQ(kNotificationTag, platform_data.tag);
60 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 62 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
61 EXPECT_TRUE(platform_data.silent); 63 EXPECT_TRUE(platform_data.silent);
62 EXPECT_TRUE(platform_data.require_interaction); 64 EXPECT_TRUE(platform_data.require_interaction);
63 65
64 EXPECT_THAT(platform_data.vibration_pattern, 66 EXPECT_THAT(platform_data.vibration_pattern,
65 testing::ElementsAreArray(kNotificationVibrationPattern)); 67 testing::ElementsAreArray(kNotificationVibrationPattern));
66 68
69 EXPECT_DOUBLE_EQ(kNotificationTimestamp, platform_data.timestamp.ToJsTime());
67 ASSERT_EQ(web_data.data.size(), platform_data.data.size()); 70 ASSERT_EQ(web_data.data.size(), platform_data.data.size());
68 for (size_t i = 0; i < web_data.data.size(); ++i) 71 for (size_t i = 0; i < web_data.data.size(); ++i)
69 EXPECT_EQ(web_data.data[i], platform_data.data[i]); 72 EXPECT_EQ(web_data.data[i], platform_data.data[i]);
70 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size()); 73 ASSERT_EQ(web_data.actions.size(), platform_data.actions.size());
71 EXPECT_EQ(kAction1Name, platform_data.actions[0].action); 74 EXPECT_EQ(kAction1Name, platform_data.actions[0].action);
72 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title); 75 EXPECT_EQ(base::ASCIIToUTF16(kAction1Title), platform_data.actions[0].title);
73 EXPECT_EQ(kAction2Name, platform_data.actions[1].action); 76 EXPECT_EQ(kAction2Name, platform_data.actions[1].action);
74 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title); 77 EXPECT_EQ(base::ASCIIToUTF16(kAction2Title), platform_data.actions[1].title);
75 } 78 }
76 79
77 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 80 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
78 std::vector<int> vibration_pattern( 81 std::vector<int> vibration_pattern(
79 kNotificationVibrationPattern, 82 kNotificationVibrationPattern,
80 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern)); 83 kNotificationVibrationPattern + arraysize(kNotificationVibrationPattern));
81 84
82 std::vector<char> developer_data( 85 std::vector<char> developer_data(
83 kNotificationData, kNotificationData + arraysize(kNotificationData)); 86 kNotificationData, kNotificationData + arraysize(kNotificationData));
84 87
85 PlatformNotificationData platform_data; 88 PlatformNotificationData platform_data;
86 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 89 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
87 platform_data.direction = 90 platform_data.direction =
88 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT; 91 PlatformNotificationData::DIRECTION_LEFT_TO_RIGHT;
89 platform_data.lang = kNotificationLang; 92 platform_data.lang = kNotificationLang;
90 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 93 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
91 platform_data.tag = kNotificationTag; 94 platform_data.tag = kNotificationTag;
92 platform_data.icon = GURL(kNotificationIconUrl); 95 platform_data.icon = GURL(kNotificationIconUrl);
93 platform_data.vibration_pattern = vibration_pattern; 96 platform_data.vibration_pattern = vibration_pattern;
97 platform_data.timestamp = base::Time::FromJsTime(kNotificationTimestamp);
94 platform_data.silent = true; 98 platform_data.silent = true;
95 platform_data.require_interaction = true; 99 platform_data.require_interaction = true;
96 platform_data.data = developer_data; 100 platform_data.data = developer_data;
97 platform_data.actions.resize(2); 101 platform_data.actions.resize(2);
98 platform_data.actions[0].action = kAction1Name; 102 platform_data.actions[0].action = kAction1Name;
99 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title); 103 platform_data.actions[0].title = base::ASCIIToUTF16(kAction1Title);
100 platform_data.actions[1].action = kAction2Name; 104 platform_data.actions[1].action = kAction2Name;
101 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title); 105 platform_data.actions[1].title = base::ASCIIToUTF16(kAction2Title);
102 106
103 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 107 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
104 EXPECT_EQ(kNotificationTitle, web_data.title); 108 EXPECT_EQ(kNotificationTitle, web_data.title);
105 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 109 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
106 web_data.direction); 110 web_data.direction);
107 EXPECT_EQ(kNotificationLang, web_data.lang); 111 EXPECT_EQ(kNotificationLang, web_data.lang);
108 EXPECT_EQ(kNotificationBody, web_data.body); 112 EXPECT_EQ(kNotificationBody, web_data.body);
109 EXPECT_EQ(kNotificationTag, web_data.tag); 113 EXPECT_EQ(kNotificationTag, web_data.tag);
110 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 114 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
111 115
112 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size()); 116 ASSERT_EQ(vibration_pattern.size(), web_data.vibrate.size());
113 for (size_t i = 0; i < vibration_pattern.size(); ++i) 117 for (size_t i = 0; i < vibration_pattern.size(); ++i)
114 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]); 118 EXPECT_EQ(vibration_pattern[i], web_data.vibrate[i]);
115 119
120 EXPECT_DOUBLE_EQ(kNotificationTimestamp, web_data.timestamp);
116 EXPECT_TRUE(web_data.silent); 121 EXPECT_TRUE(web_data.silent);
117 EXPECT_TRUE(web_data.requireInteraction); 122 EXPECT_TRUE(web_data.requireInteraction);
118 123
119 ASSERT_EQ(developer_data.size(), web_data.data.size()); 124 ASSERT_EQ(developer_data.size(), web_data.data.size());
120 for (size_t i = 0; i < developer_data.size(); ++i) 125 for (size_t i = 0; i < developer_data.size(); ++i)
121 EXPECT_EQ(developer_data[i], web_data.data[i]); 126 EXPECT_EQ(developer_data[i], web_data.data[i]);
122 127
123 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size()); 128 ASSERT_EQ(platform_data.actions.size(), web_data.actions.size());
124 EXPECT_EQ(kAction1Name, web_data.actions[0].action); 129 EXPECT_EQ(kAction1Name, web_data.actions[0].action);
125 EXPECT_EQ(kAction1Title, web_data.actions[0].title); 130 EXPECT_EQ(kAction1Title, web_data.actions[0].title);
(...skipping 26 matching lines...) Expand all
152 platform_data.direction = pair.second; 157 platform_data.direction = pair.second;
153 158
154 blink::WebNotificationData web_data = 159 blink::WebNotificationData web_data =
155 ToWebNotificationData(platform_data); 160 ToWebNotificationData(platform_data);
156 EXPECT_EQ(pair.first, web_data.direction); 161 EXPECT_EQ(pair.first, web_data.direction);
157 } 162 }
158 } 163 }
159 } 164 }
160 165
161 } // namespace content 166 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698