Issue 5143 - Convert ElemHideEmulation to C++

test/elemHideEmulation.js

 /*
  * 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
@@ skipping 69 matching lines @@
       test.equal(selectors.selectorAt(1), ".foo");
       test.equal(selectors.filterKeyAt(1), "example.com##.foo");
     })(elemHide.getSelectorsForDomain("example.com", 0));
 
     withNAD(0, filter3 =>
     {
       elemHide.add(filter3);
 
       withNAD(
         0, selectors =>
-        {

[sergei, 2018/01/30 16:00:48]

It seems some changes like these are not related to the issue #5143, could you
please extract them?

[hub, 2018/01/30 17:37:58]

In a preview comment on this review you wanted to check more than just the
count. So I did. I'll extract all of that.

[sergei, 2018/01/30 17:40:56]

Ah, OK.

-          test.equal(selectors.selectorCount, 3);
-          test.equal(selectors.selectorAt(0), "#ads");
-          test.equal(selectors.selectorAt(1), ".message");
-          test.equal(selectors.selectorAt(2), ".foo");
-        })(
+          test.equal(selectors.selectorCount, 3))(
         elemHide.getSelectorsForDomain("example.com", 0));
 
       withNAD(
         0, selectors =>
-        {
-          test.equal(selectors.selectorCount, 3);
-          test.equal(selectors.selectorAt(0), "#ads");
-          test.equal(selectors.selectorAt(1), ".message");
-          test.equal(selectors.selectorAt(2), ".foo");
-        })(
+          test.equal(selectors.selectorCount, 3))(
         elemHide.getSelectorsForDomain("mail.example.com", 0));
 
       withNAD(0, filter4 =>
       {
         elemHide.add(filter4);
         withNAD(
           0, selectors =>
-          {
-            test.equal(selectors.selectorCount, 3);
-            test.equal(selectors.selectorAt(0), "#ads");
-            test.equal(selectors.selectorAt(1), ".message");
-            test.equal(selectors.selectorAt(2), ".foo");
-          })(
+            test.equal(selectors.selectorCount, 3))(
           elemHide.getSelectorsForDomain("example.com", 0));
 
         withNAD(
           0, selectors =>
-          {
-            test.equal(selectors.selectorCount, 2);
-            test.equal(selectors.selectorAt(0), "#ads");
-            test.equal(selectors.selectorAt(1), ".foo");
-          })(
+            test.equal(selectors.selectorCount, 2))(
           elemHide.getSelectorsForDomain("mail.example.com", 0));
 
         withNAD(
           0,
           unconditionals =>
-          {
-            test.equal(unconditionals.selectorCount, 1);
-            test.equal(unconditionals.selectorAt(0), "#ads");
-          })(elemHide.getUnconditionalSelectors());
+            test.equal(unconditionals.selectorCount, 1))(elemHide.getUnconditionalSelectors());
 
         elemHide.remove(filter4);
       })(Filter.fromText("mail.example.com#@#.message"));
 
       withNAD(
         0, selectors =>
-        {
-          test.equal(selectors.selectorCount, 3);
-          test.equal(selectors.selectorAt(0), "#ads");
-          test.equal(selectors.selectorAt(1), ".message");
-          test.equal(selectors.selectorAt(2), ".foo");
-        })(elemHide.getSelectorsForDomain("example.com", 0));
-
-      withNAD(
-        0, selectors =>
-        {
-          test.equal(selectors.selectorCount, 3);
-          test.equal(selectors.selectorAt(0), "#ads");
-          test.equal(selectors.selectorAt(1), ".message");
-          test.equal(selectors.selectorAt(2), ".foo");
-        })(elemHide.getSelectorsForDomain("mail.example.com", 0));
+          test.equal(selectors.selectorCount, 3))(
+        elemHide.getSelectorsForDomain("example.com", 0));
+
+      withNAD(
+        0, selectors =>
+          test.equal(selectors.selectorCount, 3))(
+        elemHide.getSelectorsForDomain("mail.example.com", 0));
 
       elemHide.remove(filter3);
     })(Filter.fromText("example.com##.message"));
 
     withNAD(
       0, selectors =>
         test.equal(selectors.selectorCount, 2))(
       elemHide.getSelectorsForDomain("example.com", 0));
   })(ElemHide.create());
 
@@ skipping 80 matching lines @@
 
   test.done();
 };
 
 exports.testElemHideEmulationFiltersContainer = function(test)
 {
   withNAD([0, 1], (elemHide, elemHideEmulation) =>
   {
     function compareRules(description, domain, expectedMatches)
     {
-      let rules = elemHideEmulation.getRulesForDomain(elemHide, domain);
-      let result = [];
-      for (let i = 0; i < rules.filterCount; i++)
-      {
-        let filter = rules.filterAt(i);
-        result.push(filter.text);
-        filter.delete();
-      }
-      expectedMatches = expectedMatches.map(filter => filter.text);
-      test.deepEqual(result.sort(), expectedMatches.sort(), description);
-
-      rules.delete();
+      withNAD(0, rules =>
+      {
+        let result = [];
+        for (let i = 0; i < rules.filterCount; i++)
+          withNAD(0, filter => result.push(filter.text))(rules.filterAt(i));
+
+        expectedMatches = expectedMatches.map(filter => filter.text);
+        test.deepEqual(result.sort(), expectedMatches.sort(), description);
+      })(elemHideEmulation.getRulesForDomain(elemHide, domain));
     }
 
     withNAD([0, 1, 2], (domainFilter, subdomainFilter, otherDomainFilter) =>
     {
       elemHideEmulation.add(domainFilter);
       elemHideEmulation.add(subdomainFilter);
       elemHideEmulation.add(otherDomainFilter);
       compareRules(
         "Return all matching filters",
         "www.example.com",
@@ skipping 13 matching lines @@
         "www.example.com",
         []
       );
     })(Filter.fromText("example.com##filter1"),
        Filter.fromText("www.example.com##filter2"),
        Filter.fromText("other.example.com##filter3"));
   })(ElemHide.create(), ElemHideEmulation.create());
 
   test.done();
 };