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

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: Make changes according to Darin's suggestions. 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
« ppapi/tests/test_file_io.h ('K') | « ppapi/tests/test_file_io.h ('k') | ppapi/tests/test_file_ref.cc » ('j') | no next file with comments »
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..60ff4aa63aea69c3a07aba6ca38b3e7a608264bd 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,87 @@ 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 = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_READ,
+ NOT_CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | NOT_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 = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE,
+ NOT_CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | NOT_TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_CREATE,
+ CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | NOT_TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_EXCLUSIVE,
+ NOT_CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | NOT_TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_TRUNCATE,
+ NOT_CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_EXCLUSIVE,
+ CREATE_IF_NOT_EXIST | NOT_OPEN_IF_EXIST | NOT_TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_CREATE | PP_FILEOPENFLAG_TRUNCATE,
+ CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_EXCLUSIVE |
+ PP_FILEOPENFLAG_TRUNCATE,
+ NOT_CREATE_IF_NOT_EXIST | OPEN_IF_EXIST | TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_WRITE | PP_FILEOPENFLAG_CREATE |
+ PP_FILEOPENFLAG_EXCLUSIVE | PP_FILEOPENFLAG_TRUNCATE,
+ CREATE_IF_NOT_EXIST | NOT_OPEN_IF_EXIST | NOT_TRUNCATE_IF_EXIST);
+ if (!result.empty())
+ return result;
+
+ // Invalid combination: PP_FILEOPENFLAG_TRUNCATE without
+ // PP_FILEOPENFLAG_WRITE.
+ result = MatchOpenExpectations(
+ &file_system,
+ PP_FILEOPENFLAG_READ | PP_FILEOPENFLAG_TRUNCATE,
+ INVALID_FLAG_COMBINATION);
+ if (!result.empty())
+ return result;
PASS();
}
@@ -137,6 +230,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 +344,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 +592,94 @@ std::string TestFileIO::TestAbortCalls() {
PASS();
}
+std::string TestFileIO::MatchOpenExpectations(pp::FileSystem_Dev* file_system,
+ size_t open_flags,
+ size_t expectations) {
+ std::string bad_argument =
+ "TestFileIO::MatchOpenExpectations has invalid input arguments.";
+ bool invalid_combination = !!(expectations & INVALID_FLAG_COMBINATION);
+ if (invalid_combination) {
+ if (expectations != INVALID_FLAG_COMBINATION)
+ return bad_argument;
+ } else {
+ // Validate that one and only one of <some_expectation> and
+ // NOT_<some_expectation> is specified.
+ for (size_t remains = expectations, end = END_OF_PAIR; end != 0;
+ remains >>= 2, end >>= 2) {
+ if (!!(remains & 1) == !!(remains & 2))
+ return bad_argument;
+ }
+ }
+ bool create_if_not_exist = !!(expectations & CREATE_IF_NOT_EXIST);
+ bool open_if_exist = !!(expectations & OPEN_IF_EXIST);
+ bool truncate_if_exist = !!(expectations & 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
« ppapi/tests/test_file_io.h ('K') | « ppapi/tests/test_file_io.h ('k') | ppapi/tests/test_file_ref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698