Issue 6281 - Don't return deleted entries

test/compiled/StringMap.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <string>
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "compiled/StringMap.h"
 
 ABP_NS_USING
 
 template<template <typename T> class S>
 void testStringMap()
 {
   S<std::string> map;
 
   EXPECT_EQ(map.begin(), map.end());
@@ skipping 24 matching lines @@
   EXPECT_TRUE(entry);
 
   EXPECT_EQ(map.size(), 4);
 
   EXPECT_TRUE(map.erase(u"Foobar2"_str));
   // already deleted. Returns false.
   EXPECT_FALSE(map.erase(u"Foobar2"_str));
   // invalid. Returns false.
   EXPECT_FALSE(map.erase(u"Foobar42"_str));
 
-  // XXX should be 4.

[sergei, 2018/02/13 09:06:39]

it seems this comment is not finished.

[hub, 2018/02/13 14:46:29]

Removed now.

   EXPECT_EQ(map.size(), 4);
 
   entry = map.find(u"Foobar2"_str);
   EXPECT_FALSE(entry);
 
   int i = 0;
   for (const auto& e : map)
   {
     EXPECT_FALSE(e.is_invalid());
     // entries that are deleted shouldn't be returned.
     EXPECT_FALSE(e.is_deleted());
     i++;
   }
 
   EXPECT_EQ(i, 3);
   // We did not return deleted entries (there is one).
   // So size is different than actual count.
   EXPECT_NE(i, map.size());
 }
 
 TEST(TestStringMap, stringMap)
 {
   testStringMap<StringMap>();
 }
 
 TEST(TestStringMap, ownedStringMap)
 {
   testStringMap<OwnedStringMap>();
 }