Commit be99a31f authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot

[FS] Add tests for file_type_index.

Follow up for fix in https://crrev.com/c/2333036

Bug: 1112122
Change-Id: I4d98da63e7da3aabbb89971344ae10ddf425e5c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339602
Auto-Submit: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795119}
parent 28f296ff
...@@ -32,6 +32,7 @@ class CancellingSelectFileDialog : public ui::SelectFileDialog { ...@@ -32,6 +32,7 @@ class CancellingSelectFileDialog : public ui::SelectFileDialog {
else else
out_params_->file_types = base::nullopt; out_params_->file_types = base::nullopt;
out_params_->owning_window = owning_window; out_params_->owning_window = owning_window;
out_params_->file_type_index = file_type_index;
} }
listener_->FileSelectionCanceled(params); listener_->FileSelectionCanceled(params);
} }
...@@ -73,6 +74,7 @@ class FakeSelectFileDialog : public ui::SelectFileDialog { ...@@ -73,6 +74,7 @@ class FakeSelectFileDialog : public ui::SelectFileDialog {
else else
out_params_->file_types = base::nullopt; out_params_->file_types = base::nullopt;
out_params_->owning_window = owning_window; out_params_->owning_window = owning_window;
out_params_->file_type_index = file_type_index;
} }
if (result_.size() == 1) if (result_.size() == 1)
listener_->FileSelected(result_[0], 0, params); listener_->FileSelected(result_[0], 0, params);
......
...@@ -22,6 +22,7 @@ struct SelectFileDialogParams { ...@@ -22,6 +22,7 @@ struct SelectFileDialogParams {
ui::SelectFileDialog::Type type = ui::SelectFileDialog::SELECT_NONE; ui::SelectFileDialog::Type type = ui::SelectFileDialog::SELECT_NONE;
base::Optional<ui::SelectFileDialog::FileTypeInfo> file_types; base::Optional<ui::SelectFileDialog::FileTypeInfo> file_types;
gfx::NativeWindow owning_window = {}; gfx::NativeWindow owning_window = {};
int file_type_index = -1;
}; };
// A fake ui::SelectFileDialog, which will cancel the file selection instead of // A fake ui::SelectFileDialog, which will cancel the file selection instead of
......
...@@ -54,6 +54,7 @@ TEST_F(FileSystemChooserTest, EmptyAccepts) { ...@@ -54,6 +54,7 @@ TEST_F(FileSystemChooserTest, EmptyAccepts) {
EXPECT_EQ(0u, dialog_params.file_types->extensions.size()); EXPECT_EQ(0u, dialog_params.file_types->extensions.size());
EXPECT_EQ(0u, EXPECT_EQ(0u,
dialog_params.file_types->extension_description_overrides.size()); dialog_params.file_types->extension_description_overrides.size());
EXPECT_EQ(0, dialog_params.file_type_index);
} }
TEST_F(FileSystemChooserTest, EmptyAcceptsIgnoresIncludeAcceptsAll) { TEST_F(FileSystemChooserTest, EmptyAcceptsIgnoresIncludeAcceptsAll) {
...@@ -68,6 +69,7 @@ TEST_F(FileSystemChooserTest, EmptyAcceptsIgnoresIncludeAcceptsAll) { ...@@ -68,6 +69,7 @@ TEST_F(FileSystemChooserTest, EmptyAcceptsIgnoresIncludeAcceptsAll) {
EXPECT_EQ(0u, dialog_params.file_types->extensions.size()); EXPECT_EQ(0u, dialog_params.file_types->extensions.size());
EXPECT_EQ(0u, EXPECT_EQ(0u,
dialog_params.file_types->extension_description_overrides.size()); dialog_params.file_types->extension_description_overrides.size());
EXPECT_EQ(0, dialog_params.file_type_index);
} }
TEST_F(FileSystemChooserTest, AcceptsMimeTypes) { TEST_F(FileSystemChooserTest, AcceptsMimeTypes) {
...@@ -86,6 +88,7 @@ TEST_F(FileSystemChooserTest, AcceptsMimeTypes) { ...@@ -86,6 +88,7 @@ TEST_F(FileSystemChooserTest, AcceptsMimeTypes) {
ASSERT_TRUE(dialog_params.file_types); ASSERT_TRUE(dialog_params.file_types);
EXPECT_TRUE(dialog_params.file_types->include_all_files); EXPECT_TRUE(dialog_params.file_types->include_all_files);
ASSERT_EQ(2u, dialog_params.file_types->extensions.size()); ASSERT_EQ(2u, dialog_params.file_types->extensions.size());
EXPECT_EQ(1, dialog_params.file_type_index);
EXPECT_TRUE(base::Contains(dialog_params.file_types->extensions[0], EXPECT_TRUE(base::Contains(dialog_params.file_types->extensions[0],
FILE_PATH_LITERAL("text"))); FILE_PATH_LITERAL("text")));
...@@ -124,6 +127,7 @@ TEST_F(FileSystemChooserTest, AcceptsExtensions) { ...@@ -124,6 +127,7 @@ TEST_F(FileSystemChooserTest, AcceptsExtensions) {
ASSERT_TRUE(dialog_params.file_types); ASSERT_TRUE(dialog_params.file_types);
EXPECT_TRUE(dialog_params.file_types->include_all_files); EXPECT_TRUE(dialog_params.file_types->include_all_files);
ASSERT_EQ(1u, dialog_params.file_types->extensions.size()); ASSERT_EQ(1u, dialog_params.file_types->extensions.size());
EXPECT_EQ(1, dialog_params.file_type_index);
ASSERT_EQ(2u, dialog_params.file_types->extensions[0].size()); ASSERT_EQ(2u, dialog_params.file_types->extensions[0].size());
EXPECT_EQ(dialog_params.file_types->extensions[0][0], EXPECT_EQ(dialog_params.file_types->extensions[0][0],
...@@ -150,6 +154,7 @@ TEST_F(FileSystemChooserTest, AcceptsExtensionsAndMimeTypes) { ...@@ -150,6 +154,7 @@ TEST_F(FileSystemChooserTest, AcceptsExtensionsAndMimeTypes) {
ASSERT_TRUE(dialog_params.file_types); ASSERT_TRUE(dialog_params.file_types);
EXPECT_FALSE(dialog_params.file_types->include_all_files); EXPECT_FALSE(dialog_params.file_types->include_all_files);
ASSERT_EQ(1u, dialog_params.file_types->extensions.size()); ASSERT_EQ(1u, dialog_params.file_types->extensions.size());
EXPECT_EQ(1, dialog_params.file_type_index);
ASSERT_GE(dialog_params.file_types->extensions[0].size(), 4u); ASSERT_GE(dialog_params.file_types->extensions[0].size(), 4u);
EXPECT_EQ(dialog_params.file_types->extensions[0][0], EXPECT_EQ(dialog_params.file_types->extensions[0][0],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment