Index: chrome/browser/installable/installable_checker_unittest.cc |
diff --git a/chrome/browser/banners/app_banner_data_fetcher_unittest.cc b/chrome/browser/installable/installable_checker_unittest.cc |
similarity index 53% |
copy from chrome/browser/banners/app_banner_data_fetcher_unittest.cc |
copy to chrome/browser/installable/installable_checker_unittest.cc |
index 1de8aefb86109a7dea0715afa8d38f0c16b42a3f..ff1190feda1d99451477dca8cc3bf7fd0335950f 100644 |
--- a/chrome/browser/banners/app_banner_data_fetcher_unittest.cc |
+++ b/chrome/browser/installable/installable_checker_unittest.cc |
@@ -1,18 +1,18 @@ |
-// Copyright 2015 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/banners/app_banner_data_fetcher.h" |
+#include "chrome/browser/installable/installable_checker.h" |
#include "base/strings/utf_string_conversions.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/WebKit/public/platform/WebDisplayMode.h" |
-namespace banners { |
+namespace installable { |
-class AppBannerDataFetcherUnitTest : public testing::Test { |
+class InstallableCheckerUnitTest : public testing::Test { |
public: |
- AppBannerDataFetcherUnitTest() { } |
+ InstallableCheckerUnitTest() : checker_(new InstallableChecker(nullptr)) { } |
protected: |
static base::NullableString16 ToNullableUTF16(const std::string& str) { |
@@ -34,115 +34,160 @@ class AppBannerDataFetcherUnitTest : public testing::Test { |
return manifest; |
} |
- static bool IsManifestValid(const content::Manifest& manifest) { |
- // The second argument is the web_contents pointer, which is used for |
- // developer debug logging to the console. The logging is skipped inside the |
- // method if a null web_contents pointer is provided, so this is safe. |
- // The third argument is the is_debug_mode boolean value, which is true only |
- // when it is triggered by the developer's action in DevTools. |
- return AppBannerDataFetcher::IsManifestValidForWebApp(manifest, nullptr, |
- false); |
+ bool IsManifestValid(const content::Manifest& manifest) { |
+ // Explicitly reset the error code before running the method. |
+ checker_->valid_webapp_manifest_error_ = NoErrorDetected; |
+ return checker_->IsManifestValidForWebApp(manifest); |
} |
+ |
+ ErrorCode GetErrorCode() { |
+ return checker_->valid_webapp_manifest_error_; |
+ } |
+ |
+ private: |
+ std::unique_ptr<InstallableChecker> checker_; |
}; |
-TEST_F(AppBannerDataFetcherUnitTest, EmptyManifestIsInvalid) { |
+TEST_F(InstallableCheckerUnitTest, EmptyManifestIsInvalid) { |
content::Manifest manifest; |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestEmpty, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, CheckMinimalValidManifest) { |
+TEST_F(InstallableCheckerUnitTest, CheckMinimalValidManifest) { |
content::Manifest manifest = GetValidManifest(); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresNameORShortName) { |
+TEST_F(InstallableCheckerUnitTest, ManifestRequiresNameOrShortName) { |
content::Manifest manifest = GetValidManifest(); |
manifest.name = base::NullableString16(); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
manifest.name = ToNullableUTF16("foo"); |
manifest.short_name = base::NullableString16(); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
manifest.name = base::NullableString16(); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingNameOrShortName, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresNonEmptyNameORShortName) { |
+TEST_F(InstallableCheckerUnitTest, ManifestRequiresNonEmptyNameORShortName) { |
content::Manifest manifest = GetValidManifest(); |
manifest.name = ToNullableUTF16(""); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
manifest.name = ToNullableUTF16("foo"); |
manifest.short_name = ToNullableUTF16(""); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
manifest.name = ToNullableUTF16(""); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingNameOrShortName, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresValidStartURL) { |
+TEST_F(InstallableCheckerUnitTest, ManifestRequiresValidStartURL) { |
content::Manifest manifest = GetValidManifest(); |
manifest.start_url = GURL(); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(StartUrlNotValid, GetErrorCode()); |
manifest.start_url = GURL("/"); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(StartUrlNotValid, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresImagePNG) { |
+TEST_F(InstallableCheckerUnitTest, ManifestRequiresImagePNG) { |
content::Manifest manifest = GetValidManifest(); |
manifest.icons[0].type = ToNullableUTF16("image/gif"); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingSuitableIcon, GetErrorCode()); |
+ |
manifest.icons[0].type = base::NullableString16(); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingSuitableIcon, GetErrorCode()); |
+ |
+ // If the type is null, the icon src will be checked instead. |
+ manifest.icons[0].src = GURL("http://example.com/icon.png"); |
+ EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
+ |
+ // Capital file extension is also permissible. |
+ manifest.icons[0].src = GURL("http://example.com/icon.PNG"); |
+ EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
+ |
+ // Non-png extensions are rejected. |
+ manifest.icons[0].src = GURL("http://example.com/icon.gif"); |
+ EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingSuitableIcon, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresMinimalSize) { |
+TEST_F(InstallableCheckerUnitTest, ManifestRequiresMinimalSize) { |
content::Manifest manifest = GetValidManifest(); |
// The icon MUST be 144x144 size at least. |
manifest.icons[0].sizes[0] = gfx::Size(1, 1); |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingSuitableIcon, GetErrorCode()); |
+ |
+ manifest.icons[0].sizes[0] = gfx::Size(143, 143); |
+ EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestMissingSuitableIcon, GetErrorCode()); |
// If one of the sizes match the requirement, it should be accepted. |
manifest.icons[0].sizes.push_back(gfx::Size(144, 144)); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
// Higher than the required size is okay. |
manifest.icons[0].sizes[1] = gfx::Size(200, 200); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
// Non-square is okay. |
manifest.icons[0].sizes[1] = gfx::Size(144, 200); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
// The representation of the keyword 'any' should be recognized. |
manifest.icons[0].sizes[1] = gfx::Size(0, 0); |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
} |
-TEST_F(AppBannerDataFetcherUnitTest, ManifestDisplayStandaloneFullscreen) { |
+TEST_F(InstallableCheckerUnitTest, ManifestDisplayStandaloneFullscreen) { |
content::Manifest manifest = GetValidManifest(); |
manifest.display = blink::WebDisplayModeUndefined; |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestDisplayIsNotStandaloneOrFullscreen, GetErrorCode()); |
manifest.display = blink::WebDisplayModeBrowser; |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestDisplayIsNotStandaloneOrFullscreen, GetErrorCode()); |
manifest.display = blink::WebDisplayModeMinimalUi; |
EXPECT_FALSE(IsManifestValid(manifest)); |
+ EXPECT_EQ(ManifestDisplayIsNotStandaloneOrFullscreen, GetErrorCode()); |
manifest.display = blink::WebDisplayModeStandalone; |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
manifest.display = blink::WebDisplayModeFullscreen; |
EXPECT_TRUE(IsManifestValid(manifest)); |
+ EXPECT_EQ(NoErrorDetected, GetErrorCode()); |
} |
-} // namespace banners |
+} // namespace installable |