Run some disk cache unit tests on the Mac

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1475 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 59 insertions, 34 deletions

diff --git a/net/disk_cache/addr_unittest.cc b/net/disk_cache/addr_unittest.cc
index 2fb86fd..febd5c9 100644
--- a/net/disk_cache/addr_unittest.cc
+++ b/net/disk_cache/addr_unittest.cc
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 #include "net/disk_cache/addr.h"
+#include "net/disk_cache/disk_cache_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace disk_cache {
 
-TEST(DiskCacheTest, CacheAddr_Size) {
+TEST_F(DiskCacheTest, CacheAddr_Size) {
   Addr addr1(0);
   EXPECT_FALSE(addr1.is_initialized());
 
@@ -15,7 +16,7 @@ TEST(DiskCacheTest, CacheAddr_Size) {
   EXPECT_EQ(sizeof(uint32), sizeof(addr1));
 }
 
-TEST(DiskCacheTest, CacheAddr_ValidValues) {
+TEST_F(DiskCacheTest, CacheAddr_ValidValues) {
   Addr addr2(BLOCK_1K, 3, 5, 25);
   EXPECT_EQ(BLOCK_1K, addr2.file_type());
   EXPECT_EQ(3, addr2.num_blocks());
@@ -24,7 +25,7 @@ TEST(DiskCacheTest, CacheAddr_ValidValues) {
   EXPECT_EQ(1024, addr2.BlockSize());
 }
 
-TEST(DiskCacheTest, CacheAddr_InvalidValues) {
+TEST_F(DiskCacheTest, CacheAddr_InvalidValues) {
   Addr addr3(BLOCK_4K, 0x44, 0x41508, 0x952536);
   EXPECT_EQ(BLOCK_4K, addr3.file_type());
   EXPECT_EQ(4, addr3.num_blocks());
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index bf4140a..0cfcaf5 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -78,7 +78,7 @@ int TestTransaction(const std::wstring& name, int num_entries, bool load) {
 }  // namespace
 
 // Tests that can run with different types of caches.
-class DiskCacheBackendTest : public DiskCacheTestBase {
+class DiskCacheBackendTest : public DiskCacheTestWithCache {
  protected:
   void BackendBasics();
   void BackendSetSize();
@@ -719,7 +719,7 @@ TEST_F(DiskCacheBackendTest, MemoryOnlyDoomBetween) {
   BackendDoomBetween();
 }
 
-TEST(DiskCacheTest, Backend_RecoverInsert) {
+TEST_F(DiskCacheTest, Backend_RecoverInsert) {
   // Tests with an empty cache.
   EXPECT_EQ(0, TestTransaction(L"insert_empty1", 0, false));
   EXPECT_EQ(0, TestTransaction(L"insert_empty2", 0, false));
@@ -735,7 +735,7 @@ TEST(DiskCacheTest, Backend_RecoverInsert) {
   EXPECT_EQ(0, TestTransaction(L"insert_load2", 100, true));
 }
 
-TEST(DiskCacheTest, Backend_RecoverRemove) {
+TEST_F(DiskCacheTest, Backend_RecoverRemove) {
   // Removing the only element.
   EXPECT_EQ(0, TestTransaction(L"remove_one1", 0, false));
   EXPECT_EQ(0, TestTransaction(L"remove_one2", 0, false));
@@ -764,7 +764,7 @@ TEST(DiskCacheTest, Backend_RecoverRemove) {
 }
 
 // Tests dealing with cache files that cannot be recovered.
-TEST(DiskCacheTest, Backend_DeleteOld) {
+TEST_F(DiskCacheTest, Backend_DeleteOld) {
   ASSERT_TRUE(CopyTestCache(L"wrong_version"));
   std::wstring path = GetCachePath();
   scoped_ptr<disk_cache::Backend> cache;
@@ -781,7 +781,7 @@ TEST(DiskCacheTest, Backend_DeleteOld) {
 }
 
 // We want to be able to deal with messed up entries on disk.
-TEST(DiskCacheTest, Backend_InvalidEntry) {
+TEST_F(DiskCacheTest, Backend_InvalidEntry) {
   ASSERT_TRUE(CopyTestCache(L"bad_entry"));
   std::wstring path = GetCachePath();
   disk_cache::Backend* cache = disk_cache::CreateCacheBackend(path, false, 0);
@@ -797,7 +797,7 @@ TEST(DiskCacheTest, Backend_InvalidEntry) {
 }
 
 // We want to be able to deal with messed up entries on disk.
-TEST(DiskCacheTest, Backend_InvalidRankings) {
+TEST_F(DiskCacheTest, Backend_InvalidRankings) {
   ASSERT_TRUE(CopyTestCache(L"bad_rankings"));
   std::wstring path = GetCachePath();
   disk_cache::Backend* cache = disk_cache::CreateCacheBackend(path, false, 0);
@@ -907,7 +907,7 @@ TEST_F(DiskCacheBackendTest, DisableFailure2) {
   BackendDisable2();
 }
 
-TEST(DiskCacheTest, Backend_UsageStats) {
+TEST_F(DiskCacheTest, Backend_UsageStats) {
   MessageLoopHelper helper;
 
   std::wstring path = GetCachePath();
diff --git a/net/disk_cache/block_files_unittest.cc b/net/disk_cache/block_files_unittest.cc
index fe35527..59ca1d0 100644
--- a/net/disk_cache/block_files_unittest.cc
+++ b/net/disk_cache/block_files_unittest.cc
@@ -4,10 +4,11 @@
 
 #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"
 
-TEST(DiskCacheTest, BlockFiles_Grow) {
+TEST_F(DiskCacheTest, BlockFiles_Grow) {
   std::wstring path = GetCachePath();
   ASSERT_TRUE(DeleteCache(path.c_str()));
 
@@ -22,7 +23,7 @@ TEST(DiskCacheTest, BlockFiles_Grow) {
 }
 
 // Handling of block files not properly closed.
-TEST(DiskCacheTest, BlockFiles_Recover) {
+TEST_F(DiskCacheTest, BlockFiles_Recover) {
   std::wstring path = GetCachePath();
   ASSERT_TRUE(DeleteCache(path.c_str()));
 
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index e902ff0..25db013 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -7,6 +7,7 @@
 #include "base/timer.h"
 #include "net/base/net_errors.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 "net/disk_cache/hash.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -163,7 +164,7 @@ int TimeRead(int num_entries, disk_cache::Backend* cache,
 
 }  // namespace
 
-TEST(DiskCacheTest, Hash) {
+TEST_F(DiskCacheTest, Hash) {
   int seed = static_cast<int>(Time::Now().ToInternalValue());
   srand(seed);
 
@@ -175,7 +176,7 @@ TEST(DiskCacheTest, Hash) {
   timer.Done();
 }
 
-TEST(DiskCacheTest, CacheBackendPerformance) {
+TEST_F(DiskCacheTest, CacheBackendPerformance) {
   MessageLoopForIO message_loop;
 
   std::wstring path = GetCachePath();
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
index ebf4637..417792f 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -8,7 +8,7 @@
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mem_backend_impl.h"
 
-void DiskCacheTestBase::SetMaxSize(int size) {
+void DiskCacheTestWithCache::SetMaxSize(int size) {
   size_ = size;
   if (cache_impl_)
     EXPECT_TRUE(cache_impl_->SetMaxSize(size));
@@ -17,7 +17,7 @@ void DiskCacheTestBase::SetMaxSize(int size) {
     EXPECT_TRUE(mem_cache_->SetMaxSize(size));
 }
 
-void DiskCacheTestBase::InitCache() {
+void DiskCacheTestWithCache::InitCache() {
   if (mask_)
     implementation_ = true;
 
@@ -31,7 +31,7 @@ void DiskCacheTestBase::InitCache() {
     ASSERT_EQ(0, cache_->GetEntryCount());
 }
 
-void DiskCacheTestBase::InitMemoryCache() {
+void DiskCacheTestWithCache::InitMemoryCache() {
   if (!implementation_) {
     cache_ = disk_cache::CreateInMemoryCacheBackend(size_);
     return;
@@ -47,7 +47,7 @@ void DiskCacheTestBase::InitMemoryCache() {
   ASSERT_TRUE(mem_cache_->Init());
 }
 
-void DiskCacheTestBase::InitDiskCache() {
+void DiskCacheTestWithCache::InitDiskCache() {
   std::wstring path = GetCachePath();
   if (first_cleanup_)
     ASSERT_TRUE(DeleteCache(path.c_str()));
@@ -72,17 +72,19 @@ void DiskCacheTestBase::InitDiskCache() {
 }
 
 
-void DiskCacheTestBase::TearDown() {
+void DiskCacheTestWithCache::TearDown() {
   delete cache_;
 
   if (!memory_only_) {
     std::wstring path = GetCachePath();
     EXPECT_TRUE(CheckCacheIntegrity(path));
   }
+
+  PlatformTest::TearDown();
 }
 
 // We are expected to leak memory when simulating crashes.
-void DiskCacheTestBase::SimulateCrash() {
+void DiskCacheTestWithCache::SimulateCrash() {
   ASSERT_TRUE(implementation_ && !memory_only_);
   cache_impl_->ClearRefCountForTest();
 
@@ -102,7 +104,7 @@ void DiskCacheTestBase::SimulateCrash() {
   ASSERT_TRUE(cache_impl_->Init());
 }
 
-void DiskCacheTestBase::SetTestMode() {
+void DiskCacheTestWithCache::SetTestMode() {
   ASSERT_TRUE(implementation_ && !memory_only_);
   cache_impl_->SetUnitTestMode();
 }
diff --git a/net/disk_cache/disk_cache_test_base.h b/net/disk_cache/disk_cache_test_base.h
index 04eb1c5..ca56be1f 100644
--- a/net/disk_cache/disk_cache_test_base.h
+++ b/net/disk_cache/disk_cache_test_base.h
@@ -2,24 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
-#define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
+#ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
+#define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 
 #include "base/basictypes.h"
+#include "base/platform_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+// These tests can use the path service, which uses autoreleased objects on the
+// Mac, so this needs to be a PlatformTest.  Even tests that do not require a
+// cache (and that do not need to be a DiskCacheTestWithCache) are susceptible
+// to this problem; all such tests should use TEST_F(DiskCacheTest, ...).
+typedef PlatformTest DiskCacheTest;
+
 namespace disk_cache {
 
 class Backend;
 class BackendImpl;
 class MemBackendImpl;
 
-}
+}  // namespace disk_cache
 
 // Provides basic support for cache related tests.
-class DiskCacheTestBase : public testing::Test {
+class DiskCacheTestWithCache : public DiskCacheTest {
  protected:
-  DiskCacheTestBase()
+  DiskCacheTestWithCache()
       : cache_(NULL), cache_impl_(NULL), mem_cache_(NULL), mask_(0), size_(0),
         memory_only_(false), implementation_(false), force_creation_(false),
         first_cleanup_(true) {}
@@ -71,5 +78,4 @@ class DiskCacheTestBase : public testing::Test {
   void InitDiskCache();
 };
 
-#endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H__
-
+#endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
index 8d71c44..7e0ba8a 100644
--- a/net/disk_cache/entry_unittest.cc
+++ b/net/disk_cache/entry_unittest.cc
@@ -16,7 +16,7 @@ extern volatile int g_cache_tests_received;
 extern volatile bool g_cache_tests_error;
 
 // Tests that can run with different types of caches.
-class DiskCacheEntryTest : public DiskCacheTestBase {
+class DiskCacheEntryTest : public DiskCacheTestWithCache {
  protected:
   void InternalSyncIO();
   void InternalAsyncIO();
diff --git a/net/disk_cache/mapped_file_unittest.cc b/net/disk_cache/mapped_file_unittest.cc
index 138f3cb..fe090e5 100644
--- a/net/disk_cache/mapped_file_unittest.cc
+++ b/net/disk_cache/mapped_file_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "base/file_util.h"
 #include "base/string_util.h"
+#include "net/disk_cache/disk_cache_test_base.h"
 #include "net/disk_cache/disk_cache_test_util.h"
 #include "net/disk_cache/mapped_file.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -66,7 +67,7 @@ void WaitForCallbacks(int expected) {
 
 }  // namespace
 
-TEST(DiskCacheTest, MappedFile_SyncIO) {
+TEST_F(DiskCacheTest, MappedFile_SyncIO) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
@@ -82,7 +83,7 @@ TEST(DiskCacheTest, MappedFile_SyncIO) {
   EXPECT_STREQ(buffer1, buffer2);
 }
 
-TEST(DiskCacheTest, MappedFile_AsyncIO) {
+TEST_F(DiskCacheTest, MappedFile_AsyncIO) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
diff --git a/net/disk_cache/storage_block_unittest.cc b/net/disk_cache/storage_block_unittest.cc
index fb89d36..4f172e0 100644
--- a/net/disk_cache/storage_block_unittest.cc
+++ b/net/disk_cache/storage_block_unittest.cc
@@ -5,10 +5,11 @@
 #include "base/file_util.h"
 #include "net/disk_cache/storage_block.h"
 #include "net/disk_cache/storage_block-inl.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"
 
-TEST(DiskCacheTest, StorageBlock_LoadStore) {
+TEST_F(DiskCacheTest, StorageBlock_LoadStore) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
@@ -29,7 +30,7 @@ TEST(DiskCacheTest, StorageBlock_LoadStore) {
   EXPECT_EQ(0xa0010002, entry1.Data()->rankings_node);
 }
 
-TEST(DiskCacheTest, StorageBlock_SetData) {
+TEST_F(DiskCacheTest, StorageBlock_SetData) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
@@ -50,7 +51,7 @@ TEST(DiskCacheTest, StorageBlock_SetData) {
   EXPECT_TRUE(entry2.Data() == entry1.Data());
 }
 
-TEST(DiskCacheTest, StorageBlock_SetModified) {
+TEST_F(DiskCacheTest, StorageBlock_SetModified) {
   std::wstring filename = GetCachePath();
   file_util::AppendToPath(&filename, L"a_test");
   scoped_refptr<disk_cache::MappedFile> file(new disk_cache::MappedFile);
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 19029c4..50e885c 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -85,6 +85,12 @@
 		7BA0169E0E5A1EAE00044150 /* libzlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BA016980E5A1E8700044150 /* libzlib.a */; };
 		7BA016A30E5A1EE900044150 /* gzip_header.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32B70E5A181C00A747DB /* gzip_header.cc */; };
 		7BA0172F0E5A244D00044150 /* bzip2_filter.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32750E5A181C00A747DB /* bzip2_filter.cc */; };
+		7BD8F70C0E65DCD800034DE9 /* block_files_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32F90E5A190600A747DB /* block_files_unittest.cc */; };
+		7BD8F70D0E65DCE000034DE9 /* disk_cache_test_base.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32D50E5A190600A747DB /* disk_cache_test_base.cc */; };
+		7BD8F70E0E65DCE500034DE9 /* disk_cache_test_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32FA0E5A190600A747DB /* disk_cache_test_util.cc */; };
+		7BD8F70F0E65DCEB00034DE9 /* entry_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32E40E5A190600A747DB /* entry_unittest.cc */; };
+		7BD8F7100E65DCF000034DE9 /* mapped_file_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32ED0E5A190600A747DB /* mapped_file_unittest.cc */; };
+		7BD8F7110E65DCF500034DE9 /* storage_block_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32D90E5A190600A747DB /* storage_block_unittest.cc */; };
 		7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BA04540E25613300BE02C6 /* libnet.a */; };
 		7BED34450E5A1A9600A747DB /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED324A0E5A17C000A747DB /* libbase.a */; };
 		7BED34520E5A1ABC00A747DB /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED32530E5A17C300A747DB /* libgtest.a */; };
@@ -1252,21 +1258,27 @@
 				7B4DF6BD0E5B98F7004D7619 /* addr_unittest.cc in Sources */,
 				7B8502050E5A377100730B43 /* auth_cache_unittest.cc in Sources */,
 				7B8502120E5A37A800730B43 /* base64_unittest.cc in Sources */,
+				7BD8F70C0E65DCD800034DE9 /* block_files_unittest.cc in Sources */,
 				7BA015210E5A1B9800044150 /* bzip2_filter_unittest.cc in Sources */,
 				7B4DF64A0E5B98DF004D7619 /* client_socket_pool_unittest.cc in Sources */,
 				7B8B5B530E5CEAC7002F9A97 /* cookie_monster_unittest.cc in Sources */,
 				7B4DF6A90E5B98E7004D7619 /* data_url_unittest.cc in Sources */,
+				7BD8F70D0E65DCE000034DE9 /* disk_cache_test_base.cc in Sources */,
+				7BD8F70E0E65DCE500034DE9 /* disk_cache_test_util.cc in Sources */,
+				7BD8F70F0E65DCEB00034DE9 /* entry_unittest.cc in Sources */,
 				7B4DF6B10E5B98ED004D7619 /* escape_unittest.cc in Sources */,
 				7BA0151F0E5A1B9200044150 /* gzip_filter_unittest.cc in Sources */,
 				048268080E5B3B3200A30786 /* http_chunked_decoder_unittest.cc in Sources */,
 				821F21320E5CD756003C7E38 /* http_response_headers_unittest.cc in Sources */,
 				821F21130E5CD662003C7E38 /* http_vary_data_unittest.cc in Sources */,
+				7BD8F7100E65DCF000034DE9 /* mapped_file_unittest.cc in Sources */,
 				7B4DF9AC0E5C906A004D7619 /* mime_sniffer_unittest.cc in Sources */,
 				048268090E5B3B4800A30786 /* mime_util_unittest.cc in Sources */,
 				BAA46E3B0E5CE99A00E77460 /* net_util_unittest.cc in Sources */,
 				7B466C470E5E732900C91F63 /* platform_test_mac.mm in Sources */,
 				7B8B5B9E0E5D188E002F9A97 /* registry_controlled_domain_unittest.cc in Sources */,
 				E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */,
+				7BD8F7110E65DCF500034DE9 /* storage_block_unittest.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};