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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/notifications/notifications_apitest.cc

Issue 20136004: Allow partial update for notification update API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trybots Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/notifications/notifications_api.cc ('k') | chrome/browser/notifications/balloon_collection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/notifications/notifications_apitest.cc
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index 5ea2a9fa1296b6b6a5e0b5b77ef523f2cb83fb88..1b38534185f780e7ffd655d4a17f15b95129d362 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -191,43 +191,94 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestIdUsage) {
}
IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBaseFormatNotification) {
- scoped_refptr<extensions::NotificationsCreateFunction>
- notification_create_function(
- new extensions::NotificationsCreateFunction());
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
- notification_create_function->set_extension(empty_extension.get());
- notification_create_function->set_has_callback(true);
+ // Create a new notification with the minimum required properties.
+ {
+ scoped_refptr<extensions::NotificationsCreateFunction>
+ notification_create_function(
+ new extensions::NotificationsCreateFunction());
+ notification_create_function->set_extension(empty_extension.get());
+ notification_create_function->set_has_callback(true);
- scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- notification_create_function.get(),
- "[\"\", "
- "{"
- "\"type\": \"basic\","
- "\"iconUrl\": \"an/image/that/does/not/exist.png\","
- "\"title\": \"Attention!\","
- "\"message\": \"Check out Cirque du Soleil\","
- "\"priority\": 1,"
- "\"eventTime\": 1234567890.12345678,"
- "\"buttons\": ["
- " {"
- " \"title\": \"Up\","
- " \"iconUrl\":\"http://www.google.com/logos/2012/\""
- " },"
- " {"
- " \"title\": \"Down\"" // note: no iconUrl
- " }"
- "],"
- "\"expandedMessage\": \"This is a longer expanded message.\","
- "\"imageUrl\": \"http://www.google.com/logos/2012/election12-hp.jpg\""
- "}]",
- browser(),
- utils::NONE));
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_create_function.get(),
+ "[\"\", "
+ "{"
+ "\"type\": \"basic\","
+ "\"iconUrl\": \"an/image/that/does/not/exist.png\","
+ "\"title\": \"Attention!\","
+ "\"message\": \"Check out Cirque du Soleil\""
+ "}]",
+ browser(),
+ utils::NONE));
- std::string notification_id;
- ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
- ASSERT_TRUE(result->GetAsString(&notification_id));
- ASSERT_TRUE(notification_id.length() > 0);
+ std::string notification_id;
+ ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
+ ASSERT_TRUE(result->GetAsString(&notification_id));
+ ASSERT_TRUE(notification_id.length() > 0);
+ }
+
+ // Create another new notification with more than the required properties.
+ {
+ scoped_refptr<extensions::NotificationsCreateFunction>
+ notification_create_function(
+ new extensions::NotificationsCreateFunction());
+ notification_create_function->set_extension(empty_extension.get());
+ notification_create_function->set_has_callback(true);
+
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_create_function.get(),
+ "[\"\", "
+ "{"
+ "\"type\": \"basic\","
+ "\"iconUrl\": \"an/image/that/does/not/exist.png\","
+ "\"title\": \"Attention!\","
+ "\"message\": \"Check out Cirque du Soleil\","
+ "\"priority\": 1,"
+ "\"eventTime\": 1234567890.12345678,"
+ "\"buttons\": ["
+ " {"
+ " \"title\": \"Up\","
+ " \"iconUrl\":\"http://www.google.com/logos/2012/\""
+ " },"
+ " {"
+ " \"title\": \"Down\"" // note: no iconUrl
+ " }"
+ "],"
+ "\"expandedMessage\": \"This is a longer expanded message.\","
+ "\"imageUrl\": \"http://www.google.com/logos/2012/election12-hp.jpg\""
+ "}]",
+ browser(),
+ utils::NONE));
+
+ std::string notification_id;
+ ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
+ ASSERT_TRUE(result->GetAsString(&notification_id));
+ ASSERT_TRUE(notification_id.length() > 0);
+ }
+
+ // Error case: try to create a new notification with some required properties
+ // missing.
+ {
+ scoped_refptr<extensions::NotificationsCreateFunction>
+ notification_create_function(
+ new extensions::NotificationsCreateFunction());
+ notification_create_function->set_extension(empty_extension.get());
+ notification_create_function->set_has_callback(true);
+
+ utils::RunFunction(
+ notification_create_function.get(),
+ "[\"\", "
+ "{"
+ "\"type\": \"basic\","
+ "\"iconUrl\": \"an/image/that/does/not/exist.png\""
dewittj 2013/07/25 20:16:26 Can you add some more expectations to this test th
+ "}]",
+ browser(),
+ utils::NONE);
+
+ EXPECT_FALSE(notification_create_function->GetError().empty());
+ }
}
IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestMultipleItemNotification) {
@@ -399,6 +450,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestByUser) {
IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestProgressNotification) {
scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
+ // Create a new progress notification.
+ std::string notification_id;
{
scoped_refptr<extensions::NotificationsCreateFunction>
notification_create_function(
@@ -421,12 +474,35 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestProgressNotification) {
browser(),
utils::NONE));
- std::string notification_id;
EXPECT_EQ(base::Value::TYPE_STRING, result->GetType());
EXPECT_TRUE(result->GetAsString(&notification_id));
EXPECT_TRUE(notification_id.length() > 0);
}
+ // Update the progress property only.
+ {
+ scoped_refptr<extensions::NotificationsUpdateFunction>
+ notification_function(
+ new extensions::NotificationsUpdateFunction());
+ notification_function->set_extension(empty_extension.get());
+ notification_function->set_has_callback(true);
+
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_function.get(),
+ "[\"" + notification_id +
+ "\", "
+ "{"
+ "\"progress\": 60"
+ "}]",
+ browser(),
+ utils::NONE));
+
+ EXPECT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
+ bool copy_bool_value = false;
+ EXPECT_TRUE(result->GetAsBoolean(&copy_bool_value));
+ EXPECT_TRUE(copy_bool_value);
+ }
+
// Error case: progress value provided for non-progress type.
{
scoped_refptr<extensions::NotificationsCreateFunction>
@@ -502,3 +578,82 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestProgressNotification) {
EXPECT_FALSE(notification_create_function->GetError().empty());
}
}
+
+IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestPartialUpdate) {
+ scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
+
+ // Create a new notification.
+ std::string notification_id;
+ {
+ scoped_refptr<extensions::NotificationsCreateFunction>
+ notification_function(
+ new extensions::NotificationsCreateFunction());
+ notification_function->set_extension(empty_extension.get());
+ notification_function->set_has_callback(true);
+
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_function.get(),
+ "[\"\", " // Empty string: ask API to generate ID
+ "{"
+ "\"type\": \"basic\","
+ "\"iconUrl\": \"an/image/that/does/not/exist.png\","
+ "\"title\": \"Attention!\","
+ "\"message\": \"Check out Cirque du Soleil\""
+ "}]",
+ browser(),
+ utils::NONE));
+
+ ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
+ ASSERT_TRUE(result->GetAsString(&notification_id));
+ ASSERT_TRUE(notification_id.length() > 0);
+ }
+
+ // Update a few properties in the existing notification.
+ {
+ scoped_refptr<extensions::NotificationsUpdateFunction>
+ notification_function(
+ new extensions::NotificationsUpdateFunction());
+ notification_function->set_extension(empty_extension.get());
+ notification_function->set_has_callback(true);
+
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_function.get(),
+ "[\"" + notification_id +
+ "\", "
+ "{"
+ "\"title\": \"Changed!\","
+ "\"message\": \"Too late! The show ended yesterday\""
+ "}]",
+ browser(),
+ utils::NONE));
+
+ ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
+ bool copy_bool_value = false;
+ ASSERT_TRUE(result->GetAsBoolean(&copy_bool_value));
+ ASSERT_TRUE(copy_bool_value);
+ }
+
+ // Update another property in the existing notification.
+ {
+ scoped_refptr<extensions::NotificationsUpdateFunction>
+ notification_function(
+ new extensions::NotificationsUpdateFunction());
+ notification_function->set_extension(empty_extension.get());
+ notification_function->set_has_callback(true);
+
+ scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
+ notification_function.get(),
+ "[\"" + notification_id +
+ "\", "
+ "{"
+ "\"priority\": 2"
+ "}]",
+ browser(),
+ utils::NONE));
+
+ ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
+ bool copy_bool_value = false;
+ ASSERT_TRUE(result->GetAsBoolean(&copy_bool_value));
+ ASSERT_TRUE(copy_bool_value);
+ }
+}
« no previous file with comments | « chrome/browser/extensions/api/notifications/notifications_api.cc ('k') | chrome/browser/notifications/balloon_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698