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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc

Issue 1541113003: Revert of Change extension icon load errors to warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: manual rebase Created 4 years, 12 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/memory/linked_ptr.h" 5 #include "base/memory/linked_ptr.h"
6 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" 6 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
7 #include "extensions/common/constants.h" 7 #include "extensions/common/constants.h"
8 #include "extensions/common/extension.h" 8 #include "extensions/common/extension.h"
9 #include "extensions/common/extension_icon_set.h" 9 #include "extensions/common/extension_icon_set.h"
10 #include "extensions/common/manifest_handlers/icons_handler.h" 10 #include "extensions/common/manifest_handlers/icons_handler.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 class IconsManifestTest : public ChromeManifestTest { 15 class IconsManifestTest : public ChromeManifestTest {
16 }; 16 };
17 17
18 // Icons that don't exist on disk should be ignored (for most manifest
19 // locations).
20 TEST_F(IconsManifestTest, IgnoreNonExistentIcons) {
21 scoped_refptr<extensions::Extension> extension(
22 LoadAndExpectSuccess("normalize_icon_paths.json", Manifest::INTERNAL));
23 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
24
25 EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
26 ExtensionIconSet::MATCH_EXACTLY));
27 EXPECT_EQ("", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
28 ExtensionIconSet::MATCH_EXACTLY));
29 }
30
31 TEST_F(IconsManifestTest, NormalizeIconPaths) { 18 TEST_F(IconsManifestTest, NormalizeIconPaths) {
32 scoped_refptr<extensions::Extension> extension( 19 scoped_refptr<extensions::Extension> extension(
33 LoadAndExpectSuccess("normalize_icon_paths.json", Manifest::UNPACKED)); 20 LoadAndExpectSuccess("normalize_icon_paths.json"));
34 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get()); 21 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
35 22
36 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY, 23 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
37 ExtensionIconSet::MATCH_EXACTLY)); 24 ExtensionIconSet::MATCH_EXACTLY));
38 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM, 25 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
39 ExtensionIconSet::MATCH_EXACTLY)); 26 ExtensionIconSet::MATCH_EXACTLY));
40 } 27 }
41 28
42 TEST_F(IconsManifestTest, IconSizes) { 29 TEST_F(IconsManifestTest, IconSizes) {
43 scoped_refptr<extensions::Extension> extension( 30 scoped_refptr<extensions::Extension> extension(
44 LoadAndExpectSuccess("init_icon_size.json", Manifest::UNPACKED)); 31 LoadAndExpectSuccess("init_icon_size.json"));
45 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get()); 32 const ExtensionIconSet& icons = IconsInfo::GetIcons(extension.get());
46 33
47 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY, 34 EXPECT_EQ("16.png", icons.Get(extension_misc::EXTENSION_ICON_BITTY,
48 ExtensionIconSet::MATCH_EXACTLY)); 35 ExtensionIconSet::MATCH_EXACTLY));
49 EXPECT_EQ("24.png", icons.Get(extension_misc::EXTENSION_ICON_SMALLISH, 36 EXPECT_EQ("24.png", icons.Get(extension_misc::EXTENSION_ICON_SMALLISH,
50 ExtensionIconSet::MATCH_EXACTLY)); 37 ExtensionIconSet::MATCH_EXACTLY));
51 EXPECT_EQ("32.png", icons.Get(extension_misc::EXTENSION_ICON_SMALL, 38 EXPECT_EQ("32.png", icons.Get(extension_misc::EXTENSION_ICON_SMALL,
52 ExtensionIconSet::MATCH_EXACTLY)); 39 ExtensionIconSet::MATCH_EXACTLY));
53 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM, 40 EXPECT_EQ("48.png", icons.Get(extension_misc::EXTENSION_ICON_MEDIUM,
54 ExtensionIconSet::MATCH_EXACTLY)); 41 ExtensionIconSet::MATCH_EXACTLY));
55 EXPECT_EQ("128.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE, 42 EXPECT_EQ("128.png", icons.Get(extension_misc::EXTENSION_ICON_LARGE,
56 ExtensionIconSet::MATCH_EXACTLY)); 43 ExtensionIconSet::MATCH_EXACTLY));
57 EXPECT_EQ("256.png", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE, 44 EXPECT_EQ("256.png", icons.Get(extension_misc::EXTENSION_ICON_EXTRA_LARGE,
58 ExtensionIconSet::MATCH_EXACTLY)); 45 ExtensionIconSet::MATCH_EXACTLY));
59 EXPECT_EQ("512.png", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR, 46 EXPECT_EQ("512.png", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR,
60 ExtensionIconSet::MATCH_EXACTLY)); 47 ExtensionIconSet::MATCH_EXACTLY));
61 48
62 // Any old size will be accepted. 49 // Any old size will be accepted.
63 EXPECT_EQ("300.png", IconsInfo::GetIcons(extension.get()) 50 EXPECT_EQ("300.png", IconsInfo::GetIcons(extension.get())
64 .Get(300, ExtensionIconSet::MATCH_EXACTLY)); 51 .Get(300, ExtensionIconSet::MATCH_EXACTLY));
65 } 52 }
66 53
67 } // namespace extensions 54 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698