Issue 5142 - Convert Element Hiding 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
  * 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/>.
  */
 
 "use strict";
 
 const {createSandbox} = require("./_common");
+const {withNAD} = require("./_test-utils");
 
 let ElemHideEmulationFilter = null;
 let ElemHideEmulation = null;
 let ElemHide = null;
 let Filter = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
   (
     {Filter,
      ElemHideEmulationFilter} = sandboxedRequire("../lib/filterClasses"),
     {ElemHideEmulation} = sandboxedRequire("../lib/elemHideEmulation"),
     {ElemHide} = sandboxedRequire("../lib/elemHide")
   );
 
   callback();
 };
 
 exports.testElemHideAPI = function(test)
 {
-  let elemHide = ElemHide.create();
-
+  withNAD(0, elemHide =>
   {
-    let filter = Filter.fromText("###ads");
-    elemHide.add(filter);
-
-    test.equal(filter.selectorDomain, "");
-    let unconditionals = elemHide.getUnconditionalSelectors();
-    test.equal(unconditionals.selectorCount, 1);
-    test.equal(unconditionals.selectorAt(0), "#ads");
-    test.equal(unconditionals.filterKeyAt(0), "###ads");
-    filter.delete();
-    unconditionals.delete();
-  }
-
-  {
-    let filter2 = Filter.fromText("example.com##.foo");
-    elemHide.add(filter2);
-    test.equal(filter2.selectorDomain, "example.com");
-    filter2.delete();
-  }
-
-  let unconditionals = elemHide.getUnconditionalSelectors();
-  test.equal(unconditionals.selectorCount, 1);
-  unconditionals.delete();
-
-  let selectors = elemHide.getSelectorsForDomain("example.com", 1);
-  test.equal(selectors.selectorCount, 1);
-  test.equal(selectors.selectorAt(0), ".foo");
-  test.equal(selectors.filterKeyAt(0), "example.com##.foo");
-  selectors.delete();
-
-  selectors = elemHide.getSelectorsForDomain("example.com", 0);
-  test.equal(selectors.selectorCount, 2);
-  test.equal(selectors.selectorAt(0), "#ads");
-  test.equal(selectors.filterKeyAt(0), "###ads");
-  test.equal(selectors.selectorAt(1), ".foo");
-  test.equal(selectors.filterKeyAt(1), "example.com##.foo");
-  selectors.delete();
-
-  let filter3 = Filter.fromText("example.com##.message");
-  elemHide.add(filter3);
-  selectors = elemHide.getSelectorsForDomain("example.com", 0);
-  test.equal(selectors.selectorCount, 3);
-  selectors.delete();
-  selectors = elemHide.getSelectorsForDomain("mail.example.com", 0);
-  test.equal(selectors.selectorCount, 3);
-  selectors.delete();
-
-  let filter4 = Filter.fromText("mail.example.com#@#.message");
-  elemHide.add(filter4);
-  selectors = elemHide.getSelectorsForDomain("example.com", 0);
-  test.equal(selectors.selectorCount, 3);
-  selectors.delete();
-  selectors = elemHide.getSelectorsForDomain("mail.example.com", 0);
-  test.equal(selectors.selectorCount, 2);
-  selectors.delete();
-
-  unconditionals = elemHide.getUnconditionalSelectors();
-  test.equal(unconditionals.selectorCount, 1);
-  unconditionals.delete();
-
-  elemHide.remove(filter4);
-  filter4.delete();
-  selectors = elemHide.getSelectorsForDomain("example.com", 0);
-  test.equal(selectors.selectorCount, 3);
-  selectors.delete();
-  selectors = elemHide.getSelectorsForDomain("mail.example.com", 0);
-  test.equal(selectors.selectorCount, 3);
-  selectors.delete();
-
-  elemHide.remove(filter3);
-  filter3.delete();
-  selectors = elemHide.getSelectorsForDomain("example.com", 0);
-  test.equal(selectors.selectorCount, 2);
-  selectors.delete();
-
-  elemHide.delete();
+    withNAD(0, filter =>
+    {
+      elemHide.add(filter);
+      test.equal(filter.selectorDomain, "");
+    })(Filter.fromText("###ads"));
+
+    withNAD(0, unconditionals =>
+    {
+      test.equal(unconditionals.selectorCount, 1);
+      test.equal(unconditionals.selectorAt(0), "#ads");
+      test.equal(unconditionals.filterKeyAt(0), "###ads");
+    })(elemHide.getUnconditionalSelectors());
+
+    withNAD(0, filter =>
+    {
+      elemHide.add(filter);
+      test.equal(filter.selectorDomain, "example.com");
+    })(Filter.fromText("example.com##.foo"));
+
+    withNAD(
+      0, unconditionals =>
+        test.equal(unconditionals.selectorCount, 1))(elemHide.getUnconditionalSelectors());
+
+    withNAD(0, selectors =>
+    {
+      test.equal(selectors.selectorCount, 1);
+      test.equal(selectors.selectorAt(0), ".foo");
+      test.equal(selectors.filterKeyAt(0), "example.com##.foo");
+    })(elemHide.getSelectorsForDomain("example.com", 1));
+
+    withNAD(0, selectors =>
+    {
+      test.equal(selectors.selectorCount, 2);
+      test.equal(selectors.selectorAt(0), "#ads");
+      test.equal(selectors.filterKeyAt(0), "###ads");
+      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 =>
+          test.equal(selectors.selectorCount, 3))(
+        elemHide.getSelectorsForDomain("example.com", 0));
+
+      withNAD(
+        0, selectors =>
+          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))(
+          elemHide.getSelectorsForDomain("example.com", 0));
+
+        withNAD(
+          0, selectors =>
+            test.equal(selectors.selectorCount, 2))(
+          elemHide.getSelectorsForDomain("mail.example.com", 0));
+
+        withNAD(
+          0,
+          unconditionals =>
+            test.equal(unconditionals.selectorCount, 1))(elemHide.getUnconditionalSelectors());
+
+        elemHide.remove(filter4);
+      })(Filter.fromText("mail.example.com#@#.message"));
+
+      withNAD(
+        0, selectors =>
+          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());
+
   test.done();
 };
 
 exports.testDomainRestrictions = function(test)
 {
   function testSelectorMatches(description, filters, domain, expectedMatches)
   {
-    let elemHide = ElemHide.create();
-
-    for (let text of filters)
-    {
-      let filter = Filter.fromText(text);
-      if (filter instanceof ElemHideEmulationFilter)
-        ElemHideEmulation.add(filter);
-      else
-        elemHide.add(filter);
-      filter.delete();
-    }
-    let matches = ElemHideEmulation.getRulesForDomain(domain, elemHide)
-        .map(filter => filter.text);
-    test.deepEqual(matches.sort(), expectedMatches.sort(), description);
-
-    ElemHideEmulation.clear();
-
-    elemHide.delete();
+    withNAD(0, elemHide =>
+    {
+      let addFilter = withNAD(0, filter =>
+      {
+        if (filter instanceof ElemHideEmulationFilter)
+          ElemHideEmulation.add(filter);
+        else
+          elemHide.add(filter);
+      });
+
+      for (let text of filters)
+        addFilter(Filter.fromText(text));
+
+      let matches = ElemHideEmulation.getRulesForDomain(domain, elemHide)
+          .map(filter => filter.text);
+      test.deepEqual(matches.sort(), expectedMatches.sort(), description);
+
+      ElemHideEmulation.clear();
+    })(ElemHide.create());
   }
 
   testSelectorMatches(
     "Ignore generic filters",
     [
       "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']",
       "~example.com##[-abp-properties='foo']"
     ],
     "example.com",
     ["example.com##[-abp-properties='foo']"]
@@ skipping 33 matching lines @@
     ],
     "other.example.com",
     ["other.example.com##[-abp-properties='foo']"]
   );
 
   test.done();
 };
 
 exports.testElemHideEmulationFiltersContainer = function(test)
 {
-  let elemHide = ElemHide.create();
-
-  function compareRules(description, domain, expectedMatches)
+  withNAD(0, elemHide =>
   {
-    let result = ElemHideEmulation.getRulesForDomain(domain, elemHide)
-        .map(filter => filter.text);
-    expectedMatches = expectedMatches.map(filter => filter.text);
-    test.deepEqual(result.sort(), expectedMatches.sort(), description);
-  }
-
-  let domainFilter = Filter.fromText("example.com##filter1");
-  let subdomainFilter = Filter.fromText("www.example.com##filter2");
-  let otherDomainFilter = Filter.fromText("other.example.com##filter3");
-
-  ElemHideEmulation.add(domainFilter);
-  ElemHideEmulation.add(subdomainFilter);
-  ElemHideEmulation.add(otherDomainFilter);
-  compareRules(
-    "Return all matching filters",
-    "www.example.com",
-    [domainFilter, subdomainFilter]
-  );
-
-  ElemHideEmulation.remove(domainFilter);
-  compareRules(
-    "Return all matching filters after removing one",
-    "www.example.com",
-    [subdomainFilter]
-  );
-
-  ElemHideEmulation.clear();
-  compareRules(
-    "Return no filters after clearing",
-    "www.example.com",
-    []
-  );
-
-  elemHide.delete();
+    function compareRules(description, domain, expectedMatches)
+    {
+      let result = ElemHideEmulation.getRulesForDomain(domain, elemHide)
+          .map(filter => filter.text);
+      expectedMatches = expectedMatches.map(filter => filter.text);
+      test.deepEqual(result.sort(), expectedMatches.sort(), description);
+    }
+
+    withNAD([0, 1, 2], (domainFilter, subdomainFilter, otherDomainFilter) =>
+    {
+      ElemHideEmulation.add(domainFilter);
+      ElemHideEmulation.add(subdomainFilter);
+      ElemHideEmulation.add(otherDomainFilter);
+      compareRules(
+        "Return all matching filters",
+        "www.example.com",
+        [domainFilter, subdomainFilter]
+      );
+
+      ElemHideEmulation.remove(domainFilter);
+      compareRules(
+        "Return all matching filters after removing one",
+        "www.example.com",
+        [subdomainFilter]
+      );
+
+      ElemHideEmulation.clear();
+      compareRules(
+        "Return no filters after clearing",
+        "www.example.com",
+        []
+      );
+    })(Filter.fromText("example.com##filter1"),
+       Filter.fromText("www.example.com##filter2"),
+       Filter.fromText("other.example.com##filter3"));
+  })(ElemHide.create());
 
   test.done();
 };