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

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

Issue 1420123003: Move more declarations from c/b/sb/sb_util.h to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@01_components
Patch Set: Minor: Replace safe_browsing_util:: with safe_browsing:: and use safe_browsing:: namespace prefix Created 5 years, 1 month 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 "chrome/browser/safe_browsing/safe_browsing_store.h" 5 #include "chrome/browser/safe_browsing/safe_browsing_store.h"
6 #include "components/safe_browsing_db/util.h"
6 7
7 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
8 9
9 namespace { 10 namespace {
10 11
11 const SBFullHash kHash1 = SBFullHashForString("one"); 12 const SBFullHash kHash1 = safe_browsing::SBFullHashForString("one");
12 const SBFullHash kHash2 = SBFullHashForString("two"); 13 const SBFullHash kHash2 = safe_browsing::SBFullHashForString("two");
13 const SBFullHash kHash3 = SBFullHashForString("three"); 14 const SBFullHash kHash3 = safe_browsing::SBFullHashForString("three");
14 const SBFullHash kHash4 = SBFullHashForString("four"); 15 const SBFullHash kHash4 = safe_browsing::SBFullHashForString("four");
15 const SBFullHash kHash5 = SBFullHashForString("five"); 16 const SBFullHash kHash5 = safe_browsing::SBFullHashForString("five");
16 const SBFullHash kHash6 = SBFullHashForString("six"); 17 const SBFullHash kHash6 = safe_browsing::SBFullHashForString("six");
17 const SBFullHash kHash7 = SBFullHashForString("seven"); 18 const SBFullHash kHash7 = safe_browsing::SBFullHashForString("seven");
18 19
19 const int kAddChunk1 = 1; // Use different chunk numbers just in case. 20 const int kAddChunk1 = 1; // Use different chunk numbers just in case.
20 const int kSubChunk1 = 2; 21 const int kSubChunk1 = 2;
21 const int kAddChunk2 = 3; 22 const int kAddChunk2 = 3;
22 const int kSubChunk2 = 4; 23 const int kSubChunk2 = 4;
23 const int kAddChunk3 = 5; 24 const int kAddChunk3 = 5;
24 const int kSubChunk3 = 6; 25 const int kSubChunk3 = 6;
25 const int kAddChunk4 = 7; 26 const int kAddChunk4 = 7;
26 const int kSubChunk4 = 8; 27 const int kSubChunk4 = 8;
27 const int kAddChunk5 = 9; 28 const int kAddChunk5 = 9;
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 const base::hash_set<int32> no_deletions; 211 const base::hash_set<int32> no_deletions;
211 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, 212 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes,
212 no_deletions, no_deletions); 213 no_deletions, no_deletions);
213 214
214 ASSERT_EQ(1U, add_prefixes.size()); 215 ASSERT_EQ(1U, add_prefixes.size());
215 EXPECT_EQ(kAddChunk7, add_prefixes[0].chunk_id); 216 EXPECT_EQ(kAddChunk7, add_prefixes[0].chunk_id);
216 EXPECT_EQ(kHash2.prefix, add_prefixes[0].prefix); 217 EXPECT_EQ(kHash2.prefix, add_prefixes[0].prefix);
217 218
218 ASSERT_EQ(2U, add_hashes.size()); 219 ASSERT_EQ(2U, add_hashes.size());
219 EXPECT_EQ(kAddChunk5, add_hashes[0].chunk_id); 220 EXPECT_EQ(kAddChunk5, add_hashes[0].chunk_id);
220 EXPECT_TRUE(SBFullHashEqual(kHash4, add_hashes[0].full_hash)); 221 EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash4, add_hashes[0].full_hash));
221 EXPECT_EQ(kAddChunk6, add_hashes[1].chunk_id); 222 EXPECT_EQ(kAddChunk6, add_hashes[1].chunk_id);
222 EXPECT_TRUE(SBFullHashEqual(kHash6, add_hashes[1].full_hash)); 223 EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash6, add_hashes[1].full_hash));
223 224
224 ASSERT_EQ(1U, sub_prefixes.size()); 225 ASSERT_EQ(1U, sub_prefixes.size());
225 EXPECT_EQ(kSubChunk4, sub_prefixes[0].chunk_id); 226 EXPECT_EQ(kSubChunk4, sub_prefixes[0].chunk_id);
226 EXPECT_EQ(kAddChunk4, sub_prefixes[0].add_chunk_id); 227 EXPECT_EQ(kAddChunk4, sub_prefixes[0].add_chunk_id);
227 EXPECT_EQ(kHash3.prefix, sub_prefixes[0].add_prefix); 228 EXPECT_EQ(kHash3.prefix, sub_prefixes[0].add_prefix);
228 229
229 ASSERT_EQ(1U, sub_hashes.size()); 230 ASSERT_EQ(1U, sub_hashes.size());
230 EXPECT_EQ(kSubChunk3, sub_hashes[0].chunk_id); 231 EXPECT_EQ(kSubChunk3, sub_hashes[0].chunk_id);
231 EXPECT_EQ(kAddChunk3, sub_hashes[0].add_chunk_id); 232 EXPECT_EQ(kAddChunk3, sub_hashes[0].add_chunk_id);
232 EXPECT_TRUE(SBFullHashEqual(kHash7, sub_hashes[0].full_hash)); 233 EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash7, sub_hashes[0].full_hash));
233 } 234 }
234 235
235 // Test chunk deletions, and ordering of deletions WRT subs knocking 236 // Test chunk deletions, and ordering of deletions WRT subs knocking
236 // out adds. 237 // out adds.
237 TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) { 238 TEST(SafeBrowsingStoreTest, SBProcessSubsDeleteChunk) {
238 // A full hash which shares prefix with another. 239 // A full hash which shares prefix with another.
239 const SBFullHash kHash1mod = ModifyHashAfterPrefix(kHash1, 1); 240 const SBFullHash kHash1mod = ModifyHashAfterPrefix(kHash1, 1);
240 241
241 SBAddPrefixes add_prefixes; 242 SBAddPrefixes add_prefixes;
242 std::vector<SBAddFullHash> add_hashes; 243 std::vector<SBAddFullHash> add_hashes;
(...skipping 24 matching lines...) Expand all
267 sub_deletions.insert(kSubChunk1); 268 sub_deletions.insert(kSubChunk1);
268 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, 269 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes,
269 no_deletions, sub_deletions); 270 no_deletions, sub_deletions);
270 271
271 ASSERT_EQ(1U, add_prefixes.size()); 272 ASSERT_EQ(1U, add_prefixes.size());
272 EXPECT_EQ(kAddChunk1, add_prefixes[0].chunk_id); 273 EXPECT_EQ(kAddChunk1, add_prefixes[0].chunk_id);
273 EXPECT_EQ(kHash2.prefix, add_prefixes[0].prefix); 274 EXPECT_EQ(kHash2.prefix, add_prefixes[0].prefix);
274 275
275 ASSERT_EQ(1U, add_hashes.size()); 276 ASSERT_EQ(1U, add_hashes.size());
276 EXPECT_EQ(kAddChunk1, add_hashes[0].chunk_id); 277 EXPECT_EQ(kAddChunk1, add_hashes[0].chunk_id);
277 EXPECT_TRUE(SBFullHashEqual(kHash6, add_hashes[0].full_hash)); 278 EXPECT_TRUE(safe_browsing::SBFullHashEqual(kHash6, add_hashes[0].full_hash));
278 279
279 EXPECT_TRUE(sub_prefixes.empty()); 280 EXPECT_TRUE(sub_prefixes.empty());
280 EXPECT_TRUE(sub_hashes.empty()); 281 EXPECT_TRUE(sub_hashes.empty());
281 282
282 // Delete the adds, also. 283 // Delete the adds, also.
283 base::hash_set<int32> add_deletions; 284 base::hash_set<int32> add_deletions;
284 add_deletions.insert(kAddChunk1); 285 add_deletions.insert(kAddChunk1);
285 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes, 286 ProcessHelper(&add_prefixes, &sub_prefixes, &add_hashes, &sub_hashes,
286 add_deletions, no_deletions); 287 add_deletions, no_deletions);
287 288
288 EXPECT_TRUE(add_prefixes.empty()); 289 EXPECT_TRUE(add_prefixes.empty());
289 EXPECT_TRUE(add_hashes.empty()); 290 EXPECT_TRUE(add_hashes.empty());
290 EXPECT_TRUE(sub_prefixes.empty()); 291 EXPECT_TRUE(sub_prefixes.empty());
291 EXPECT_TRUE(sub_hashes.empty()); 292 EXPECT_TRUE(sub_hashes.empty());
292 } 293 }
293 294
294 TEST(SafeBrowsingStoreTest, Y2K38) { 295 TEST(SafeBrowsingStoreTest, Y2K38) {
295 const base::Time now = base::Time::Now(); 296 const base::Time now = base::Time::Now();
296 const base::Time future = now + base::TimeDelta::FromDays(3*365); 297 const base::Time future = now + base::TimeDelta::FromDays(3*365);
297 298
298 // TODO: Fix file format before 2035. 299 // TODO: Fix file format before 2035.
299 EXPECT_GT(static_cast<int32>(future.ToTimeT()), 0) 300 EXPECT_GT(static_cast<int32>(future.ToTimeT()), 0)
300 << " (int32)time_t is running out."; 301 << " (int32)time_t is running out.";
301 } 302 }
302 303
303 } // namespace 304 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698