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

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

Issue 965573002: Implement support for silent notifications. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 5 years, 9 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 "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/common/platform_notification_data.h" 8 #include "content/public/common/platform_notification_data.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/WebKit/public/platform/WebString.h" 10 #include "third_party/WebKit/public/platform/WebString.h"
(...skipping 11 matching lines...) Expand all
22 22
23 } 23 }
24 24
25 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) { 25 TEST(NotificationDataConversionsTest, ToPlatformNotificationData) {
26 blink::WebNotificationData web_data( 26 blink::WebNotificationData web_data(
27 blink::WebString::fromUTF8(kNotificationTitle), 27 blink::WebString::fromUTF8(kNotificationTitle),
28 blink::WebNotificationData::DirectionLeftToRight, 28 blink::WebNotificationData::DirectionLeftToRight,
29 blink::WebString::fromUTF8(kNotificationLang), 29 blink::WebString::fromUTF8(kNotificationLang),
30 blink::WebString::fromUTF8(kNotificationBody), 30 blink::WebString::fromUTF8(kNotificationBody),
31 blink::WebString::fromUTF8(kNotificationTag), 31 blink::WebString::fromUTF8(kNotificationTag),
32 blink::WebURL(GURL(kNotificationIconUrl))); 32 blink::WebURL(GURL(kNotificationIconUrl)),
33 true /* silent */);
33 34
34 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 35 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
35 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title); 36 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTitle), platform_data.title);
36 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight, 37 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
37 platform_data.direction); 38 platform_data.direction);
38 EXPECT_EQ(kNotificationLang, platform_data.lang); 39 EXPECT_EQ(kNotificationLang, platform_data.lang);
39 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body); 40 EXPECT_EQ(base::ASCIIToUTF16(kNotificationBody), platform_data.body);
40 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTag), platform_data.tag); 41 EXPECT_EQ(base::ASCIIToUTF16(kNotificationTag), platform_data.tag);
41 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec()); 42 EXPECT_EQ(kNotificationIconUrl, platform_data.icon.spec());
43 EXPECT_TRUE(platform_data.silent);
42 } 44 }
43 45
44 TEST(NotificationDataConversionsTest, 46 TEST(NotificationDataConversionsTest,
45 ToPlatformNotificationDataDirectionality) { 47 ToPlatformNotificationDataDirectionality) {
46 blink::WebNotificationData web_data; 48 blink::WebNotificationData web_data;
47 web_data.direction = blink::WebNotificationData::DirectionLeftToRight; 49 web_data.direction = blink::WebNotificationData::DirectionLeftToRight;
48 50
49 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data); 51 PlatformNotificationData platform_data = ToPlatformNotificationData(web_data);
50 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight, 52 EXPECT_EQ(PlatformNotificationData::NotificationDirectionLeftToRight,
51 platform_data.direction); 53 platform_data.direction);
52 54
53 web_data.direction = blink::WebNotificationData::DirectionRightToLeft; 55 web_data.direction = blink::WebNotificationData::DirectionRightToLeft;
54 56
55 platform_data = ToPlatformNotificationData(web_data); 57 platform_data = ToPlatformNotificationData(web_data);
56 EXPECT_EQ(PlatformNotificationData::NotificationDirectionRightToLeft, 58 EXPECT_EQ(PlatformNotificationData::NotificationDirectionRightToLeft,
57 platform_data.direction); 59 platform_data.direction);
58 } 60 }
59 61
60 TEST(NotificationDataConversionsTest, ToWebNotificationData) { 62 TEST(NotificationDataConversionsTest, ToWebNotificationData) {
61 PlatformNotificationData platform_data; 63 PlatformNotificationData platform_data;
62 platform_data.title = base::ASCIIToUTF16(kNotificationTitle); 64 platform_data.title = base::ASCIIToUTF16(kNotificationTitle);
63 platform_data.direction = 65 platform_data.direction =
64 PlatformNotificationData::NotificationDirectionLeftToRight; 66 PlatformNotificationData::NotificationDirectionLeftToRight;
65 platform_data.lang = kNotificationLang; 67 platform_data.lang = kNotificationLang;
66 platform_data.body = base::ASCIIToUTF16(kNotificationBody); 68 platform_data.body = base::ASCIIToUTF16(kNotificationBody);
67 platform_data.tag = base::ASCIIToUTF16(kNotificationTag); 69 platform_data.tag = base::ASCIIToUTF16(kNotificationTag);
68 platform_data.icon = GURL(kNotificationIconUrl); 70 platform_data.icon = GURL(kNotificationIconUrl);
71 platform_data.silent = true;
69 72
70 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 73 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
71 EXPECT_EQ(kNotificationTitle, web_data.title); 74 EXPECT_EQ(kNotificationTitle, web_data.title);
72 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 75 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
73 web_data.direction); 76 web_data.direction);
74 EXPECT_EQ(kNotificationLang, web_data.lang); 77 EXPECT_EQ(kNotificationLang, web_data.lang);
75 EXPECT_EQ(kNotificationBody, web_data.body); 78 EXPECT_EQ(kNotificationBody, web_data.body);
76 EXPECT_EQ(kNotificationTag, web_data.tag); 79 EXPECT_EQ(kNotificationTag, web_data.tag);
77 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string()); 80 EXPECT_EQ(kNotificationIconUrl, web_data.icon.string());
81 EXPECT_TRUE(web_data.silent);
78 } 82 }
79 83
80 TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) { 84 TEST(NotificationDataConversionsTest, ToWebNotificationDataDirectionality) {
81 PlatformNotificationData platform_data; 85 PlatformNotificationData platform_data;
82 platform_data.direction = 86 platform_data.direction =
83 PlatformNotificationData::NotificationDirectionLeftToRight; 87 PlatformNotificationData::NotificationDirectionLeftToRight;
84 88
85 blink::WebNotificationData web_data = ToWebNotificationData(platform_data); 89 blink::WebNotificationData web_data = ToWebNotificationData(platform_data);
86 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight, 90 EXPECT_EQ(blink::WebNotificationData::DirectionLeftToRight,
87 web_data.direction); 91 web_data.direction);
88 92
89 platform_data.direction = 93 platform_data.direction =
90 PlatformNotificationData::NotificationDirectionRightToLeft; 94 PlatformNotificationData::NotificationDirectionRightToLeft;
91 95
92 web_data = ToWebNotificationData(platform_data); 96 web_data = ToWebNotificationData(platform_data);
93 EXPECT_EQ(blink::WebNotificationData::DirectionRightToLeft, 97 EXPECT_EQ(blink::WebNotificationData::DirectionRightToLeft,
94 web_data.direction); 98 web_data.direction);
95 } 99 }
96 100
97 } // namespace content 101 } // 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