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

Unified Diff: chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc

Issue 12703012: Have media gallery (through native media file util) use MIME sniffer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Indentation fix. Created 7 years, 7 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/browser/media_galleries/fileapi/native_media_file_util.cc ('k') | net/base/mime_sniffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
index 32de0e44d5d853d632d81a9884514c17bb693597..1c20453c083a0f7d353fc0a1bc808607cf2499c6 100644
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
@@ -40,20 +40,28 @@ struct FilteringTestCase {
const base::FilePath::CharType* path;
bool is_directory;
bool visible;
+ bool media_file;
+ const char* content;
};
const FilteringTestCase kFilteringTestCases[] = {
// Directory should always be visible.
- { FPL("hoge"), true, true },
- { FPL("fuga.jpg"), true, true },
- { FPL("piyo.txt"), true, true },
- { FPL("moga.cod"), true, true },
+ { FPL("hoge"), true, true, false, NULL },
+ { FPL("fuga.jpg"), true, true, false, NULL },
+ { FPL("piyo.txt"), true, true, false, NULL },
+ { FPL("moga.cod"), true, true, false, NULL },
// File should be visible if it's a supported media file.
- { FPL("foo"), false, false }, // File without extension.
- { FPL("bar.jpg"), false, true }, // Supported media file.
- { FPL("baz.txt"), false, false }, // Non-media file.
- { FPL("foobar.cod"), false, false }, // Unsupported media file.
+ // File without extension.
+ { FPL("foo"), false, false, false, "abc" },
+ // Supported media file.
+ { FPL("bar.jpg"), false, true, true, "\xFF\xD8\xFF" },
+ // Unsupported masquerading file.
+ { FPL("sna.jpg"), false, true, false, "abc" },
+ // Non-media file.
+ { FPL("baz.txt"), false, false, false, "abc" },
+ // Unsupported media file.
+ { FPL("foobar.cod"), false, false, false, "abc" },
};
void ExpectEqHelper(const std::string& test_name,
@@ -93,10 +101,9 @@ void PopulateDirectoryWithTestCases(const base::FilePath& dir,
if (test_cases[i].is_directory) {
ASSERT_TRUE(file_util::CreateDirectory(path));
} else {
- bool created = false;
- ASSERT_EQ(base::PLATFORM_FILE_OK,
- fileapi::NativeFileUtil::EnsureFileExists(path, &created));
- ASSERT_TRUE(created);
+ ASSERT_TRUE(test_cases[i].content != NULL);
+ int len = strlen(test_cases[i].content);
+ ASSERT_EQ(len, file_util::WriteFile(path, test_cases[i].content, len));
}
}
}
@@ -238,7 +245,7 @@ TEST_F(NativeMediaFileUtilTest, ReadDirectoryFiltering) {
url, base::Bind(&DidReadDirectory, &content, &completed));
MessageLoop::current()->RunUntilIdle();
EXPECT_TRUE(completed);
- EXPECT_EQ(5u, content.size());
+ EXPECT_EQ(6u, content.size());
for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
base::FilePath::StringType name =
@@ -611,4 +618,36 @@ TEST_F(NativeMediaFileUtilTest, TouchFileFiltering) {
}
}
+void CreateSnapshotCallback(base::PlatformFileError* error,
+ base::PlatformFileError result, const base::PlatformFileInfo&,
+ const base::FilePath&,
+ const scoped_refptr<webkit_blob::ShareableFileReference>&) {
+ *error = result;
+}
+
+TEST_F(NativeMediaFileUtilTest, CreateSnapshot) {
+ PopulateDirectoryWithTestCases(root_path(),
+ kFilteringTestCases,
+ arraysize(kFilteringTestCases));
+ for (size_t i = 0; i < arraysize(kFilteringTestCases); ++i) {
+ if (kFilteringTestCases[i].is_directory ||
+ !kFilteringTestCases[i].visible) {
+ continue;
+ }
+ FileSystemURL root_url = CreateURL(FPL(""));
+ FileSystemOperation* operation = NewOperation(root_url);
+ FileSystemURL url = CreateURL(kFilteringTestCases[i].path);
+ base::PlatformFileError expected_error, error;
+ if (kFilteringTestCases[i].media_file)
+ expected_error = base::PLATFORM_FILE_OK;
+ else
+ expected_error = base::PLATFORM_FILE_ERROR_SECURITY;
+ error = base::PLATFORM_FILE_ERROR_FAILED;
+ operation->CreateSnapshotFile(url,
+ base::Bind(CreateSnapshotCallback, &error));
+ MessageLoop::current()->RunUntilIdle();
+ ASSERT_EQ(expected_error, error);
+ }
+}
+
} // namespace chrome
« no previous file with comments | « chrome/browser/media_galleries/fileapi/native_media_file_util.cc ('k') | net/base/mime_sniffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698