Cleanup: Introduce AsyncFileTestHelper for testing with async file/quota operations

webkit/fileapi/local_file_util_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/fileapi/local_file_util.h"
 #include "webkit/fileapi/native_file_util.h"
 
 namespace fileapi {
 
@@ skipping 62 matching lines @@
     scoped_ptr<FileSystemOperationContext> context(NewContext());
     return FileUtil()->EnsureFileExists(
         context.get(),
         Path(file_name), created);
   }
 
   const LocalFileSystemTestOriginHelper& test_helper() const {
     return test_helper_;
   }
 
+  FileSystemContext* file_system_context() {
+    return test_helper_.file_system_context();
+  }
+
  private:
   scoped_ptr<LocalFileUtil> local_file_util_;
   base::ScopedTempDir data_dir_;
   MessageLoop message_loop_;
   LocalFileSystemTestOriginHelper test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileUtilTest);
 };
 
 TEST_F(LocalFileUtilTest, CreateAndClose) {
@@ skipping 104 matching lines @@
   ASSERT_TRUE(created);
 
   scoped_ptr<FileSystemOperationContext> context;
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       FileUtil()->Truncate(context.get(), Path(from_file), 1020));
 
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
 
-  context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            test_helper().SameFileUtilCopy(context.get(),
-                                           Path(from_file), Path(to_file1)));
+            AsyncFileTestHelper::Copy(file_system_context(),
+                                      Path(from_file), Path(to_file1)));
 
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            test_helper().SameFileUtilCopy(context.get(),
-                                           Path(from_file), Path(to_file2)));
+            AsyncFileTestHelper::Copy(file_system_context(),
+                                      Path(from_file), Path(to_file2)));
 
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
   EXPECT_TRUE(FileExists(to_file1));
   EXPECT_EQ(1020, GetSize(to_file1));
   EXPECT_TRUE(FileExists(to_file2));
   EXPECT_EQ(1020, GetSize(to_file2));
 }
 
 TEST_F(LocalFileUtilTest, CopyDirectory) {
@@ skipping 14 matching lines @@
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       FileUtil()->Truncate(context.get(), Path(from_file), 1020));
 
   EXPECT_TRUE(DirectoryExists(from_dir));
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
   EXPECT_FALSE(DirectoryExists(to_dir));
 
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            test_helper().SameFileUtilCopy(context.get(),
-                                           Path(from_dir), Path(to_dir)));
+            AsyncFileTestHelper::Copy(file_system_context(),
+                                      Path(from_dir), Path(to_dir)));
 
   EXPECT_TRUE(DirectoryExists(from_dir));
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
   EXPECT_TRUE(DirectoryExists(to_dir));
   EXPECT_TRUE(FileExists(to_file));
   EXPECT_EQ(1020, GetSize(to_file));
 }
 
 TEST_F(LocalFileUtilTest, MoveFile) {
   const char *from_file = "fromfile";
   const char *to_file = "tofile";
   bool created;
   ASSERT_EQ(base::PLATFORM_FILE_OK, EnsureFileExists(from_file, &created));
   ASSERT_TRUE(created);
   scoped_ptr<FileSystemOperationContext> context;
 
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       FileUtil()->Truncate(context.get(), Path(from_file), 1020));
 
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
 
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            test_helper().SameFileUtilMove(context.get(),
-                                           Path(from_file), Path(to_file)));
+            AsyncFileTestHelper::Move(file_system_context(),
+                                      Path(from_file), Path(to_file)));
 
   EXPECT_FALSE(FileExists(from_file));
   EXPECT_TRUE(FileExists(to_file));
   EXPECT_EQ(1020, GetSize(to_file));
 }
 
 TEST_F(LocalFileUtilTest, MoveDirectory) {
   const char *from_dir = "fromdir";
   const char *from_file = "fromdir/fromfile";
   const char *to_dir = "todir";
@@ skipping 11 matching lines @@
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       FileUtil()->Truncate(context.get(), Path(from_file), 1020));
 
   EXPECT_TRUE(DirectoryExists(from_dir));
   EXPECT_TRUE(FileExists(from_file));
   EXPECT_EQ(1020, GetSize(from_file));
   EXPECT_FALSE(DirectoryExists(to_dir));
 
   context.reset(NewContext());
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            test_helper().SameFileUtilMove(context.get(),
-                                           Path(from_dir), Path(to_dir)));
+            AsyncFileTestHelper::Move(file_system_context(),
+                                      Path(from_dir), Path(to_dir)));
 
   EXPECT_FALSE(DirectoryExists(from_dir));
   EXPECT_TRUE(DirectoryExists(to_dir));
   EXPECT_TRUE(FileExists(to_file));
   EXPECT_EQ(1020, GetSize(to_file));
 }
 
 }  // namespace fileapi