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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/extension_icon_set_unittest.cc

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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/common/extensions/extension_icon_set.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_icon_set_unittest.cc
diff --git a/chrome/common/extensions/extension_icon_set_unittest.cc b/chrome/common/extensions/extension_icon_set_unittest.cc
index 433e0c86bf6e9b408dbaa13ec15ba19972fc5888..1202cda17841150e6a609fd0160241b7e623a895 100644
--- a/chrome/common/extensions/extension_icon_set_unittest.cc
+++ b/chrome/common/extensions/extension_icon_set_unittest.cc
@@ -4,48 +4,51 @@
#include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/extension_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace {
+
TEST(ExtensionIconSet, Basic) {
ExtensionIconSet icons;
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_BIGGER));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_SMALLER));
EXPECT_TRUE(icons.map().empty());
- icons.Add(ExtensionIconSet::EXTENSION_ICON_LARGE, "large.png");
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ icons.Add(extension_misc::EXTENSION_ICON_LARGE, "large.png");
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_BIGGER));
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_LARGE,
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
ExtensionIconSet::MATCH_SMALLER));
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
ExtensionIconSet::MATCH_BIGGER));
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_EXTRA_LARGE,
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE,
ExtensionIconSet::MATCH_SMALLER));
EXPECT_EQ("large.png", icons.Get(0, ExtensionIconSet::MATCH_BIGGER));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
ExtensionIconSet::MATCH_SMALLER));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_EXTRA_LARGE,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE,
ExtensionIconSet::MATCH_BIGGER));
- icons.Add(ExtensionIconSet::EXTENSION_ICON_SMALLISH, "smallish.png");
- icons.Add(ExtensionIconSet::EXTENSION_ICON_SMALL, "small.png");
- icons.Add(ExtensionIconSet::EXTENSION_ICON_EXTRA_LARGE, "extra_large.png");
+ icons.Add(extension_misc::EXTENSION_ICON_SMALLISH, "smallish.png");
+ icons.Add(extension_misc::EXTENSION_ICON_SMALL, "small.png");
+ icons.Add(extension_misc::EXTENSION_ICON_EXTRA_LARGE, "extra_large.png");
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
ExtensionIconSet::MATCH_EXACTLY));
- EXPECT_EQ("small.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+ EXPECT_EQ("small.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
ExtensionIconSet::MATCH_SMALLER));
- EXPECT_EQ("large.png", icons.Get(ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+ EXPECT_EQ("large.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
ExtensionIconSet::MATCH_BIGGER));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_BITTY,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
ExtensionIconSet::MATCH_SMALLER));
- EXPECT_EQ("", icons.Get(ExtensionIconSet::EXTENSION_ICON_GIGANTOR,
+ EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR,
ExtensionIconSet::MATCH_BIGGER));
}
@@ -53,8 +56,8 @@ TEST(ExtensionIconSet, Values) {
ExtensionIconSet icons;
EXPECT_FALSE(icons.ContainsPath("foo"));
- icons.Add(ExtensionIconSet::EXTENSION_ICON_BITTY, "foo");
- icons.Add(ExtensionIconSet::EXTENSION_ICON_GIGANTOR, "bar");
+ icons.Add(extension_misc::EXTENSION_ICON_BITTY, "foo");
+ icons.Add(extension_misc::EXTENSION_ICON_GIGANTOR, "bar");
EXPECT_TRUE(icons.ContainsPath("foo"));
EXPECT_TRUE(icons.ContainsPath("bar"));
@@ -67,22 +70,24 @@ TEST(ExtensionIconSet, Values) {
TEST(ExtensionIconSet, FindSize) {
ExtensionIconSet icons;
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_INVALID,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_INVALID,
icons.GetIconSizeFromPath("foo"));
- icons.Add(ExtensionIconSet::EXTENSION_ICON_BITTY, "foo");
- icons.Add(ExtensionIconSet::EXTENSION_ICON_GIGANTOR, "bar");
+ icons.Add(extension_misc::EXTENSION_ICON_BITTY, "foo");
+ icons.Add(extension_misc::EXTENSION_ICON_GIGANTOR, "bar");
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_BITTY,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_BITTY,
icons.GetIconSizeFromPath("foo"));
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_GIGANTOR,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_GIGANTOR,
icons.GetIconSizeFromPath("bar"));
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_INVALID,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_INVALID,
icons.GetIconSizeFromPath("baz"));
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_INVALID,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_INVALID,
icons.GetIconSizeFromPath(""));
icons.Clear();
- EXPECT_EQ(ExtensionIconSet::EXTENSION_ICON_INVALID,
+ EXPECT_EQ(extension_misc::EXTENSION_ICON_INVALID,
icons.GetIconSizeFromPath("foo"));
}
+
+} // namespace
« no previous file with comments | « chrome/common/extensions/extension_icon_set.cc ('k') | chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698