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

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

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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 <stdint.h>
8
9 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/common/platform_notification_data.h" 8 #include "content/public/common/platform_notification_data.h"
11 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
13 #include "third_party/WebKit/public/platform/WebURL.h" 11 #include "third_party/WebKit/public/platform/WebURL.h"
14 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h" 12 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificati onData.h"
15 13
16 namespace content { 14 namespace content {
15 namespace {
17 16
18 const char kNotificationTitle[] = "My Notification"; 17 const char kNotificationTitle[] = "My Notification";
19 const char kNotificationLang[] = "nl"; 18 const char kNotificationLang[] = "nl";
20 const char kNotificationBody[] = "Hello, world!"; 19 const char kNotificationBody[] = "Hello, world!";
21 const char kNotificationTag[] = "my_tag"; 20 const char kNotificationTag[] = "my_tag";
22 const char kNotificationIconUrl[] = "https://example.com/icon.png"; 21 const char kNotificationIconUrl[] = "https://example.com/icon.png";
23 const unsigned char kNotificationData[] = { 0xdf, 0xff, 0x0, 0x0, 0xff, 0xdf }; 22
23 }
24 24
25 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) { 25 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
26 std::vector<char> developer_data(
27 kNotificationData, kNotificationData + arraysize(kNotificationData));
28
29 blink::WebNotificationData web_data( 26 blink::WebNotificationData web_data(
30 blink::WebString::fromUTF8(kNotificationTitle), 27 blink::WebString::fromUTF8(kNotificationTitle),
31 blink::WebNotificationData::DirectionLeftToRight, 28 blink::WebNotificationData::DirectionLeftToRight,
32 blink::WebString::fromUTF8(kNotificationLang), 29 blink::WebString::fromUTF8(kNotificationLang),
33 blink::WebString::fromUTF8(kNotificationBody), 30 blink::WebString::fromUTF8(kNotificationBody),
34 blink::WebString::fromUTF8(kNotificationTag), 31 blink::WebString::fromUTF8(kNotificationTag),
35 blink::WebURL(GURL(kNotificationIconUrl)), 32 blink::WebURL(GURL(kNotificationIconUrl)),
36 true /* silent */, 33 true /* silent */);
37 blink::WebVector<char>(developer_data));
38 34
39 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 35 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
40 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 36 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
41 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight, 37 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
42 platform_data.direction); 38 platform_data.direction);
43 EXPECT_EQ(kNotificationLang, platform_data.lang); 39 EXPECT_EQ(kNotificationLang, platform_data.lang);
44 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 40 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
45 EXPECT_EQ(kNotificationTag, platform_data.tag); 41 EXPECT_EQ(kNotificationTag, platform_data.tag);
46 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 42 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
47 EXPECT_TRUE(platform_data.silent); 43 EXPECT_TRUE(platform_data.silent);
48
49 ASSERT_EQ(developer_data.size(), platform_data.data.size());
50 for (size_t i = 0; i < developer_data.size(); ++i)
51 EXPECT_EQ(developer_data[i], platform_data.data[i]);
52 } 44 }
53 45
54 TEST(NotificationDataConversionsTest, 46 TEST(NotificationDataConversionsTest,
55 ToPlatformNotificationDataDirectionality) { 47 ToPlatformNotificationDataDirectionality) {
56 blink::WebNotificationData web_data; 48 blink::WebNotificationData web_data;
57 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 49 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
58 50
59 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 51 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
60 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight, 52 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
61 platform_data.direction); 53 platform_data.direction);
62 54
63 web_data.direction = blink::WebNotificationData::DirectionRightToLeft; 55 web_data.direction = blink::WebNotificationData::DirectionRightToLeft;
64 56
65 platform_data = ToPlatformNotificationData(web_data); 57 platform_data = ToPlatformNotificationData(web_data);
66 EXPECT_EQ(PlatformNotificationData::NotificationDirectionRightToLeft, 58 EXPECT_EQ(PlatformNotificationData::NotificationDirectionRightToLeft,
67 platform_data.direction); 59 platform_data.direction);
68 } 60 }
69 61
70 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 62 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
71 std::vector<char> developer_data(
72 kNotificationData, kNotificationData + arraysize(kNotificationData));
73
74 PlatformNotificationData platform_data; 63 PlatformNotificationData platform_data;
75 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 64 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
76 platform_data.direction = 65 platform_data.direction =
77 PlatformNotificationData::NotificationDirectionLeftToRight; 66 PlatformNotificationData::NotificationDirectionLeftToRight;
78 platform_data.lang = kNotificationLang; 67 platform_data.lang = kNotificationLang;
79 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 68 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
80 platform_data.tag = kNotificationTag; 69 platform_data.tag = kNotificationTag;
81 platform_data.icon = GURL(kNotificationIconUrl); 70 platform_data.icon = GURL(kNotificationIconUrl);
82 platform_data.silent = true; 71 platform_data.silent = true;
83 platform_data.data = developer_data;
84 72
85 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 73 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
86 EXPECT_EQ(kNotificationTitle, web_data.title); 74 EXPECT_EQ(kNotificationTitle, web_data.title);
87 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 75 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
88 web_data.direction); 76 web_data.direction);
89 EXPECT_EQ(kNotificationLang, web_data.lang); 77 EXPECT_EQ(kNotificationLang, web_data.lang);
90 EXPECT_EQ(kNotificationBody, web_data.body); 78 EXPECT_EQ(kNotificationBody, web_data.body);
91 EXPECT_EQ(kNotificationTag, web_data.tag); 79 EXPECT_EQ(kNotificationTag, web_data.tag);
92 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 80 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
93 EXPECT_TRUE(web_data.silent); 81 EXPECT_TRUE(web_data.silent);
94
95 ASSERT_EQ(developer_data.size(), web_data.data.size());
96 for (size_t i = 0; i < developer_data.size(); ++i)
97 EXPECT_EQ(developer_data[i], web_data.data[i]);
98 } 82 }
99 83
100 TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) { 84 TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) {
101 PlatformNotificationData platform_data; 85 PlatformNotificationData platform_data;
102 platform_data.direction = 86 platform_data.direction =
103 PlatformNotificationData::NotificationDirectionLeftToRight; 87 PlatformNotificationData::NotificationDirectionLeftToRight;
104 88
105 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 89 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
106 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 90 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
107 web_data.direction); 91 web_data.direction);
108 92
109 platform_data.direction = 93 platform_data.direction =
110 PlatformNotificationData::NotificationDirectionRightToLeft; 94 PlatformNotificationData::NotificationDirectionRightToLeft;
111 95
112 web_data = ToWebNotificationData(platform_data); 96 web_data = ToWebNotificationData(platform_data);
113 EXPECT_EQ(blink::WebNotificationData::DirectionRightToLeft, 97 EXPECT_EQ(blink::WebNotificationData::DirectionRightToLeft,
114 web_data.direction); 98 web_data.direction);
115 } 99 }
116 100
117 } // namespace content 101 } // namespace content
OLDNEW
« no previous file with comments | « content/child/notifications/notification_data_conversions.cc ('k') | content/child/notifications/notification_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698