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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/protocol_parser_unittest.cc

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move
Patch Set: Other minor fixes incl. using "using safe_browsing::ClassName" instead of safe_browsing::ClassName everywhere. 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/safe_browsing/local_database_manager_unittest.cc ('K') | « chrome/browser/safe_browsing/protocol_parser.cc ('k') | chrome/browser/safe_browsing/remote_database_manager.h » ('j') | chrome/browser/safe_browsing/remote_database_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/protocol_parser_unittest.cc
diff --git a/chrome/browser/safe_browsing/protocol_parser_unittest.cc b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
index d145b8105c640a98acf3e81917b6da227cb834a7..fa3bd13aa1e8975e42078a8d2ed8186e1b387074 100644
--- a/chrome/browser/safe_browsing/protocol_parser_unittest.cc
+++ b/chrome/browser/safe_browsing/protocol_parser_unittest.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace {
+namespace safe_browsing {
const char kDefaultPhishList[] = "goog-phish-shavar";
const char kDefaultMalwareList[] = "goog-malware-shavar";
mattm 2015/11/11 01:10:16 keep the constants in anon namespace
vakh (old account. dont use) 2015/11/11 18:59:53 Done.
@@ -32,8 +32,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestAddChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(1, chunks[0]->ChunkNumber());
EXPECT_TRUE(chunks[0]->IsAdd());
@@ -78,8 +77,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestAddFullChunk) {
}
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(1, chunks[0]->ChunkNumber());
EXPECT_TRUE(chunks[0]->IsAdd());
@@ -88,10 +86,8 @@ TEST(SafeBrowsingProtocolParsingTest, TestAddFullChunk) {
EXPECT_TRUE(chunks[0]->IsFullHash());
ASSERT_EQ(2U, chunks[0]->FullHashCount());
- EXPECT_TRUE(
- safe_browsing::SBFullHashEqual(chunks[0]->FullHashAt(0), full_hash1));
- EXPECT_TRUE(
- safe_browsing::SBFullHashEqual(chunks[0]->FullHashAt(1), full_hash2));
+ EXPECT_TRUE(SBFullHashEqual(chunks[0]->FullHashAt(0), full_hash1));
+ EXPECT_TRUE(SBFullHashEqual(chunks[0]->FullHashAt(1), full_hash2));
}
// Test parsing multiple add chunks. We'll use the same chunk as above, and add
@@ -121,8 +117,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestAddChunks) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
ASSERT_EQ(2U, chunks.size());
EXPECT_EQ(1, chunks[0]->ChunkNumber());
@@ -162,8 +157,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestTruncatedPrefixChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_FALSE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_FALSE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
}
TEST(SafeBrowsingProtocolParsingTest, TestTruncatedFullHashChunk) {
@@ -184,8 +178,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestTruncatedFullHashChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_FALSE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_FALSE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
}
TEST(SafeBrowsingProtocolParsingTest, TestHugeChunk) {
@@ -202,8 +195,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestHugeChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_FALSE(safe_browsing::ParseChunk(kRawAddChunk, sizeof(kRawAddChunk),
- &chunks));
+ EXPECT_FALSE(ParseChunk(kRawAddChunk, sizeof(kRawAddChunk), &chunks));
}
// Test parsing one sub chunk.
@@ -224,8 +216,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestSubChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kRawSubChunk, sizeof(kRawSubChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kRawSubChunk, sizeof(kRawSubChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(3, chunks[0]->ChunkNumber());
EXPECT_FALSE(chunks[0]->IsAdd());
@@ -274,8 +265,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestSubFullChunk) {
}
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kRawSubChunk, sizeof(kRawSubChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kRawSubChunk, sizeof(kRawSubChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(2, chunks[0]->ChunkNumber());
EXPECT_FALSE(chunks[0]->IsAdd());
@@ -284,11 +274,9 @@ TEST(SafeBrowsingProtocolParsingTest, TestSubFullChunk) {
EXPECT_TRUE(chunks[0]->IsFullHash());
ASSERT_EQ(2U, chunks[0]->FullHashCount());
- EXPECT_TRUE(
- safe_browsing::SBFullHashEqual(chunks[0]->FullHashAt(0), full_hash1));
+ EXPECT_TRUE(SBFullHashEqual(chunks[0]->FullHashAt(0), full_hash1));
EXPECT_EQ(7, chunks[0]->AddChunkNumberAt(0));
- EXPECT_TRUE(
- safe_browsing::SBFullHashEqual(chunks[0]->FullHashAt(1), full_hash2));
+ EXPECT_TRUE(SBFullHashEqual(chunks[0]->FullHashAt(1), full_hash2));
EXPECT_EQ(9, chunks[0]->AddChunkNumberAt(1));
}
@@ -301,7 +289,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestChunkDelete) {
bool reset = false;
std::vector<SBChunkDelete> deletes;
std::vector<ChunkUrl> urls;
- EXPECT_TRUE(safe_browsing::ParseUpdate(add_del.data(), add_del.length(),
+ EXPECT_TRUE(ParseUpdate(add_del.data(), add_del.length(),
&next_query_sec, &reset,
&deletes, &urls));
@@ -326,7 +314,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestChunkDelete) {
deletes.clear();
urls.clear();
add_del = "n:1700\nad:1-7,43-597,44444,99999\ni:malware\nsd:4,21-27171717\n";
- EXPECT_FALSE(safe_browsing::ParseUpdate(add_del.data(), add_del.length(),
+ EXPECT_FALSE(ParseUpdate(add_del.data(), add_del.length(),
&next_query_sec, &reset,
&deletes, &urls));
}
@@ -346,7 +334,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestRedirects) {
bool reset = false;
std::vector<SBChunkDelete> deletes;
std::vector<ChunkUrl> urls;
- EXPECT_TRUE(safe_browsing::ParseUpdate(redirects.data(), redirects.length(),
+ EXPECT_TRUE(ParseUpdate(redirects.data(), redirects.length(),
&next_query_sec, &reset,
&deletes, &urls));
EXPECT_FALSE(reset);
@@ -372,7 +360,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestNextQueryTime) {
bool reset = false;
std::vector<SBChunkDelete> deletes;
std::vector<ChunkUrl> urls;
- EXPECT_TRUE(safe_browsing::ParseUpdate(headers.data(), headers.length(),
+ EXPECT_TRUE(ParseUpdate(headers.data(), headers.length(),
&next_query_sec, &reset,
&deletes, &urls));
@@ -393,22 +381,22 @@ TEST(SafeBrowsingProtocolParsingTest, TestGetHash) {
kDefaultPhishList));
std::vector<SBFullHashResult> full_hashes;
base::TimeDelta cache_lifetime;
- EXPECT_TRUE(safe_browsing::ParseGetHash(get_hash.data(), get_hash.length(),
- &cache_lifetime, &full_hashes));
+ EXPECT_TRUE(ParseGetHash(get_hash.data(), get_hash.length(), &cache_lifetime,
+ &full_hashes));
ASSERT_EQ(3U, full_hashes.size());
EXPECT_EQ(memcmp(&full_hashes[0].hash,
"00112233445566778899aabbccddeeff",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[0].list_id);
+ EXPECT_EQ(PHISH, full_hashes[0].list_id);
EXPECT_EQ(memcmp(&full_hashes[1].hash,
"00001111222233334444555566667777",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[1].list_id);
+ EXPECT_EQ(PHISH, full_hashes[1].list_id);
EXPECT_EQ(memcmp(&full_hashes[2].hash,
"ffffeeeeddddccccbbbbaaaa99998888",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[2].list_id);
+ EXPECT_EQ(PHISH, full_hashes[2].list_id);
// Test multiple lists in the GetHash results.
const std::string get_hash2(base::StringPrintf(
@@ -420,22 +408,22 @@ TEST(SafeBrowsingProtocolParsingTest, TestGetHash) {
"zzzzyyyyxxxxwwwwvvvvuuuuttttssss",
kDefaultPhishList,
kDefaultMalwareList));
- EXPECT_TRUE(safe_browsing::ParseGetHash(get_hash2.data(), get_hash2.length(),
- &cache_lifetime, &full_hashes));
+ EXPECT_TRUE(ParseGetHash(get_hash2.data(), get_hash2.length(),
+ &cache_lifetime, &full_hashes));
ASSERT_EQ(3U, full_hashes.size());
EXPECT_EQ(memcmp(&full_hashes[0].hash,
"00112233445566778899aabbccddeeff",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[0].list_id);
+ EXPECT_EQ(PHISH, full_hashes[0].list_id);
EXPECT_EQ(memcmp(&full_hashes[1].hash,
"cafebeefcafebeefdeaddeaddeaddead",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[1].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[1].list_id);
EXPECT_EQ(memcmp(&full_hashes[2].hash,
"zzzzyyyyxxxxwwwwvvvvuuuuttttssss",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[2].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[2].list_id);
// Test metadata parsing.
const std::string get_hash3(base::StringPrintf(
@@ -448,24 +436,24 @@ TEST(SafeBrowsingProtocolParsingTest, TestGetHash) {
"cafebeefcafebeefdeaddeaddeaddead",
kDefaultMalwareList,
kDefaultPhishList));
- EXPECT_TRUE(safe_browsing::ParseGetHash(get_hash3.data(), get_hash3.length(),
- &cache_lifetime, &full_hashes));
+ EXPECT_TRUE(ParseGetHash(get_hash3.data(), get_hash3.length(),
+ &cache_lifetime, &full_hashes));
ASSERT_EQ(3U, full_hashes.size());
EXPECT_EQ(memcmp(&full_hashes[0].hash,
"zzzzyyyyxxxxwwwwvvvvuuuuttttssss",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[0].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[0].list_id);
EXPECT_EQ(std::string("ab"), full_hashes[0].metadata);
EXPECT_EQ(memcmp(&full_hashes[1].hash,
"00112233445566778899aabbccddeeff",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[1].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[1].list_id);
EXPECT_EQ(std::string("xy"), full_hashes[1].metadata);
EXPECT_EQ(memcmp(&full_hashes[2].hash,
"cafebeefcafebeefdeaddeaddeaddead",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[2].list_id);
+ EXPECT_EQ(PHISH, full_hashes[2].list_id);
EXPECT_EQ(std::string(), full_hashes[2].metadata);
}
@@ -479,33 +467,29 @@ TEST(SafeBrowsingProtocolParsingTest, TestGetHashWithUnknownList) {
kDefaultPhishList));
std::vector<SBFullHashResult> full_hashes;
base::TimeDelta cache_lifetime;
- EXPECT_TRUE(safe_browsing::ParseGetHash(hash_response.data(),
- hash_response.size(),
- &cache_lifetime,
- &full_hashes));
+ EXPECT_TRUE(ParseGetHash(hash_response.data(), hash_response.size(),
+ &cache_lifetime, &full_hashes));
ASSERT_EQ(1U, full_hashes.size());
EXPECT_EQ(memcmp("12345678901234567890123456789012",
&full_hashes[0].hash, sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[0].list_id);
+ EXPECT_EQ(PHISH, full_hashes[0].list_id);
hash_response += base::StringPrintf(
"%s:32:1\n"
"abcdefghijklmnopqrstuvwxyz123457",
kDefaultMalwareList);
full_hashes.clear();
- EXPECT_TRUE(safe_browsing::ParseGetHash(hash_response.data(),
- hash_response.size(),
- &cache_lifetime,
- &full_hashes));
+ EXPECT_TRUE(ParseGetHash(hash_response.data(), hash_response.size(),
+ &cache_lifetime, &full_hashes));
EXPECT_EQ(2U, full_hashes.size());
EXPECT_EQ(memcmp("12345678901234567890123456789012",
&full_hashes[0].hash, sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::PHISH, full_hashes[0].list_id);
+ EXPECT_EQ(PHISH, full_hashes[0].list_id);
EXPECT_EQ(memcmp("abcdefghijklmnopqrstuvwxyz123457",
&full_hashes[1].hash, sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[1].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[1].list_id);
}
TEST(SafeBrowsingProtocolParsingTest, TestGetHashWithUnknownListAndMetadata) {
@@ -521,13 +505,13 @@ TEST(SafeBrowsingProtocolParsingTest, TestGetHashWithUnknownListAndMetadata) {
"%s:32:1\n"
"0123456789hashhashhashhashhashha",
kDefaultMalwareList));
- EXPECT_TRUE(safe_browsing::ParseGetHash(get_hash3.data(), get_hash3.length(),
- &cache_lifetime, &full_hashes));
+ EXPECT_TRUE(ParseGetHash(get_hash3.data(), get_hash3.length(),
+ &cache_lifetime, &full_hashes));
ASSERT_EQ(1U, full_hashes.size());
EXPECT_EQ(memcmp(&full_hashes[0].hash,
"0123456789hashhashhashhashhashha",
sizeof(SBFullHash)), 0);
- EXPECT_EQ(safe_browsing::MALWARE, full_hashes[0].list_id);
+ EXPECT_EQ(MALWARE, full_hashes[0].list_id);
EXPECT_EQ(std::string(), full_hashes[0].metadata);
}
@@ -537,7 +521,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestFormatHash) {
prefixes.push_back(0x64636261);
prefixes.push_back(0x73727170);
- EXPECT_EQ("4:12\n1234abcdpqrs", safe_browsing::FormatGetHash(prefixes));
+ EXPECT_EQ("4:12\n1234abcdpqrs", FormatGetHash(prefixes));
}
TEST(SafeBrowsingProtocolParsingTest, TestReset) {
@@ -547,7 +531,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestReset) {
size_t next_update = 0;
std::vector<SBChunkDelete> deletes;
std::vector<ChunkUrl> urls;
- EXPECT_TRUE(safe_browsing::ParseUpdate(update.data(), update.size(),
+ EXPECT_TRUE(ParseUpdate(update.data(), update.size(),
&next_update, &reset,
&deletes, &urls));
EXPECT_TRUE(reset);
@@ -564,8 +548,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestZeroSizeAddChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kEmptyAddChunk, sizeof(kEmptyAddChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kEmptyAddChunk, sizeof(kEmptyAddChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(2, chunks[0]->ChunkNumber());
EXPECT_TRUE(chunks[0]->IsAdd());
@@ -597,8 +580,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestZeroSizeAddChunk) {
'\x04', // varint length 8
'p', 'p', 'p', 'p', // 4-byte prefixes
};
- EXPECT_TRUE(safe_browsing::ParseChunk(kAddChunks, sizeof(kAddChunks),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kAddChunks, sizeof(kAddChunks), &chunks));
ASSERT_EQ(3U, chunks.size());
EXPECT_EQ(1, chunks[0]->ChunkNumber());
@@ -637,8 +619,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestZeroSizeSubChunk) {
};
ScopedVector<SBChunkData> chunks;
- EXPECT_TRUE(safe_browsing::ParseChunk(kEmptySubChunk, sizeof(kEmptySubChunk),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kEmptySubChunk, sizeof(kEmptySubChunk), &chunks));
ASSERT_EQ(1U, chunks.size());
EXPECT_EQ(2, chunks[0]->ChunkNumber());
EXPECT_FALSE(chunks[0]->IsAdd());
@@ -682,8 +663,7 @@ TEST(SafeBrowsingProtocolParsingTest, TestZeroSizeSubChunk) {
'\x0B', // varint 11
};
- EXPECT_TRUE(safe_browsing::ParseChunk(kSubChunks, sizeof(kSubChunks),
- &chunks));
+ EXPECT_TRUE(ParseChunk(kSubChunks, sizeof(kSubChunks), &chunks));
ASSERT_EQ(3U, chunks.size());
EXPECT_EQ(1, chunks[0]->ChunkNumber());
@@ -714,4 +694,4 @@ TEST(SafeBrowsingProtocolParsingTest, TestZeroSizeSubChunk) {
EXPECT_EQ(11, chunks[2]->AddChunkNumberAt(0));
}
-} // namespace
+} // namespace safe_browsing
« chrome/browser/safe_browsing/local_database_manager_unittest.cc ('K') | « chrome/browser/safe_browsing/protocol_parser.cc ('k') | chrome/browser/safe_browsing/remote_database_manager.h » ('j') | chrome/browser/safe_browsing/remote_database_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698