Issue 5870 - Implement the new ElemHideEmulation filter type

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 120 matching lines @@
 
     withNAD(
       0, selectors =>
         test.equal(selectors.selectorCount, 2))(
       elemHide.getSelectorsForDomain("example.com", 0));
   })(ElemHide.create());
 
   test.done();
 };
 
+exports.testSyntaxConversion = function(test)
+{
+  function checkConvertedFilter(old, converted)
+  {
+    withNAD(
+      0, filter => test.equal(filter.text, converted))(Filter.fromText(old));
+  }
+
+  checkConvertedFilter("example.com#?#foo[-abp-properties='something']bar", "example.com#?#foo:-abp-properties(something)bar");
+  checkConvertedFilter("example.com#@#foo[-abp-properties='something']bar", "example.com#@#foo:-abp-properties(something)bar");
+  checkConvertedFilter("example.com#?#[-abp-properties=\"something\"]", "example.com#?#:-abp-properties(something)");
+  checkConvertedFilter("example.com#?#[-abp-properties=(something)]", "example.com#?#:-abp-properties((something))");
+
+  test.done();
+};
+
 exports.testDomainRestrictions = function(test)
 {
   function testSelectorMatches(description, filters, domain, expectedMatches)
   {
     withNAD([0, 1], (elemHide, elemHideEmulation) =>
     {
       let addFilter = withNAD(0, filter =>
       {
         if (filter instanceof ElemHideEmulationFilter)
           elemHideEmulation.add(filter);
@@ skipping 15 matching lines @@
         test.deepEqual(matches.sort(), expectedMatches.sort(), description);
       })(elemHideEmulation.getRulesForDomain(elemHide, domain));
 
       elemHideEmulation.clear();
     })(ElemHide.create(), ElemHideEmulation.create());
   }
 
   testSelectorMatches(
     "Ignore generic filters",
     [
-      "##[-abp-properties='foo']", "example.com##[-abp-properties='foo']",
-      "~example.com##[-abp-properties='foo']"
+      "#?#:-abp-properties(foo)", "example.com#?#:-abp-properties(foo)",
+      "~example.com##:-abp-properties(foo)"
     ],
     "example.com",
-    ["example.com##[-abp-properties='foo']"]
+    ["example.com#?#:-abp-properties(foo)"]
   );
   testSelectorMatches(
     "Ignore selectors with exceptions",
     [
-      "example.com##[-abp-properties='foo']",
-      "example.com##[-abp-properties='bar']",
-      "example.com#@#[-abp-properties='foo']"
+      "example.com#?#:-abp-properties(foo)",
+      "example.com#?#:-abp-properties(bar)",
+      "example.com#@#:-abp-properties(foo)"
     ],
     "example.com",
-    ["example.com##[-abp-properties='bar']"]
+    ["example.com#?#:-abp-properties(bar)"]
   );
   testSelectorMatches(
     "Ignore filters that include parent domain but exclude subdomain",
     [
-      "~www.example.com,example.com##[-abp-properties='foo']"
+      "~www.example.com,example.com#?#:-abp-properties(foo)"
     ],
     "www.example.com",
     []
   );
   testSelectorMatches(
     "Ignore filters with parent domain if exception matches subdomain",
     [
-      "www.example.com#@#[-abp-properties='foo']",
-      "example.com##[-abp-properties='foo']"
+      "www.example.com#@#:-abp-properties(foo)",
+      "example.com#?#:-abp-properties(foo)"
     ],
     "www.example.com",
     []
   );
   testSelectorMatches(
     "Ignore filters for other subdomain",
     [
-      "www.example.com##[-abp-properties='foo']",
-      "other.example.com##[-abp-properties='foo']"
+      "www.example.com#?#:-abp-properties(foo)",
+      "other.example.com#?#:-abp-properties(foo)"
     ],
     "other.example.com",
-    ["other.example.com##[-abp-properties='foo']"]
+    ["other.example.com#?#:-abp-properties(foo)"]
   );
 
   test.done();
 };
 
 exports.testElemHideEmulationFiltersContainer = function(test)
 {
   withNAD([0, 1], (elemHide, elemHideEmulation) =>
   {
     function compareRules(description, domain, expectedMatches)
@@ skipping 33 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();
 };