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

Side by Side Diff: content/browser/notifications/notification_database_data_unittest.cc

Issue 1313363006: Plumb requireInteraction to PlatformNotificationData & database (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@constructor
Patch Set: Fix includes Created 5 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/strings/string_number_conversions.h" 5 #include "base/strings/string_number_conversions.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "content/browser/notifications/notification_database_data.pb.h" 7 #include "content/browser/notifications/notification_database_data.pb.h"
8 #include "content/browser/notifications/notification_database_data_conversions.h " 8 #include "content/browser/notifications/notification_database_data_conversions.h "
9 #include "content/common/notification_constants.h" 9 #include "content/common/notification_constants.h"
10 #include "content/public/browser/notification_database_data.h" 10 #include "content/public/browser/notification_database_data.h"
(...skipping 25 matching lines...) Expand all
36 PlatformNotificationData notification_data; 36 PlatformNotificationData notification_data;
37 notification_data.title = base::ASCIIToUTF16(kNotificationTitle); 37 notification_data.title = base::ASCIIToUTF16(kNotificationTitle);
38 notification_data.direction = 38 notification_data.direction =
39 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT; 39 PlatformNotificationData::DIRECTION_RIGHT_TO_LEFT;
40 notification_data.lang = kNotificationLang; 40 notification_data.lang = kNotificationLang;
41 notification_data.body = base::ASCIIToUTF16(kNotificationBody); 41 notification_data.body = base::ASCIIToUTF16(kNotificationBody);
42 notification_data.tag = kNotificationTag; 42 notification_data.tag = kNotificationTag;
43 notification_data.icon = GURL(kNotificationIconUrl); 43 notification_data.icon = GURL(kNotificationIconUrl);
44 notification_data.vibration_pattern = vibration_pattern; 44 notification_data.vibration_pattern = vibration_pattern;
45 notification_data.silent = true; 45 notification_data.silent = true;
46 notification_data.require_interaction = true;
46 notification_data.data = developer_data; 47 notification_data.data = developer_data;
47 for (size_t i = 0; i < kPlatformNotificationMaxActions; i++) { 48 for (size_t i = 0; i < kPlatformNotificationMaxActions; i++) {
48 PlatformNotificationAction notification_action; 49 PlatformNotificationAction notification_action;
49 notification_action.action = base::SizeTToString(i); 50 notification_action.action = base::SizeTToString(i);
50 notification_action.title = base::SizeTToString16(i); 51 notification_action.title = base::SizeTToString16(i);
51 notification_data.actions.push_back(notification_action); 52 notification_data.actions.push_back(notification_action);
52 } 53 }
53 54
54 NotificationDatabaseData database_data; 55 NotificationDatabaseData database_data;
55 database_data.notification_id = kNotificationId; 56 database_data.notification_id = kNotificationId;
(...skipping 25 matching lines...) Expand all
81 EXPECT_EQ(notification_data.direction, copied_notification_data.direction); 82 EXPECT_EQ(notification_data.direction, copied_notification_data.direction);
82 EXPECT_EQ(notification_data.lang, copied_notification_data.lang); 83 EXPECT_EQ(notification_data.lang, copied_notification_data.lang);
83 EXPECT_EQ(notification_data.body, copied_notification_data.body); 84 EXPECT_EQ(notification_data.body, copied_notification_data.body);
84 EXPECT_EQ(notification_data.tag, copied_notification_data.tag); 85 EXPECT_EQ(notification_data.tag, copied_notification_data.tag);
85 EXPECT_EQ(notification_data.icon, copied_notification_data.icon); 86 EXPECT_EQ(notification_data.icon, copied_notification_data.icon);
86 87
87 EXPECT_THAT(copied_notification_data.vibration_pattern, 88 EXPECT_THAT(copied_notification_data.vibration_pattern,
88 testing::ElementsAreArray(kNotificationVibrationPattern)); 89 testing::ElementsAreArray(kNotificationVibrationPattern));
89 90
90 EXPECT_EQ(notification_data.silent, copied_notification_data.silent); 91 EXPECT_EQ(notification_data.silent, copied_notification_data.silent);
92 EXPECT_EQ(notification_data.require_interaction,
93 copied_notification_data.require_interaction);
91 94
92 ASSERT_EQ(developer_data.size(), copied_notification_data.data.size()); 95 ASSERT_EQ(developer_data.size(), copied_notification_data.data.size());
93 for (size_t i = 0; i < developer_data.size(); ++i) 96 for (size_t i = 0; i < developer_data.size(); ++i)
94 EXPECT_EQ(developer_data[i], copied_notification_data.data[i]); 97 EXPECT_EQ(developer_data[i], copied_notification_data.data[i]);
95 98
96 ASSERT_EQ(notification_data.actions.size(), 99 ASSERT_EQ(notification_data.actions.size(),
97 copied_notification_data.actions.size()); 100 copied_notification_data.actions.size());
98 for (size_t i = 0; i < notification_data.actions.size(); ++i) { 101 for (size_t i = 0; i < notification_data.actions.size(); ++i) {
99 EXPECT_EQ(notification_data.actions[i].action, 102 EXPECT_EQ(notification_data.actions[i].action,
100 copied_notification_data.actions[i].action); 103 copied_notification_data.actions[i].action);
(...skipping 22 matching lines...) Expand all
123 126
124 NotificationDatabaseData copied_data; 127 NotificationDatabaseData copied_data;
125 ASSERT_TRUE(DeserializeNotificationDatabaseData(serialized_data, 128 ASSERT_TRUE(DeserializeNotificationDatabaseData(serialized_data,
126 &copied_data)); 129 &copied_data));
127 130
128 EXPECT_EQ(directions[i], copied_data.notification_data.direction); 131 EXPECT_EQ(directions[i], copied_data.notification_data.direction);
129 } 132 }
130 } 133 }
131 134
132 } // namespace content 135 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698