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

Unified Diff: chrome/browser/chromeos/file_manager/file_tasks_unittest.cc

Issue 23740004: Files.app: Let the file browser private tasks APIs use the auto-generated helper classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed the test. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
index e273f3b0d685631ee86375d5cb449040a5dbf496..a7dc9dc39ab4cc573fc9d23176e749c16e699be6 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks_unittest.cc
@@ -56,23 +56,12 @@ TEST(FileManagerFileTasksTest,
GURL("http://example.com/icon.png"),
true /* is_default */);
- scoped_ptr<base::DictionaryValue> dictionary(
- full_descriptor.AsDictionaryValue());
- std::string task_id;
- EXPECT_TRUE(dictionary->GetString("taskId", &task_id));
+ const std::string task_id =
+ TaskDescriptorToId(full_descriptor.task_descriptor());
EXPECT_EQ("app-id|file|action-id", task_id);
-
- std::string icon_url;
- EXPECT_TRUE(dictionary->GetString("iconUrl", &icon_url));
- EXPECT_EQ("http://example.com/icon.png", icon_url);
-
- std::string title;
- EXPECT_TRUE(dictionary->GetString("title", &title));
- EXPECT_EQ("task title", title);
-
- bool is_default = false;
- EXPECT_TRUE(dictionary->GetBoolean("isDefault", &is_default));
- EXPECT_TRUE(is_default);
+ EXPECT_EQ("http://example.com/icon.png", full_descriptor.icon_url().spec());
+ EXPECT_EQ("task title", full_descriptor.task_title());
+ EXPECT_TRUE(full_descriptor.is_default());
}
TEST(FileManagerFileTasksTest,
@@ -85,22 +74,12 @@ TEST(FileManagerFileTasksTest,
GURL(), // No icon URL.
false /* is_default */);
- scoped_ptr<base::DictionaryValue> dictionary(
- full_descriptor.AsDictionaryValue());
- std::string task_id;
- EXPECT_TRUE(dictionary->GetString("taskId", &task_id));
+ const std::string task_id =
+ TaskDescriptorToId(full_descriptor.task_descriptor());
EXPECT_EQ("app-id|drive|action-id", task_id);
-
- std::string icon_url;
- EXPECT_FALSE(dictionary->GetString("iconUrl", &icon_url));
-
- std::string title;
- EXPECT_TRUE(dictionary->GetString("title", &title));
- EXPECT_EQ("task title", title);
-
- bool is_default = false;
- EXPECT_TRUE(dictionary->GetBoolean("isDefault", &is_default));
- EXPECT_FALSE(is_default);
+ EXPECT_TRUE(full_descriptor.icon_url().is_empty());
+ EXPECT_EQ("task title", full_descriptor.task_title());
+ EXPECT_FALSE(full_descriptor.is_default());
}
TEST(FileManagerFileTasksTest, MakeTaskID) {
« no previous file with comments | « chrome/browser/chromeos/file_manager/file_tasks.cc ('k') | chrome/common/extensions/api/file_browser_private.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698