Merge the hash prefixes from the old store and the additions in the partial

components/safe_browsing_db/v4_store_unittest.cc

Index: components/safe_browsing_db/v4_store_unittest.cc
diff --git a/components/safe_browsing_db/v4_store_unittest.cc b/components/safe_browsing_db/v4_store_unittest.cc
index ec41208a73e923cc979744df2f9087d220df38e8..70eba008823504343fd530a6fb4d187b89ef260a 100644
--- a/components/safe_browsing_db/v4_store_unittest.cc
+++ b/components/safe_browsing_db/v4_store_unittest.cc
@@ -141,4 +141,115 @@ TEST_F(V4StoreTest, TestWriteFullResponseType) {
   EXPECT_EQ("test_client_state", read_store->state_);
 }
 
+TEST_F(V4StoreTest, TestAddUnlumpedHashesWithInvalidAddition) {
+  HashPrefixMap prefix_map;
+  MergeResult result = V4Store::AddUnlumpedHashes(5, "a", &prefix_map);
+  EXPECT_EQ(ADDITIONS_SIZE_UNEXPECTED_FAILURE, result);
+  EXPECT_TRUE(prefix_map.empty());
+}
+
+TEST_F(V4StoreTest, TestAddUnlumpedHashesWithEmptyString) {
+  HashPrefixMap prefix_map;
+  MergeResult result = V4Store::AddUnlumpedHashes(5, "", &prefix_map);
+  EXPECT_EQ(MERGE_SUCCESS, result);
+  EXPECT_TRUE(prefix_map[5].empty());
+}
+
+TEST_F(V4StoreTest, TestAddUnlumpedHashes) {
+  HashPrefixMap prefix_map;
+  PrefixSize prefix_size = 5;
+  EXPECT_EQ(MERGE_SUCCESS,
+            V4Store::AddUnlumpedHashes(prefix_size, "abcde5432100000-----",
+                                       &prefix_map));
+  EXPECT_EQ(1u, prefix_map.size());
+  HashPrefixes hash_prefixes = prefix_map.at(prefix_size);
+  EXPECT_EQ(4 * prefix_size, hash_prefixes.size());
+  EXPECT_EQ("abcde", hash_prefixes.substr(0 * prefix_size, prefix_size));

[Nathan Parker, 2016/07/12 20:35:06]

Seems like you could just test that the whole string is equal to the argument
above, rather than checking substrs. There's some value in doing it down below,
but here it's a bit odd.

[vakh (use Gerrit instead), 2016/07/12 21:57:03]

Done.

+  EXPECT_EQ("54321", hash_prefixes.substr(1 * prefix_size, prefix_size));
+  EXPECT_EQ("00000", hash_prefixes.substr(2 * prefix_size, prefix_size));
+  EXPECT_EQ("-----", hash_prefixes.substr(3 * prefix_size, prefix_size));
+
+  prefix_size = 4;
+  EXPECT_EQ(MERGE_SUCCESS,
+            V4Store::AddUnlumpedHashes(prefix_size, "abcde5432100000-----",
+                                       &prefix_map));
+  EXPECT_EQ(2u, prefix_map.size());
+  hash_prefixes = prefix_map.at(prefix_size);
+  EXPECT_EQ(5 * prefix_size, hash_prefixes.size());
+  EXPECT_EQ("abcd", hash_prefixes.substr(0 * prefix_size, prefix_size));
+  EXPECT_EQ("e543", hash_prefixes.substr(1 * prefix_size, prefix_size));
+  EXPECT_EQ("2100", hash_prefixes.substr(2 * prefix_size, prefix_size));
+  EXPECT_EQ("000-", hash_prefixes.substr(3 * prefix_size, prefix_size));
+  EXPECT_EQ("----", hash_prefixes.substr(4 * prefix_size, prefix_size));
+}
+
+TEST_F(V4StoreTest, TestGetNextSmallestPrefixSizeWithEmptyPrefixMap) {
+  HashPrefixMap prefix_map;
+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
+
+  PrefixSize prefix_size;
+  EXPECT_FALSE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                  &prefix_size));
+}
+
+TEST_F(V4StoreTest, TestGetNextSmallestPrefixSize) {
+  HashPrefixMap prefix_map;
+  V4Store::AddUnlumpedHashes(5, "-----0000054321abcde", &prefix_map);
+  V4Store::AddUnlumpedHashes(4, "-----0000054321abcde", &prefix_map);
+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
+
+  PrefixSize prefix_size;
+  EXPECT_TRUE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                 &prefix_size));
+  EXPECT_EQ(4u, prefix_size);
+}
+
+TEST_F(V4StoreTest, TestGetNextUnmergedPrefix) {
+  HashPrefixMap prefix_map;
+  V4Store::AddUnlumpedHashes(5, "-----0000054321abcde", &prefix_map);
+  V4Store::AddUnlumpedHashes(4, "-----0000054321abcde", &prefix_map);

[Nathan Parker, 2016/07/12 20:35:06]

nit: maybe use a string that looks like it's in sections of 4 for the 4-byte
hash.

[vakh (use Gerrit instead), 2016/07/12 21:57:03]

Good idea but when I do that, the output of 'git cl format' is pretty bad (too
much whitespace inserted).

+  CounterMap counter_map;
+  V4Store::InitializeCounterMap(prefix_map, &counter_map);
+
+  PrefixSize prefix_size;
+  EXPECT_TRUE(V4Store::GetNextSmallestPrefixSize(prefix_map, counter_map,
+                                                 &prefix_size));
+  const HashPrefix& prefix = V4Store::GetNextUnmergedPrefixForSize(
+      prefix_size, prefix_map, counter_map);
+  EXPECT_EQ("----", prefix);
+}
+
+TEST_F(V4StoreTest, TestMergeUpdates) {
+  HashPrefixMap prefix_map_old;
+  V4Store::AddUnlumpedHashes(4, "abcdefgh", &prefix_map_old);
+  V4Store::AddUnlumpedHashes(5, "54321abcde", &prefix_map_old);
+  HashPrefixMap prefix_map_additions;
+  V4Store::AddUnlumpedHashes(4, "----1111bbbb", &prefix_map_additions);
+  V4Store::AddUnlumpedHashes(5, "22222bcdef", &prefix_map_additions);
+
+  std::unique_ptr<V4Store> store(new V4Store(task_runner_, store_path_));
+  store->MergeUpdate(prefix_map_old, prefix_map_additions);
+  const HashPrefixMap& prefix_map = store->hash_prefix_map_;
+  EXPECT_EQ(2u, prefix_map.size());
+
+  PrefixSize prefix_size = 4;
+  HashPrefixes hash_prefixes = prefix_map.at(prefix_size);
+  EXPECT_EQ(5 * prefix_size, hash_prefixes.size());
+  EXPECT_EQ("----", hash_prefixes.substr(0 * prefix_size, prefix_size));
+  EXPECT_EQ("1111", hash_prefixes.substr(1 * prefix_size, prefix_size));
+  EXPECT_EQ("abcd", hash_prefixes.substr(2 * prefix_size, prefix_size));
+  EXPECT_EQ("bbbb", hash_prefixes.substr(3 * prefix_size, prefix_size));
+  EXPECT_EQ("efgh", hash_prefixes.substr(4 * prefix_size, prefix_size));
+
+  prefix_size = 5;
+  hash_prefixes = prefix_map.at(prefix_size);
+  EXPECT_EQ(4 * prefix_size, hash_prefixes.size());
+  EXPECT_EQ("22222", hash_prefixes.substr(0 * prefix_size, prefix_size));
+  EXPECT_EQ("54321", hash_prefixes.substr(1 * prefix_size, prefix_size));
+  EXPECT_EQ("abcde", hash_prefixes.substr(2 * prefix_size, prefix_size));
+  EXPECT_EQ("bcdef", hash_prefixes.substr(3 * prefix_size, prefix_size));
+}
+
 }  // namespace safe_browsing