Disk cache: Simplyfy some of the test infrastructure.

net/disk_cache/block_files_unittest.cc

 // Copyright (c) 2011 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 "base/file_util.h"
 #include "net/disk_cache/block_files.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/disk_cache_test_base.h"
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 10 matching lines @@
     count++;
   }
   return count;
 }
 
 }  // namespace;
 
 namespace disk_cache {
 
 TEST_F(DiskCacheTest, BlockFiles_Grow) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   const int kMaxSize = 35000;
   Addr address[kMaxSize];
 
   // Fill up the 32-byte block file (use three files).
   for (int i = 0; i < kMaxSize; i++) {
     EXPECT_TRUE(files.CreateBlock(RANKINGS, 4, &address[i]));
   }
-  EXPECT_EQ(6, NumberOfFiles(path));
+  EXPECT_EQ(6, NumberOfFiles(cache_path_));
 
   // Make sure we don't keep adding files.
   for (int i = 0; i < kMaxSize * 4; i += 2) {
     int target = i % kMaxSize;
     files.DeleteBlock(address[target], false);
     EXPECT_TRUE(files.CreateBlock(RANKINGS, 4, &address[target]));
   }
-  EXPECT_EQ(6, NumberOfFiles(path));
+  EXPECT_EQ(6, NumberOfFiles(cache_path_));
 }
 
 // We should be able to delete empty block files.
 TEST_F(DiskCacheTest, BlockFiles_Shrink) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   const int kMaxSize = 35000;
   Addr address[kMaxSize];
 
   // Fill up the 32-byte block file (use three files).
   for (int i = 0; i < kMaxSize; i++) {
     EXPECT_TRUE(files.CreateBlock(RANKINGS, 4, &address[i]));
   }
 
   // Now delete all the blocks, so that we can delete the two extra files.
   for (int i = 0; i < kMaxSize; i++) {
     files.DeleteBlock(address[i], false);
   }
-  EXPECT_EQ(4, NumberOfFiles(path));
+  EXPECT_EQ(4, NumberOfFiles(cache_path_));
 }
 
 // Handling of block files not properly closed.
 TEST_F(DiskCacheTest, BlockFiles_Recover) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   const int kNumEntries = 2000;
   CacheAddr entries[kNumEntries];
 
   int seed = static_cast<int>(Time::Now().ToInternalValue());
   srand(seed);
   for (int i = 0; i < kNumEntries; i++) {
     Addr address(0);
     int size = (rand() % 4) + 1;
@@ skipping 53 matching lines @@
 
   EXPECT_EQ(max_entries, header->max_entries);
   EXPECT_EQ(empty_1, header->empty[0]);
   EXPECT_EQ(empty_2, header->empty[1]);
   EXPECT_EQ(empty_3, header->empty[2]);
   EXPECT_EQ(empty_4, header->empty[3]);
 }
 
 // Handling of truncated files.
 TEST_F(DiskCacheTest, BlockFiles_ZeroSizeFile) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   FilePath filename = files.Name(0);
   files.CloseFiles();
   // Truncate one of the files.
   {
     scoped_refptr<File> file(new File);
     ASSERT_TRUE(file->Init(filename));
     EXPECT_TRUE(file->SetLength(0));
   }
 
   // Initializing should fail, not crash.
   ASSERT_FALSE(files.Init(false));
 }
 
 // Handling of truncated files (non empty).
 TEST_F(DiskCacheTest, BlockFiles_TruncatedFile) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
   Addr address;
   EXPECT_TRUE(files.CreateBlock(RANKINGS, 2, &address));
 
   FilePath filename = files.Name(0);
   files.CloseFiles();
   // Truncate one of the files.
   {
     scoped_refptr<File> file(new File);
     ASSERT_TRUE(file->Init(filename));
     EXPECT_TRUE(file->SetLength(15000));
   }
 
   // Initializing should fail, not crash.
   ASSERT_FALSE(files.Init(false));
 }
 
 // An invalid file can be detected after init.
 TEST_F(DiskCacheTest, BlockFiles_InvalidFile) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   // Let's access block 10 of file 5. (There is no file).
   Addr addr(BLOCK_256, 1, 5, 10);
   EXPECT_TRUE(NULL == files.GetFile(addr));
 
   // Let's create an invalid file.
   FilePath filename(files.Name(5));
   char header[kBlockHeaderSize];
   memset(header, 'a', kBlockHeaderSize);
   EXPECT_EQ(kBlockHeaderSize,
             file_util::WriteFile(filename, header, kBlockHeaderSize));
 
   EXPECT_TRUE(NULL == files.GetFile(addr));
 
   // The file should not have been cached (it is still invalid).
   EXPECT_TRUE(NULL == files.GetFile(addr));
 }
 
 // Tests that we generate the correct file stats.
 TEST_F(DiskCacheTest, BlockFiles_Stats) {
   ASSERT_TRUE(CopyTestCache("remove_load1"));
-  FilePath path = GetCacheFilePath();
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(false));
   int used, load;
 
   files.GetFileStats(0, &used, &load);
   EXPECT_EQ(101, used);
   EXPECT_EQ(9, load);
 
   files.GetFileStats(1, &used, &load);
   EXPECT_EQ(203, used);
   EXPECT_EQ(19, load);
 
   files.GetFileStats(2, &used, &load);
   EXPECT_EQ(0, used);
   EXPECT_EQ(0, load);
 }
 
 // Tests that we add and remove blocks correctly.
 TEST_F(DiskCacheTest, AllocationMap) {
-  FilePath path = GetCacheFilePath();
-  ASSERT_TRUE(DeleteCache(path));
-  ASSERT_TRUE(file_util::CreateDirectory(path));
+  ASSERT_TRUE(CleanupCacheDir());
+  ASSERT_TRUE(file_util::CreateDirectory(cache_path_));
 
-  BlockFiles files(path);
+  BlockFiles files(cache_path_);
   ASSERT_TRUE(files.Init(true));
 
   // Create a bunch of entries.
   const int kSize = 100;
   Addr address[kSize];
   for (int i = 0; i < kSize; i++) {
     SCOPED_TRACE(i);
     int block_size = i % 4 + 1;
     EXPECT_TRUE(files.CreateBlock(BLOCK_1K, block_size, &address[i]));
     EXPECT_EQ(BLOCK_1K, address[i].file_type());
@@ skipping 23 matching lines @@
   }
 
   // The allocation map should be empty.
   for (int i =0; i < 50; i++) {
     SCOPED_TRACE(i);
     EXPECT_EQ(0, buffer[i]);
   }
 }
 
 }  // namespace disk_cache