Issue 4128, 5138 - Add Parser and Serializer implemented in C++

test/subscriptionClasses.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 155 matching lines @@
   test.done();
 };
 
 exports.testSubscriptionDefaults = function(test)
 {
   let tests = [
     ["blocking", "test"],
     ["whitelist", "@@test"],
     ["elemhide", "##test"],
     ["elemhide", "#@#test"],
-    ["elemhide", "foo##[-abp-properties='foo']"],
+    ["elemhide", "foo##:-abp-properties(foo)"],
+    ["elemhide", "foo#?#:-abp-properties(foo)"],
+    // Invalid elemhide filter. Incorrectly classified as blocking.
+    // See https://issues.adblockplus.org/ticket/6234
+    ["blocking", "foo#@?#:-abp-properties(foo)"],
     [null, "!test"],
     [null, "/??/"],
     ["blocking whitelist", "test", "@@test"],
     ["blocking elemhide", "test", "##test"]
   ];
 
   for (let [defaults, ...filters] of tests)
   {
     withNAD(1, testSerializeParse)(test, createSubscription("~user~" + filters.join("~"),
       subscription =>
@@ skipping 139 matching lines @@
 exports.testEscapingFilterSerialization = function(test)
 {
   withNAD(0, subscription =>
   {
     let subsriptionAddFilter = withNAD(0, subscription.insertFilterAt, subscription);
 
     subsriptionAddFilter(Filter.fromText("[[x[x[[]x]"), 0);
     subsriptionAddFilter(Filter.fromText("x[[x[x[[]x]x"), 1);
     subsriptionAddFilter(Filter.fromText("x\\[]x"), 2);
 
-    withNAD(1, testSerializeParse)(test, subscription, (serializedData) =>
+    testSerializeParse(test, subscription, (serializedData) =>
       test.ok(serializedData.includes("[Subscription filters]\n\\[\\[x\\[x\\[\\[]x]\nx\\[\\[x\\[x\\[\\[]x]x\nx\\\\[]x\n"), "Filters should be escaped"));
   })(Subscription.fromURL("~user~12345"));
   test.done();
 };
 
 exports.testNotifications = function(test)
 {
   function checkNotifications(action, expected, message)
   {
     let result = null;
@@ skipping 86 matching lines @@
     subscription.downloadStatus = null;
   }, ["subscription.downloadStatus", "http://example.com/"], "Resetting subscription.downloadStatus");
 
   checkNotifications(() =>
   {
     subscription.errors++;
   }, ["subscription.errors", "http://example.com/"], "Increasing subscription.errors");
   checkNotifications(() =>
   {
     subscription.errors = 0;
-  }, ["subscription.errors", "http://example.com/"], "Resetting subscription.erros");
+  }, ["subscription.errors", "http://example.com/"], "Resetting subscription.errors");
 
   subscription.delete();
   test.done();
 };