Issue 4125 - [emscripten] Convert filter classes to C++

test/filterClasses.js

+/*
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2016 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";
 
-let {
-  Filter, InvalidFilter, CommentFilter, ActiveFilter, RegExpFilter,
-  BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter,
-  ElemHideException, CSSPropertyFilter
-} = require("../lib/filterClasses");
+let {createSandbox} = require("./_common");
+
+let Filter = null;
+let InvalidFilter = null;
+let CommentFilter = null;
+let ActiveFilter = null;
+let RegExpFilter = null;
+let BlockingFilter = null;
+let WhitelistFilter = null;
+let ElemHideBase = null;
+let ElemHideFilter = null;
+let ElemHideException = null;
+let CSSPropertyFilter = null;
+
+exports.setUp = function(callback)
+{
+  let sandboxedRequire = createSandbox();
+  (
+    {
+      Filter, InvalidFilter, CommentFilter, ActiveFilter, RegExpFilter,
+      BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter,
+      ElemHideException, CSSPropertyFilter
+    } = sandboxedRequire("../lib/filterClassesNew")
+  );
+  callback();
+};
 
 exports.testFromText = function(test)
 {
   let tests = [
     ["!asdf", CommentFilter, "comment"],
     ["asdf", BlockingFilter, "blocking"],
     ["asdf$image,~collapse", BlockingFilter, "blocking"],
     ["/asdf/", BlockingFilter, "blocking"],
     ["/asdf??+/", InvalidFilter, "invalid"],
     ["@@asdf", WhitelistFilter, "whitelist"],
@@ skipping 81 matching lines @@
         test.ok(!(filter instanceof eval(cls)),
             "Filter " + filter.text + " isn't an instance of " + cls);
       }
     }
     filter.delete();
   }
 
   test.done();
 };
 
-exports.testGetKnownFilter = function(test)
-{
-  let filter1 = Filter.getKnownFilter("someknownfilter");
-  test.ok(!filter1, "Unknown filter returns null");
+exports.testGC = function(test)
+{
+  let filter1 = Filter.fromText("someknownfilter");
+  test.equal(filter1.hitCount, 0, "Initial hit count");
+
+  filter1.hitCount = 432;
 
   let filter2 = Filter.fromText("someknownfilter");
-  filter1 = Filter.getKnownFilter("someknownfilter");
-  test.ok(filter1, "Known filter returned");
-
-  filter2.hitCount = 432;
-  test.equal(filter1.hitCount, 432, "Changes on previous instance are reflected on new instance");
+  test.equal(filter2.hitCount, 432, "Known filter returned");
+
+  filter2.hitCount = 234;
+  test.equal(filter1.hitCount, 234, "Changing second wrapper modifies original as well");
 
   filter1.delete();
   filter2.delete();
+
+  let filter3 = Filter.fromText("someknownfilter");
+  test.equal(filter3.hitCount, 0, "Filter data has been reset once previous instances have been released");
+  filter3.delete();
 
   test.done();
 };
 
 exports.testNormalize = function(test)
 {
   let tests = [
     [" !  comment something ", "!  comment something"],
     [" ! \n comment something ", "!  comment something"],
     ["  foo bar ", "foobar"],
@@ skipping 208 matching lines @@
   {
     let filter = Filter.fromText(text);
     test.equal(filter.regexpString, regexp, "Regular expression of " + text);
     test.equal(filter.selectorPrefix, prefix, "Selector prefix of " + text);
     test.equal(filter.selectorSuffix, suffix, "Selector suffix of " + text);
     filter.delete();
   }
 
   test.done();
 };