CdmFileIOImpl: Refactor Write() implementation.

media/cdm/ppapi/cdm_file_io_test.cc

 // Copyright 2013 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 "media/cdm/ppapi/cdm_file_io_test.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 
 namespace media {
 
 #define FILE_IO_DVLOG(level) DVLOG(level) << "File IO Test: "
 
 const uint8 kData[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                         0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
 const uint32 kDataSize = arraysize(kData);
 
 const uint8 kBigData[] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                            0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
                            0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
                            0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
                            0x00 };
 const uint32 kBigDataSize = arraysize(kBigData);
 
 // Must be > kReadSize in cdm_file_io_impl.cc.
-const uint32 kLargeDataSize = 9 * 1024 + 7;
+const uint32 kLargeDataSize = 20 * 1024 + 7;
 
 // Macros to help add test cases/steps.
+
+// |test_name| is also used as the file name. File name validity tests relies
+// on this to work.
 #define START_TEST_CASE(test_name)                                     \
   do {                                                                 \
-    FileIOTest test_case(create_file_io_cb_, "FileIOTest." test_name); \
+    FileIOTest test_case(create_file_io_cb_, test_name);               \
     CREATE_FILE_IO  // Create FileIO for each test case.
 
 #define ADD_TEST_STEP(type, status, data, data_size)                   \
     test_case.AddTestStep(FileIOTest::type, cdm::FileIOClient::status, \
                           (data), (data_size));
 
 #define END_TEST_CASE                 \
     remaining_tests_.push_back(test_case); \
   } while(0);
 
@@ skipping 25 matching lines @@
 
 FileIOTestRunner::FileIOTestRunner(const CreateFileIOCB& create_file_io_cb)
     : create_file_io_cb_(create_file_io_cb),
       total_num_tests_(0),
       num_passed_tests_(0) {
   // Generate |large_data_|.
   large_data_.resize(kLargeDataSize);
   for (size_t i = 0; i < kLargeDataSize; ++i)
     large_data_[i] = i % kuint8max;
 
-  // Generate |corrupted_big_data_|.
-  corrupted_big_data_.assign(kData, kData + kDataSize);
-  corrupted_big_data_.resize(kBigDataSize, 0);
-
   AddTests();
 }
 
 FileIOTestRunner::~FileIOTestRunner() {
   if (remaining_tests_.empty())
     return;
 
   DCHECK_LT(num_passed_tests_, total_num_tests_);
   FILE_IO_DVLOG(1) << "Not Finished (probably due to timeout). "
                    << num_passed_tests_ << " passed in "
                    << total_num_tests_ << " tests.";
 }
 
 // Note: Consecutive expectations (EXPECT*) can happen in any order.
 void FileIOTestRunner::AddTests() {
+  START_TEST_CASE("/FileNameStartsWithForwardSlash")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("FileNameContains/ForwardSlash")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("\\FileNameStartsWithBackslash")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("FileNameContains\\Backslash")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("_FileNameStartsWithUnderscore")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("FileNameContains_Underscore")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kSuccess)
+  END_TEST_CASE
+
   START_TEST_CASE("ReadBeforeOpeningFile")
     READ_FILE
     EXPECT_FILE_READ(kError, NULL, 0)
   END_TEST_CASE
 
   START_TEST_CASE("WriteBeforeOpeningFile")
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kError)
   END_TEST_CASE
 
   START_TEST_CASE("ReadBeforeFileOpened")
     OPEN_FILE
     READ_FILE
     EXPECT_FILE_OPENED(kSuccess)
     EXPECT_FILE_READ(kError, NULL, 0)
+    // After file opened, we can still do normal operations.
+    WRITE_FILE(kData, kDataSize)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("WriteBeforeFileOpened")
     OPEN_FILE
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kError)
     EXPECT_FILE_OPENED(kSuccess)
+    // After file opened, we can still do normal operations.
+    WRITE_FILE(kData, kDataSize)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("ReadDuringPendingRead")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kSuccess)
     READ_FILE
     READ_FILE
     EXPECT_FILE_READ(kInUse, NULL, 0)
     EXPECT_FILE_READ(kSuccess, kData, kDataSize)
+    // Read again.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("ReadDuringPendingWrite")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
     READ_FILE
     EXPECT_FILE_READ(kInUse, NULL, 0)
     EXPECT_FILE_WRITTEN(kSuccess)
+    // Read again.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("WriteDuringPendingRead")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     READ_FILE
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kInUse)
     EXPECT_FILE_READ(kSuccess, NULL, 0)
+    // We can still do normal operations.
+    WRITE_FILE(kData, kDataSize)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("WriteDuringPendingWrite")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
     WRITE_FILE(kBigData, kBigDataSize)
     EXPECT_FILE_WRITTEN(kInUse)
     EXPECT_FILE_WRITTEN(kSuccess)
+    // Read to make sure data is written.

[ddorwin, 2014/09/16 18:07:37]

... sure original data...

[xhwang, 2014/09/17 21:02:32]

Done.

+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("ReadEmptyFile")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     READ_FILE
     EXPECT_FILE_READ(kSuccess, NULL, 0)
   END_TEST_CASE
 
   START_TEST_CASE("WriteAndRead")
@@ skipping 64 matching lines @@
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kSuccess)
     CLOSE_FILE
     CREATE_FILE_IO
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     READ_FILE
     EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
-  START_TEST_CASE("ReopenFileInTheSameFileIO")
+  START_TEST_CASE("MultipleReadsAndWrites")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kSuccess)
+    // Read file which should be empty.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, NULL, 0)
+    // Write kData to file.
+    WRITE_FILE(kData, kDataSize)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    // Read file.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
+    // Read file again.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
+    // Overwrite file with large data.
+    WRITE_FILE(&large_data_[0], kLargeDataSize)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    // Read file.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, &large_data_[0], kLargeDataSize)
+    // Overwite file with zero bytes.

[ddorwin, 2014/09/16 18:07:37]

For completeness, should we write and confirm kData (demonstrates writing a
smaller size)?

[xhwang, 2014/09/17 21:02:32]

Done.

+    WRITE_FILE(NULL, 0)
+    EXPECT_FILE_WRITTEN(kSuccess)
+    // Read file.
+    READ_FILE
+    EXPECT_FILE_READ(kSuccess, NULL, 0)
+  END_TEST_CASE
+
+  START_TEST_CASE("OpenAfterOpen")
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kSuccess)
+    OPEN_FILE
+    EXPECT_FILE_OPENED(kError)
+  END_TEST_CASE
+
+  START_TEST_CASE("OpenDuringPendingOpen")
     OPEN_FILE
     OPEN_FILE
     EXPECT_FILE_OPENED(kError)  // The second Open() failed.
     EXPECT_FILE_OPENED(kSuccess)  // The first Open() succeeded.
   END_TEST_CASE
 
   START_TEST_CASE("ReopenFileInSeparateFileIO")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
@@ skipping 19 matching lines @@
     CLOSE_FILE
   END_TEST_CASE
 
   START_TEST_CASE("CloseDuringPendingOverwriteWithLargerData")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kSuccess)
     WRITE_FILE(kBigData, kBigDataSize)
     CLOSE_FILE
-    // The file is corrupted. See http://crbug.com/410630
+    // Write() didn't finish and the content of the file is not modified.

[ddorwin, 2014/09/16 18:07:37]

Yay! :)

[xhwang, 2014/09/17 21:02:32]

Acknowledged.

     CREATE_FILE_IO
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     READ_FILE
-    EXPECT_FILE_READ(kSuccess, &corrupted_big_data_[0], kBigDataSize)
+    EXPECT_FILE_READ(kSuccess, kData, kDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("CloseDuringPendingOverwriteWithSmallerData")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kBigData, kBigDataSize)
     EXPECT_FILE_WRITTEN(kSuccess)
     WRITE_FILE(kData, kDataSize)
     CLOSE_FILE
-    // The file is corrupted. See http://crbug.com/410630
+    // Write() didn't finish and the content of the file is not modified.
     CREATE_FILE_IO
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     READ_FILE
-    EXPECT_FILE_READ(kSuccess, kBigData, kDataSize)
+    EXPECT_FILE_READ(kSuccess, kBigData, kBigDataSize)
   END_TEST_CASE
 
   START_TEST_CASE("CloseDuringPendingRead")
     OPEN_FILE
     EXPECT_FILE_OPENED(kSuccess)
     WRITE_FILE(kData, kDataSize)
     EXPECT_FILE_WRITTEN(kSuccess)
     READ_FILE
     CLOSE_FILE
     // Make sure the file is not modified.
@@ skipping 173 matching lines @@
 void FileIOTest::OnTestComplete(bool success) {
   while (!file_io_stack_.empty()) {
     file_io_stack_.top()->Close();
     file_io_stack_.pop();
   }
   FILE_IO_DVLOG(3) << test_name_ << (success ? " PASSED" : " FAILED");
   base::ResetAndReturn(&completion_cb_).Run(success);
 }
 
 }  // namespace media