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

Unified Diff: chrome/browser/extensions/api/file_system/consent_provider_unittest.cc

Issue 2924943003: Break ConsentProvider classes into own file (Closed)
Patch Set: rebase Created 3 years, 6 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/extensions/api/file_system/consent_provider_unittest.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
similarity index 55%
copy from chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
copy to chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
index f3ce3def526c5f9b28f80c0120e86b51f0efb87a..1576915349798dd46734be67ddf3fcffd3b2178f 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc
+++ b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
@@ -1,26 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2017 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/extensions/api/file_system/file_system_api.h"
+#include "chrome/browser/extensions/api/file_system/consent_provider.h"
-#include <stddef.h>
+#include <string>
-#include <vector>
-
-#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/run_loop.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/shell_dialogs/select_file_dialog.h"
-
-#if defined(OS_CHROMEOS)
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "base/run_loop.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ -32,59 +21,14 @@
#include "extensions/common/extension_builder.h"
#include "extensions/common/manifest.h"
#include "extensions/common/test_util.h"
-#include "extensions/common/value_builder.h"
-#endif
-
-using extensions::FileSystemChooseEntryFunction;
-using extensions::api::file_system::AcceptOption;
+#include "testing/gtest/include/gtest/gtest.h"
-#if defined(OS_CHROMEOS)
using extensions::file_system_api::ConsentProvider;
using file_manager::Volume;
-#endif
namespace extensions {
namespace {
-void CheckExtensions(const std::vector<base::FilePath::StringType>& expected,
- const std::vector<base::FilePath::StringType>& actual) {
- EXPECT_EQ(expected.size(), actual.size());
- if (expected.size() != actual.size())
- return;
-
- for (size_t i = 0; i < expected.size(); ++i) {
- EXPECT_EQ(expected[i], actual[i]);
- }
-}
-
-AcceptOption BuildAcceptOption(const std::string& description,
- const std::string& mime_types,
- const std::string& extensions) {
- AcceptOption option;
-
- if (!description.empty())
- option.description.reset(new std::string(description));
-
- if (!mime_types.empty()) {
- option.mime_types.reset(new std::vector<std::string>(base::SplitString(
- mime_types, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
- }
-
- if (!extensions.empty()) {
- option.extensions.reset(new std::vector<std::string>(base::SplitString(
- extensions, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)));
- }
-
- return option;
-}
-
-#if defined(OS_WIN)
-#define ToStringType base::UTF8ToWide
-#else
-#define ToStringType
-#endif
-
-#if defined(OS_CHROMEOS)
class TestingConsentProviderDelegate
: public ConsentProvider::DelegateInterface {
public:
@@ -151,11 +95,9 @@ void OnConsentReceived(ConsentProvider::Consent* log,
const ConsentProvider::Consent result) {
*log = result;
}
-#endif
} // namespace
-#if defined(OS_CHROMEOS)
class FileSystemApiConsentProviderTest : public testing::Test {
public:
FileSystemApiConsentProviderTest() {}
@@ -185,134 +127,7 @@ class FileSystemApiConsentProviderTest : public testing::Test {
scoped_user_manager_enabler_;
content::TestBrowserThreadBundle thread_bundle_;
};
-#endif
-
-TEST(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) {
- // AcceptsAllTypes is ignored when no other extensions are available.
- ui::SelectFileDialog::FileTypeInfo file_type_info;
- bool acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), NULL, &acceptsAllTypes);
- EXPECT_TRUE(file_type_info.include_all_files);
- EXPECT_TRUE(file_type_info.extensions.empty());
-
- // Test grouping of multiple types.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- std::vector<AcceptOption> options;
- options.push_back(BuildAcceptOption(std::string(),
- "application/x-chrome-extension", "jso"));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), &options, &acceptsAllTypes);
- EXPECT_FALSE(file_type_info.include_all_files);
- ASSERT_EQ(file_type_info.extensions.size(), (size_t) 1);
- EXPECT_TRUE(file_type_info.extension_description_overrides[0].empty()) <<
- "No override must be specified for boring accept types";
- // Note here (and below) that the expectedTypes are sorted, because we use a
- // set internally to generate the output: thus, the output is sorted.
- std::vector<base::FilePath::StringType> expectedTypes;
- expectedTypes.push_back(ToStringType("crx"));
- expectedTypes.push_back(ToStringType("jso"));
- CheckExtensions(expectedTypes, file_type_info.extensions[0]);
-
- // Test that not satisfying the extension will force all types.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- options.clear();
- options.push_back(
- BuildAcceptOption(std::string(), std::string(), "unrelated"));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- ToStringType(".jso"), &options, &acceptsAllTypes);
- EXPECT_TRUE(file_type_info.include_all_files);
-
- // Test multiple list entries, all containing their own types.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- options.clear();
- options.push_back(BuildAcceptOption(std::string(), std::string(), "jso,js"));
- options.push_back(BuildAcceptOption(std::string(), std::string(), "cpp,cc"));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), &options, &acceptsAllTypes);
- ASSERT_EQ(file_type_info.extensions.size(), options.size());
-
- expectedTypes.clear();
- expectedTypes.push_back(ToStringType("js"));
- expectedTypes.push_back(ToStringType("jso"));
- CheckExtensions(expectedTypes, file_type_info.extensions[0]);
-
- expectedTypes.clear();
- expectedTypes.push_back(ToStringType("cc"));
- expectedTypes.push_back(ToStringType("cpp"));
- CheckExtensions(expectedTypes, file_type_info.extensions[1]);
-
- // Test accept type that causes description override.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- options.clear();
- options.push_back(BuildAcceptOption(std::string(), "image/*", "html"));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), &options, &acceptsAllTypes);
- ASSERT_EQ(file_type_info.extension_description_overrides.size(), (size_t) 1);
- EXPECT_FALSE(file_type_info.extension_description_overrides[0].empty()) <<
- "Accept type \"image/*\" must generate description override";
-
- // Test multiple accept types that cause description override causes us to
- // still present the default.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- options.clear();
- options.push_back(BuildAcceptOption(std::string(), "image/*,audio/*,video/*",
- std::string()));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), &options, &acceptsAllTypes);
- ASSERT_EQ(file_type_info.extension_description_overrides.size(), (size_t) 1);
- EXPECT_TRUE(file_type_info.extension_description_overrides[0].empty());
-
- // Test explicit description override.
- file_type_info = ui::SelectFileDialog::FileTypeInfo();
- options.clear();
- options.push_back(
- BuildAcceptOption("File Types 101", "image/jpeg", std::string()));
- acceptsAllTypes = false;
- FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info,
- base::FilePath::StringType(), &options, &acceptsAllTypes);
- EXPECT_EQ(file_type_info.extension_description_overrides[0],
- base::UTF8ToUTF16("File Types 101"));
-}
-
-TEST(FileSystemApiUnitTest, FileSystemChooseEntryFunctionSuggestionTest) {
- std::string opt_name;
- base::FilePath suggested_name;
- base::FilePath::StringType suggested_extension;
-
- opt_name = std::string("normal_path.txt");
- FileSystemChooseEntryFunction::BuildSuggestion(&opt_name, &suggested_name,
- &suggested_extension);
- EXPECT_FALSE(suggested_name.IsAbsolute());
- EXPECT_EQ(suggested_name.MaybeAsASCII(), "normal_path.txt");
- EXPECT_EQ(suggested_extension, ToStringType("txt"));
-
- // We should provide just the basename, i.e., "path".
- opt_name = std::string("/a/bad/path");
- FileSystemChooseEntryFunction::BuildSuggestion(&opt_name, &suggested_name,
- &suggested_extension);
- EXPECT_FALSE(suggested_name.IsAbsolute());
- EXPECT_EQ(suggested_name.MaybeAsASCII(), "path");
- EXPECT_TRUE(suggested_extension.empty());
-
-#if !defined(OS_WIN)
- // TODO(thorogood): Fix this test on Windows.
- // Filter out absolute paths with no basename.
- opt_name = std::string("/");
- FileSystemChooseEntryFunction::BuildSuggestion(&opt_name, &suggested_name,
- &suggested_extension);
- EXPECT_FALSE(suggested_name.IsAbsolute());
- EXPECT_TRUE(suggested_name.MaybeAsASCII().empty());
- EXPECT_TRUE(suggested_extension.empty());
-#endif
-}
-#if defined(OS_CHROMEOS)
TEST_F(FileSystemApiConsentProviderTest, ForNonKioskApps) {
// Component apps are not granted unless they are whitelisted.
{
@@ -440,6 +255,5 @@ TEST_F(FileSystemApiConsentProviderTest, ForKioskApps) {
EXPECT_EQ(ConsentProvider::CONSENT_REJECTED, result);
}
}
-#endif
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698