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

Side by Side Diff: net/disk_cache/simple/simple_index_file_unittest.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/files/file.h" 5 #include "base/files/file.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/hash.h" 8 #include "base/hash.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 EXPECT_EQ(disk_cache::kSimpleIndexMagicNumber, index_metadata.magic_number_); 43 EXPECT_EQ(disk_cache::kSimpleIndexMagicNumber, index_metadata.magic_number_);
44 EXPECT_EQ(disk_cache::kSimpleVersion, index_metadata.version_); 44 EXPECT_EQ(disk_cache::kSimpleVersion, index_metadata.version_);
45 EXPECT_EQ(0U, index_metadata.GetNumberOfEntries()); 45 EXPECT_EQ(0U, index_metadata.GetNumberOfEntries());
46 EXPECT_EQ(0U, index_metadata.cache_size_); 46 EXPECT_EQ(0U, index_metadata.cache_size_);
47 47
48 EXPECT_TRUE(index_metadata.CheckIndexMetadata()); 48 EXPECT_TRUE(index_metadata.CheckIndexMetadata());
49 } 49 }
50 50
51 TEST(IndexMetadataTest, Serialize) { 51 TEST(IndexMetadataTest, Serialize) {
52 SimpleIndexFile::IndexMetadata index_metadata(123, 456); 52 SimpleIndexFile::IndexMetadata index_metadata(123, 456);
53 Pickle pickle; 53 base::Pickle pickle;
54 index_metadata.Serialize(&pickle); 54 index_metadata.Serialize(&pickle);
55 PickleIterator it(pickle); 55 base::PickleIterator it(pickle);
56 SimpleIndexFile::IndexMetadata new_index_metadata; 56 SimpleIndexFile::IndexMetadata new_index_metadata;
57 new_index_metadata.Deserialize(&it); 57 new_index_metadata.Deserialize(&it);
58 58
59 EXPECT_EQ(new_index_metadata.magic_number_, index_metadata.magic_number_); 59 EXPECT_EQ(new_index_metadata.magic_number_, index_metadata.magic_number_);
60 EXPECT_EQ(new_index_metadata.version_, index_metadata.version_); 60 EXPECT_EQ(new_index_metadata.version_, index_metadata.version_);
61 EXPECT_EQ(new_index_metadata.GetNumberOfEntries(), 61 EXPECT_EQ(new_index_metadata.GetNumberOfEntries(),
62 index_metadata.GetNumberOfEntries()); 62 index_metadata.GetNumberOfEntries());
63 EXPECT_EQ(new_index_metadata.cache_size_, index_metadata.cache_size_); 63 EXPECT_EQ(new_index_metadata.cache_size_, index_metadata.cache_size_);
64 64
65 EXPECT_TRUE(new_index_metadata.CheckIndexMetadata()); 65 EXPECT_TRUE(new_index_metadata.CheckIndexMetadata());
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 EntryMetadata metadata_entries[kNumHashes]; 107 EntryMetadata metadata_entries[kNumHashes];
108 108
109 SimpleIndexFile::IndexMetadata index_metadata(static_cast<uint64>(kNumHashes), 109 SimpleIndexFile::IndexMetadata index_metadata(static_cast<uint64>(kNumHashes),
110 456); 110 456);
111 for (size_t i = 0; i < kNumHashes; ++i) { 111 for (size_t i = 0; i < kNumHashes; ++i) {
112 uint64 hash = kHashes[i]; 112 uint64 hash = kHashes[i];
113 metadata_entries[i] = EntryMetadata(Time(), hash); 113 metadata_entries[i] = EntryMetadata(Time(), hash);
114 SimpleIndex::InsertInEntrySet(hash, metadata_entries[i], &entries); 114 SimpleIndex::InsertInEntrySet(hash, metadata_entries[i], &entries);
115 } 115 }
116 116
117 scoped_ptr<Pickle> pickle = WrappedSimpleIndexFile::Serialize( 117 scoped_ptr<base::Pickle> pickle =
118 index_metadata, entries); 118 WrappedSimpleIndexFile::Serialize(index_metadata, entries);
119 EXPECT_TRUE(pickle.get() != NULL); 119 EXPECT_TRUE(pickle.get() != NULL);
120 base::Time now = base::Time::Now(); 120 base::Time now = base::Time::Now();
121 EXPECT_TRUE(WrappedSimpleIndexFile::SerializeFinalData(now, pickle.get())); 121 EXPECT_TRUE(WrappedSimpleIndexFile::SerializeFinalData(now, pickle.get()));
122 base::Time when_index_last_saw_cache; 122 base::Time when_index_last_saw_cache;
123 SimpleIndexLoadResult deserialize_result; 123 SimpleIndexLoadResult deserialize_result;
124 WrappedSimpleIndexFile::Deserialize(static_cast<const char*>(pickle->data()), 124 WrappedSimpleIndexFile::Deserialize(static_cast<const char*>(pickle->data()),
125 pickle->size(), 125 pickle->size(),
126 &when_index_last_saw_cache, 126 &when_index_last_saw_cache,
127 &deserialize_result); 127 &deserialize_result);
128 EXPECT_TRUE(deserialize_result.did_load); 128 EXPECT_TRUE(deserialize_result.did_load);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 WrappedSimpleIndexFile::Deserialize(contents.data(), 309 WrappedSimpleIndexFile::Deserialize(contents.data(),
310 contents.size(), 310 contents.size(),
311 &when_index_last_saw_cache, 311 &when_index_last_saw_cache,
312 &deserialize_result); 312 &deserialize_result);
313 EXPECT_TRUE(deserialize_result.did_load); 313 EXPECT_TRUE(deserialize_result.did_load);
314 } 314 }
315 315
316 #endif // defined(OS_POSIX) 316 #endif // defined(OS_POSIX)
317 317
318 } // namespace disk_cache 318 } // namespace disk_cache
OLDNEW
« no previous file with comments | « net/disk_cache/simple/simple_index_file.cc ('k') | net/disk_cache/simple/simple_index_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698