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 80 matching lines @@
   selectors = ElemHide.getSelectorsForDomain("mail.example.com", 0);
   test.equal(selectors.selectorCount, 3);
 
   ElemHide.remove(filter3);
   selectors = ElemHide.getSelectorsForDomain("example.com", 0);
   test.equal(selectors.selectorCount, 2);
 
   test.done();
 };
 
+exports.testSyntaxConversion = function(test)
+{
+  function checkConvertedFilter(old, converted)
+  {
+    let filter = Filter.fromText(old);
+
+    test.equal(filter.text, converted);
+  }
+
+  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)
   {
     for (let text of filters)
     {
       let filter = Filter.fromText(text);
       if (filter instanceof ElemHideEmulationFilter)
         ElemHideEmulation.add(filter);
       else
         ElemHide.add(filter);
     }
 
     let rules = ElemHideEmulation.getRulesForDomain(domain);
     let matches = [];
     for (let i = 0; i < rules.filterCount; i++)
       matches.push(rules.filterAt(i).text);
     test.deepEqual(matches.sort(), expectedMatches.sort(), description);
 
     ElemHideEmulation.clear();
     ElemHide.clear();
   }
 
   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)
 {
   function compareRules(description, domain, expectedMatches)
   {
     let rules = ElemHideEmulation.getRulesForDomain(domain);
@@ skipping 26 matching lines @@
 
   ElemHideEmulation.clear();
   compareRules(
     "Return no filters after clearing",
     "www.example.com",
     []
   );
 
   test.done();
 };