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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi/tests/test_file_io.cc

Issue 7038032: Fix PP_FileOpenFlags_Dev handling: (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rename PLATFORM_FILE_TRUNCATE to PLATFORM_FILE_OPEN_TRUNCATED Created 9 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 | « ppapi/tests/test_file_io.h ('k') | ppapi/tests/test_file_ref.cc » ('j') | webkit/plugins/ppapi/file_type_conversion.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/test_file_io.cc
diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc
index 53a441bf4e598e5e17efcccf8c5fbfa0b79201ef..f6843707417033389ffcea476842f1fea17b31bb 100644
--- a/ppapi/tests/test_file_io.cc
+++ b/ppapi/tests/test_file_io.cc
@@ -29,6 +29,34 @@ std::string ReportMismatch(const std::string& method_name,
expected_result + "' expected.";
}
+std::string ReportOpenError(int32_t open_flags) {
+ static const char* kFlagNames[] = {
+ "PP_FILEOPENFLAG_READ",
+ "PP_FILEOPENFLAG_WRITE",
+ "PP_FILEOPENFLAG_CREATE",
+ "PP_FILEOPENFLAG_TRUNCATE",
+ "PP_FILEOPENFLAG_EXCLUSIVE"
+ };
+
+ std::string result = "FileIO:Open had unexpected behavior with flags: ";
+ bool first_flag = true;
+ for (int32_t mask = 1, index = 0; mask <= PP_FILEOPENFLAG_EXCLUSIVE;
+ mask <<= 1, ++index) {
+ if (mask & open_flags) {
+ if (first_flag) {
+ first_flag = false;
+ } else {
+ result += " | ";
+ }
+ result += kFlagNames[index];
+ }
+ }
+ if (first_flag)
+ result += "[None]";
+
+ return result;
+}
+
int32_t ReadEntireFile(PP_Instance instance,
pp::FileIO_Dev* file_io,
int32_t offset,
@@ -103,22 +131,115 @@ std::string TestFileIO::TestOpen() {
if (rv != PP_OK)
return ReportError("FileSystem::Open", rv);
- pp::FileIO_Dev file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv != PP_OK)
- return ReportError("FileIO::Open", rv);
-
- // Try opening a file that doesn't exist.
- pp::FileRef_Dev nonexistent_file_ref(file_system, "/nonexistent_file");
- pp::FileIO_Dev nonexistent_file_io(instance_);
- rv = nonexistent_file_io.Open(
- nonexistent_file_ref, PP_FILEOPENFLAG_READ, callback);
- if (rv == PP_OK_COMPLETIONPENDING)
- rv = callback.WaitForResult();
- if (rv != PP_ERROR_FILENOTFOUND)
- return ReportError("FileIO::Open", rv);
+ std::string result;
+ result = MatchOpenExpectation(&file_system, PP_FILEOPENFLAG_READ,
+ false, // invalid_combination
darin (slow to review) 2011/05/21 04:32:25 instead of writing these comments, i think it woul
yzshen1 2011/05/23 00:53:01 Done.
+ false, // create_if_not_exist
+ true, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ // Test the behavior of the power set of
+ // { PP_FILEOPENFLAG_CREATE,
+ // PP_FILEOPENFLAG_TRUNCATE,
+ // PP_FILEOPENFLAG_EXCLUSIVE }.
+
+ // First of all, none of them are specificed.
+ result = MatchOpenExpectation(&file_system, PP_FILEOPENFLAG_WRITE,
+ false, // invalid_combination
+ false, // create_if_not_exist
+ true, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_CREATE,
+ false, // invalid_combination
+ true, // create_if_not_exist
+ true, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_EXCLUSIVE,
+ false, // invalid_combination
+ false, // create_if_not_exist
+ true, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_TRUNCATE,
+ false, // invalid_combination
+ false, // create_if_not_exist
+ true, // open_if_exist
+ true); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_EXCLUSIVE,
+ false, // invalid_combination
+ true, // create_if_not_exist
+ false, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_TRUNCATE,
+ false, // invalid_combination
+ true, // create_if_not_exist
+ true, // open_if_exist
+ true); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_EXCLUSIVE |
+ PP_FILEOPENFLAG_TRUNCATE,
+ false, // invalid_combination
+ false, // create_if_not_exist
+ true, // open_if_exist
+ true); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_WRITE |
+ PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_EXCLUSIVE |
+ PP_FILEOPENFLAG_TRUNCATE,
+ false, // invalid_combination
+ true, // create_if_not_exist
+ false, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
+
+ // Invalid combination: PP_FILEOPENFLAG_TRUNCATE without
+ // PP_FILEOPENFLAG_WRITE.
+ result = MatchOpenExpectation(&file_system,
+ PP_FILEOPENFLAG_READ |
+ PP_FILEOPENFLAG_TRUNCATE,
+ true, // invalid_combination
+ false, // create_if_not_exist
+ false, // open_if_exist
+ false); // truncate_if_exist
+ if (!result.empty())
+ return result;
PASS();
}
@@ -137,6 +258,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
pp::FileIO_Dev file_io(instance_);
rv = file_io.Open(file_ref,
PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
callback);
@@ -250,7 +372,9 @@ std::string TestFileIO::TestTouchQuery() {
pp::FileRef_Dev file_ref(file_system, "/file_touch");
pp::FileIO_Dev file_io(instance_);
rv = file_io.Open(file_ref,
- PP_FILEOPENFLAG_CREATE | PP_FILEOPENFLAG_WRITE,
+ PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_TRUNCATE |
+ PP_FILEOPENFLAG_WRITE,
callback);
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
@@ -496,4 +620,79 @@ std::string TestFileIO::TestAbortCalls() {
PASS();
}
+std::string TestFileIO::MatchOpenExpectation(pp::FileSystem_Dev* file_system,
+ size_t open_flags,
+ bool invalid_combination,
+ bool create_if_not_exist,
+ bool open_if_exist,
+ bool truncate_if_exist) {
+ TestCompletionCallback callback(instance_->pp_instance());
+
+ pp::FileRef_Dev existent_file_ref(
+ *file_system, "/match_open_expectation_existent_non_empty_file");
+ pp::FileRef_Dev nonexistent_file_ref(
+ *file_system, "/match_open_expectation_nonexistent_file");
+
+ // Setup files for test.
+ {
+ int32_t rv = existent_file_ref.Delete(callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
+ return ReportError("FileRef::Delete", rv);
+
+ rv = nonexistent_file_ref.Delete(callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
+ return ReportError("FileRef::Delete", rv);
+
+ pp::FileIO_Dev existent_file_io(instance_);
+ rv = existent_file_io.Open(existent_file_ref,
+ PP_FILEOPENFLAG_CREATE | PP_FILEOPENFLAG_WRITE,
+ callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if (rv != PP_OK)
+ return ReportError("FileIO::Open", rv);
+
+ rv = WriteEntireBuffer(instance_->pp_instance(), &existent_file_io, 0,
+ "foobar");
+ if (rv != PP_OK)
+ return ReportError("FileIO::Write", rv);
+ }
+
+ pp::FileIO_Dev existent_file_io(instance_);
+ int32_t rv = existent_file_io.Open(existent_file_ref, open_flags, callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if ((invalid_combination && rv == PP_OK) ||
+ (!invalid_combination && ((rv == PP_OK) != open_if_exist))) {
+ return ReportOpenError(open_flags);
+ }
+
+ if (!invalid_combination && open_if_exist) {
+ PP_FileInfo_Dev info;
+ rv = existent_file_io.Query(&info, callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if (rv != PP_OK)
+ return ReportError("FileIO::Query", rv);
+
+ if (truncate_if_exist != (info.size == 0))
+ return ReportOpenError(open_flags);
+ }
+
+ pp::FileIO_Dev nonexistent_file_io(instance_);
+ rv = nonexistent_file_io.Open(nonexistent_file_ref, open_flags, callback);
+ if (rv == PP_OK_COMPLETIONPENDING)
+ rv = callback.WaitForResult();
+ if ((invalid_combination && rv == PP_OK) ||
+ (!invalid_combination && ((rv == PP_OK) != create_if_not_exist))) {
+ return ReportOpenError(open_flags);
+ }
+
+ return std::string();
+}
+
// TODO(viettrungluu): Test Close(). crbug.com/69457
« no previous file with comments | « ppapi/tests/test_file_io.h ('k') | ppapi/tests/test_file_ref.cc » ('j') | webkit/plugins/ppapi/file_type_conversion.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698