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

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc

Issue 8349018: Safe-browsing SBAddPrefix from vector to deque. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 2 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h" 5 #include "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 8
9 namespace { 9 namespace {
10 10
(...skipping 27 matching lines...) Expand all
38 EXPECT_FALSE(store->CheckAddChunk(0)); 38 EXPECT_FALSE(store->CheckAddChunk(0));
39 EXPECT_FALSE(store->CheckAddChunk(1)); 39 EXPECT_FALSE(store->CheckAddChunk(1));
40 EXPECT_FALSE(store->CheckAddChunk(-1)); 40 EXPECT_FALSE(store->CheckAddChunk(-1));
41 41
42 EXPECT_FALSE(store->CheckSubChunk(0)); 42 EXPECT_FALSE(store->CheckSubChunk(0));
43 EXPECT_FALSE(store->CheckSubChunk(1)); 43 EXPECT_FALSE(store->CheckSubChunk(1));
44 EXPECT_FALSE(store->CheckSubChunk(-1)); 44 EXPECT_FALSE(store->CheckSubChunk(-1));
45 45
46 std::vector<SBAddFullHash> pending_adds; 46 std::vector<SBAddFullHash> pending_adds;
47 std::set<SBPrefix> prefix_misses; 47 std::set<SBPrefix> prefix_misses;
48 std::vector<SBAddPrefix> add_prefixes_result; 48 SBAddPrefixContainer add_prefixes_result;
49 std::vector<SBAddFullHash> add_full_hashes_result; 49 std::vector<SBAddFullHash> add_full_hashes_result;
50 50
51 EXPECT_TRUE(store->FinishUpdate(pending_adds, 51 EXPECT_TRUE(store->FinishUpdate(pending_adds,
52 prefix_misses, 52 prefix_misses,
53 &add_prefixes_result, 53 &add_prefixes_result,
54 &add_full_hashes_result)); 54 &add_full_hashes_result));
55 EXPECT_TRUE(add_prefixes_result.empty()); 55 EXPECT_TRUE(add_prefixes_result.empty());
56 EXPECT_TRUE(add_full_hashes_result.empty()); 56 EXPECT_TRUE(add_full_hashes_result.empty());
57 } 57 }
58 58
(...skipping 24 matching lines...) Expand all
83 store->GetAddChunks(&chunks); 83 store->GetAddChunks(&chunks);
84 ASSERT_EQ(1U, chunks.size()); 84 ASSERT_EQ(1U, chunks.size());
85 EXPECT_EQ(kAddChunk1, chunks[0]); 85 EXPECT_EQ(kAddChunk1, chunks[0]);
86 86
87 store->GetSubChunks(&chunks); 87 store->GetSubChunks(&chunks);
88 ASSERT_EQ(1U, chunks.size()); 88 ASSERT_EQ(1U, chunks.size());
89 EXPECT_EQ(kSubChunk1, chunks[0]); 89 EXPECT_EQ(kSubChunk1, chunks[0]);
90 90
91 std::vector<SBAddFullHash> pending_adds; 91 std::vector<SBAddFullHash> pending_adds;
92 std::set<SBPrefix> prefix_misses; 92 std::set<SBPrefix> prefix_misses;
93 std::vector<SBAddPrefix> add_prefixes_result; 93 SBAddPrefixContainer add_prefixes_result;
94 std::vector<SBAddFullHash> add_full_hashes_result; 94 std::vector<SBAddFullHash> add_full_hashes_result;
95 95
96 EXPECT_TRUE(store->FinishUpdate(pending_adds, 96 EXPECT_TRUE(store->FinishUpdate(pending_adds,
97 prefix_misses, 97 prefix_misses,
98 &add_prefixes_result, 98 &add_prefixes_result,
99 &add_full_hashes_result)); 99 &add_full_hashes_result));
100 100
101 ASSERT_EQ(2U, add_prefixes_result.size()); 101 ASSERT_EQ(2U, add_prefixes_result.size());
102 EXPECT_EQ(kAddChunk1, add_prefixes_result[0].chunk_id); 102 EXPECT_EQ(kAddChunk1, add_prefixes_result[0].chunk_id);
103 EXPECT_EQ(kHash1.prefix, add_prefixes_result[0].prefix); 103 EXPECT_EQ(kHash1.prefix, add_prefixes_result[0].prefix);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash2.prefix)); 156 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash2.prefix));
157 EXPECT_TRUE(store->WriteAddHash(kAddChunk1, now, kHash2)); 157 EXPECT_TRUE(store->WriteAddHash(kAddChunk1, now, kHash2));
158 158
159 store->SetSubChunk(kSubChunk1); 159 store->SetSubChunk(kSubChunk1);
160 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk3, kHash3.prefix)); 160 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk3, kHash3.prefix));
161 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk1, kHash2.prefix)); 161 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk1, kHash2.prefix));
162 EXPECT_TRUE(store->FinishChunk()); 162 EXPECT_TRUE(store->FinishChunk());
163 163
164 std::vector<SBAddFullHash> pending_adds; 164 std::vector<SBAddFullHash> pending_adds;
165 std::set<SBPrefix> prefix_misses; 165 std::set<SBPrefix> prefix_misses;
166 std::vector<SBAddPrefix> add_prefixes_result; 166 SBAddPrefixContainer add_prefixes_result;
167 std::vector<SBAddFullHash> add_full_hashes_result; 167 std::vector<SBAddFullHash> add_full_hashes_result;
168 168
169 EXPECT_TRUE(store->FinishUpdate(pending_adds, 169 EXPECT_TRUE(store->FinishUpdate(pending_adds,
170 prefix_misses, 170 prefix_misses,
171 &add_prefixes_result, 171 &add_prefixes_result,
172 &add_full_hashes_result)); 172 &add_full_hashes_result));
173 173
174 // Knocked out the chunk expected. 174 // Knocked out the chunk expected.
175 ASSERT_EQ(1U, add_prefixes_result.size()); 175 ASSERT_EQ(1U, add_prefixes_result.size());
176 EXPECT_EQ(kAddChunk1, add_prefixes_result[0].chunk_id); 176 EXPECT_EQ(kAddChunk1, add_prefixes_result[0].chunk_id);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 store->DeleteSubChunk(kSubChunk1); 260 store->DeleteSubChunk(kSubChunk1);
261 261
262 // Not actually deleted until finish. 262 // Not actually deleted until finish.
263 EXPECT_TRUE(store->CheckAddChunk(kAddChunk1)); 263 EXPECT_TRUE(store->CheckAddChunk(kAddChunk1));
264 EXPECT_TRUE(store->CheckAddChunk(kAddChunk2)); 264 EXPECT_TRUE(store->CheckAddChunk(kAddChunk2));
265 EXPECT_TRUE(store->CheckSubChunk(kSubChunk1)); 265 EXPECT_TRUE(store->CheckSubChunk(kSubChunk1));
266 EXPECT_TRUE(store->CheckSubChunk(kSubChunk2)); 266 EXPECT_TRUE(store->CheckSubChunk(kSubChunk2));
267 267
268 std::vector<SBAddFullHash> pending_adds; 268 std::vector<SBAddFullHash> pending_adds;
269 std::set<SBPrefix> prefix_misses; 269 std::set<SBPrefix> prefix_misses;
270 std::vector<SBAddPrefix> add_prefixes_result; 270 SBAddPrefixContainer add_prefixes_result;
271 std::vector<SBAddFullHash> add_full_hashes_result; 271 std::vector<SBAddFullHash> add_full_hashes_result;
272 272
273 EXPECT_TRUE(store->FinishUpdate(pending_adds, 273 EXPECT_TRUE(store->FinishUpdate(pending_adds,
274 prefix_misses, 274 prefix_misses,
275 &add_prefixes_result, 275 &add_prefixes_result,
276 &add_full_hashes_result)); 276 &add_full_hashes_result));
277 277
278 EXPECT_EQ(1U, add_prefixes_result.size()); 278 EXPECT_EQ(1U, add_prefixes_result.size());
279 EXPECT_EQ(kAddChunk2, add_prefixes_result[0].chunk_id); 279 EXPECT_EQ(kAddChunk2, add_prefixes_result[0].chunk_id);
280 EXPECT_EQ(kHash3.prefix, add_prefixes_result[0].prefix); 280 EXPECT_EQ(kHash3.prefix, add_prefixes_result[0].prefix);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 store->SetAddChunk(kAddChunk1); 330 store->SetAddChunk(kAddChunk1);
331 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash1.prefix)); 331 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash1.prefix));
332 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash2.prefix)); 332 EXPECT_TRUE(store->WriteAddPrefix(kAddChunk1, kHash2.prefix));
333 333
334 store->SetSubChunk(kSubChunk1); 334 store->SetSubChunk(kSubChunk1);
335 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk3, kHash3.prefix)); 335 EXPECT_TRUE(store->WriteSubPrefix(kSubChunk1, kAddChunk3, kHash3.prefix));
336 EXPECT_TRUE(store->FinishChunk()); 336 EXPECT_TRUE(store->FinishChunk());
337 337
338 std::vector<SBAddFullHash> pending_adds; 338 std::vector<SBAddFullHash> pending_adds;
339 std::set<SBPrefix> prefix_misses; 339 std::set<SBPrefix> prefix_misses;
340 std::vector<SBAddPrefix> add_prefixes_result; 340 SBAddPrefixContainer add_prefixes_result;
341 std::vector<SBAddFullHash> add_full_hashes_result; 341 std::vector<SBAddFullHash> add_full_hashes_result;
342 342
343 EXPECT_TRUE(store->FinishUpdate(pending_adds, 343 EXPECT_TRUE(store->FinishUpdate(pending_adds,
344 prefix_misses, 344 prefix_misses,
345 &add_prefixes_result, 345 &add_prefixes_result,
346 &add_full_hashes_result)); 346 &add_full_hashes_result));
347 347
348 EXPECT_TRUE(file_util::PathExists(filename)); 348 EXPECT_TRUE(file_util::PathExists(filename));
349 EXPECT_TRUE(store->Delete()); 349 EXPECT_TRUE(store->Delete());
350 EXPECT_FALSE(file_util::PathExists(filename)); 350 EXPECT_FALSE(file_util::PathExists(filename));
351 } 351 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698