Issue 5870 - Implement the new ElemHideEmulation filter type

test/filterClasses.js

Index: test/filterClasses.js
===================================================================
--- a/test/filterClasses.js
+++ b/test/filterClasses.js
@@ -72,34 +72,32 @@
     ["foobar##asdf{asdf}", ElemHideFilter, "elemhide"],
     ["foobar##", BlockingFilter, "blocking", 1],
     ["foobar#@#", BlockingFilter, "blocking", 1],
     ["asdf$foobar", InvalidFilter, "invalid"],
     ["asdf$image,foobar", InvalidFilter, "invalid"],
     ["asdf$image=foobar", BlockingFilter, "blocking", 1],
     ["asdf$image=foobar=xyz,~collapse", BlockingFilter, "blocking", 0],
 
-    ["##foo[-abp-properties='something']bar", InvalidFilter, "invalid"],
-    ["#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["example.com##foo[-abp-properties='something']bar", ElemHideEmulationFilter, "elemhideemulation"],
-    ["example.com#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["~example.com##foo[-abp-properties='something']bar", InvalidFilter, "invalid"],
-    ["~example.com#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["~example.com,~example.info##foo[-abp-properties='something']bar", InvalidFilter, "invalid"],
-    ["~example.com,~example.info#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["~sub.example.com,example.com##foo[-abp-properties='something']bar", ElemHideEmulationFilter, "elemhideemulation"],
-    ["~sub.example.com,example.com#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["example.com,~sub.example.com##foo[-abp-properties='something']bar", ElemHideEmulationFilter, "elemhideemulation"],
-    ["example.com,~sub.example.com#@#foo[-abp-properties='something']bar", ElemHideException, "elemhideexception"],
-    ["example.com##[-abp-properties='something']", ElemHideEmulationFilter, "elemhideemulation"],
-    ["example.com#@#[-abp-properties='something']", ElemHideException, "elemhideexception"],
-    ["example.com##[-abp-properties=\"something\"]", ElemHideEmulationFilter, "elemhideemulation"],
-    ["example.com#@#[-abp-properties=\"something\"]", ElemHideException, "elemhideexception"],
-    ["example.com##[-abp-properties=(something)]", ElemHideEmulationFilter, "elemhideemulation"],
-    ["example.com#@#[-abp-properties=(something)]", ElemHideException, "elemhideexception"]
+    ["#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
+    ["#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
+    ["example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["~example.com#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
+    ["~example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["~example.com,~example.info#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
+    ["~example.com,~example.info#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["~sub.example.com,example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
+    ["~sub.example.com,example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["example.com,~sub.example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
+    ["example.com,~sub.example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
+    ["example.com#?#:-abp-properties(something)", ElemHideEmulationFilter, "elemhideemulation"],
+    ["example.com#@#:-abp-properties(something)", ElemHideException, "elemhideexception"],
+    ["example.com#?#:-abp-properties((something))", ElemHideEmulationFilter, "elemhideemulation"],
+    ["example.com#@#:-abp-properties((something))", ElemHideException, "elemhideexception"]
   ];
   for (let [text, type, typeName, collapse] of tests)
   {
     let filter = Filter.fromText(text);
     test.ok(filter instanceof Filter, "Got filter for " + text);
     test.equal(filter.text, text, "Correct filter text for " + text);
     test.ok(filter instanceof type, "Correct filter type for " + text);
     test.equal(filter.type, typeName, "Type name for " + text + " is " + typeName);
@@ -123,17 +121,17 @@
   ];
   let tests = [
     ["/asdf??+/", Filter, InvalidFilter],
     ["!asdf", Filter, CommentFilter],
     ["asdf", Filter, ActiveFilter, RegExpFilter, BlockingFilter],
     ["@@asdf", Filter, ActiveFilter, RegExpFilter, WhitelistFilter],
     ["##asdf", Filter, ActiveFilter, ElemHideBase, ElemHideFilter],
     ["#@#asdf", Filter, ActiveFilter, ElemHideBase, ElemHideException],
-    ["example.com##[-abp-properties='something']", Filter, ActiveFilter, ElemHideBase, ElemHideEmulationFilter]
+    ["example.com#?#:-abp-properties(something)", Filter, ActiveFilter, ElemHideBase, ElemHideEmulationFilter]
   ];
 
   for (let list of tests)
   {
     let filter = Filter.fromText(list.shift());
     for (let cls of list)
     {
       test.ok(filter instanceof cls,
@@ -272,17 +270,17 @@
   test.done();
 };
 
 exports.testInvalidReasons = function(test)
 {
   let tests = [
     ["/??/", "filter_invalid_regexp"],
     ["asd$foobar", "filter_unknown_option"],
-    ["~foo.com##[-abp-properties='abc']", "filter_elemhideemulation_nodomain"]
+    ["~foo.com#?#:-abp-properties(abc)", "filter_elemhideemulation_nodomain"]
   ];
 
   for (let [text, reason] of tests)
   {
     let filter = Filter.fromText(text);
     test.equals(filter.reason, reason, "Reason why filter " + text + " is invalid");
     filter.delete();
   }
@@ -367,17 +365,17 @@
 
   let tests = [
     ["##foobar", "foobar", ""],
     ["~example.com##foobar", "foobar", ""],
     ["example.com##body > div:first-child", "body > div:first-child", "example.com"],
     ["xYz,~example.com##foobar:not(whatever)", "foobar:not(whatever)", "xyz"],
     ["~xyz,com,~abc.com,example.info##foobar", "foobar", "com,example.info"],
     ["foo,bar,bas,bam##foobar", "foobar", "foo,bar,bas,bam"],
-    ["foo.com##x[-abp-properties='abc']y", "x[-abp-properties='abc']y", "foo.com"],
+    ["foo.com##x:-abp-properties(abc)y", "x:-abp-properties(abc)y", "foo.com"],
 
     // Good idea to test this? Maybe consider behavior undefined in this case.
     ["foo,bar,bas,~bar##foobar", "foobar", "foo,bas"]
   ];
 
   for (let [text, selector, selectorDomain] of tests)
   {
     doTest(text, selector, selectorDomain);
@@ -389,19 +387,19 @@
 
 exports.testElemHideRulesWithBraces = function(test)
 {
   let filter = Filter.fromText("###foo{color: red}");
   test.equal(filter.type, "elemhide");
   test.equal(filter.selector, "#foo\\7B color: red\\7D ");
   filter.delete();
 
-  filter = Filter.fromText("foo.com##[-abp-properties='/margin: [3-4]{2}/']");
+  filter = Filter.fromText("foo.com#?#[-abp-properties='/margin: [3-4]{2}/']");
   test.equal(filter.type, "elemhideemulation");
-  test.equal(filter.selector, "[-abp-properties='/margin: [3-4]\\7B 2\\7D /']");
+  test.equal(filter.selector, ":-abp-properties(/margin: [3-4]\\7B 2\\7D /)");
   filter.delete();
 
   test.done();
 };
 
 exports.testNotifications = function(test)
 {
   function checkNotifications(action, expected, message)