Issue 5063 - [emscripten] Make FilterNotifier calls more efficient

test/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 50 matching lines @@
 };
 
 exports.testSubscriptionsWithState = function(test)
 {
   compareSubscription(test, "~fl~", ["url=~fl~"]);
   compareSubscription(test, "http://test/default", ["url=http://test/default", "title=http://test/default"]);
   compareSubscription(test, "http://test/default_titled", ["url=http://test/default_titled", "title=test"], function(subscription)
   {
     subscription.title = "test";
   });
-  compareSubscription(test, "http://test/non_default", ["url=http://test/non_default", "title=test", "fixedTitle=true",
-                                                  "disabled=true", "lastSuccess=8", "lastDownload=12", "lastCheck=16", "softExpiration=18", "expires=20", "downloadStatus=foo",
-                                                  "errors=3", "version=24", "requiredVersion=0.6"], function(subscription)
+  compareSubscription(test, "http://test/non_default", [
+    "url=http://test/non_default", "title=test", "fixedTitle=true",
+    "disabled=true", "lastSuccess=20015998341138",
+    "lastDownload=5124097847590911", "lastCheck=18446744069414584320",
+    "softExpiration=2682143778081159", "expires=4294967295",
+    "downloadStatus=foo", "errors=3", "version=24", "requiredVersion=0.6"
+  ], function(subscription)
   {
     subscription.title = "test";
     subscription.fixedTitle = true;
     subscription.disabled = true;
-    subscription.lastSuccess = 8;
-    subscription.lastDownload = 12;
-    subscription.lastCheck = 16;
-    subscription.softExpiration = 18;
-    subscription.expires = 20;
+    subscription.lastSuccess = 20015998341138;       // 0x123456789012
+    subscription.lastDownload = 5124097847590911;    // 0x123456FFFFFFFF
+    subscription.lastCheck = 18446744069414584320;   // 0xFFFFFFFF00000000
+    subscription.softExpiration = 2682143778081159;  // 0x9876543210987
+    subscription.expires = 4294967295;               // 0xFFFFFFFF
     subscription.downloadStatus = "foo";
     subscription.errors = 3;
     subscription.version = 24
     subscription.requiredVersion = "0.6";
   });
   compareSubscription(test, "~wl~", ["url=~wl~", "disabled=true", "title=Test group"], function(subscription)
   {
     subscription.title = "Test group";
     subscription.disabled = true;
   });
@@ skipping 162 matching lines @@
   filter2.delete();
 
   test.done();
 };
 
 exports.testNotifications = function(test)
 {
   function checkNotifications(action, expected, message)
   {
     let result = null;
-    let listener = (topic, subscription, newValue, oldValue) =>
+    let listener = (topic, subscription) =>
     {
       if (result)
         test.ok(false, "Got more that one notification - " + message);
       else
-        result = [topic, subscription.url, newValue, oldValue];
+        result = [topic, subscription.url];
     };
     FilterNotifier.addListener(listener);
     action();
     FilterNotifier.removeListener(listener);
     test.deepEqual(result, expected, message);
   }
 
   let subscription = Subscription.fromURL("http://example.com/");
   checkNotifications(() =>
   {
     subscription.title = "foobar";
-  }, ["subscription.title", "http://example.com/", "foobar", "http://example.com/"], "Changing subscription title");
+  }, ["subscription.title", "http://example.com/"], "Changing subscription title");
   checkNotifications(() =>
   {
     subscription.title = "foobar";
   }, null, "Setting subscription title to same value");
   checkNotifications(() =>
   {
     subscription.title = null;
-  }, ["subscription.title", "http://example.com/", "", "foobar"], "Resetting subscription title");
+  }, ["subscription.title", "http://example.com/"], "Resetting subscription title");
 
   checkNotifications(() =>
   {
     subscription.disabled = true;
-  }, ["subscription.disabled", "http://example.com/", true, false], "Disabling subscription");
+  }, ["subscription.disabled", "http://example.com/"], "Disabling subscription");
   checkNotifications(() =>
   {
     subscription.disabled = true;
   }, null, "Disabling already disabled subscription");
   checkNotifications(() =>
   {
     subscription.disabled = false;
-  }, ["subscription.disabled", "http://example.com/", false, true], "Enabling subscription");
+  }, ["subscription.disabled", "http://example.com/"], "Enabling subscription");
 
   checkNotifications(() =>
   {
     subscription.fixedTitle = true;
-  }, ["subscription.fixedTitle", "http://example.com/", true, false], "Marking title as fixed");
+  }, ["subscription.fixedTitle", "http://example.com/"], "Marking title as fixed");
   checkNotifications(() =>
   {
     subscription.fixedTitle = false;
-  }, ["subscription.fixedTitle", "http://example.com/", false, true], "Marking title as editable");
+  }, ["subscription.fixedTitle", "http://example.com/"], "Marking title as editable");
 
   checkNotifications(() =>
   {
     subscription.homepage = "http://example.info/";
-  }, ["subscription.homepage", "http://example.com/", "http://example.info/", ""], "Changing subscription homepage");
+  }, ["subscription.homepage", "http://example.com/"], "Changing subscription homepage");
   checkNotifications(() =>
   {
     subscription.homepage = null;
-  }, ["subscription.homepage", "http://example.com/", "", "http://example.info/"], "Resetting subscription homepage");
-
-  checkNotifications(() =>
-  {
-    // Using a large number that will only fit into double but not int
-    subscription.lastCheck = 123456789012345;
-  }, ["subscription.lastCheck", "http://example.com/", 123456789012345, 0], "Changing subscription.lastCheck");
-  checkNotifications(() =>
-  {
-    subscription.lastCheck = 123456789012345;
+  }, ["subscription.homepage", "http://example.com/"], "Resetting subscription homepage");
+
+  checkNotifications(() =>
+  {
+    subscription.lastCheck = 1234;
+  }, ["subscription.lastCheck", "http://example.com/"], "Changing subscription.lastCheck");
+  checkNotifications(() =>
+  {
+    subscription.lastCheck = 1234;
   }, null, "Setting subscription.lastCheck to same value");
   checkNotifications(() =>
   {
     subscription.lastCheck = 0;
-  }, ["subscription.lastCheck", "http://example.com/", 0, 123456789012345], "Resetting subscription.lastCheck");
-
-  checkNotifications(() =>
-  {
-    // Using a large number that will only fit into double but not int
-    subscription.lastDownload = 543210987654321;
-  }, ["subscription.lastDownload", "http://example.com/", 543210987654321, 0], "Changing subscription.lastDownload");
+  }, ["subscription.lastCheck", "http://example.com/"], "Resetting subscription.lastCheck");
+
+  checkNotifications(() =>
+  {
+    subscription.lastDownload = 4321;
+  }, ["subscription.lastDownload", "http://example.com/"], "Changing subscription.lastDownload");
   checkNotifications(() =>
   {
     subscription.lastDownload = 0;
-  }, ["subscription.lastDownload", "http://example.com/", 0, 543210987654321], "Resetting subscription.lastDownload");
+  }, ["subscription.lastDownload", "http://example.com/"], "Resetting subscription.lastDownload");
 
   checkNotifications(() =>
   {
     subscription.downloadStatus = "ok";
-  }, ["subscription.downloadStatus", "http://example.com/", "ok", ""], "Changing subscription.downloadStatus");
+  }, ["subscription.downloadStatus", "http://example.com/"], "Changing subscription.downloadStatus");
   checkNotifications(() =>
   {
     subscription.downloadStatus = null;
-  }, ["subscription.downloadStatus", "http://example.com/", "", "ok"], "Resetting subscription.downloadStatus");
+  }, ["subscription.downloadStatus", "http://example.com/"], "Resetting subscription.downloadStatus");
 
   checkNotifications(() =>
   {
     subscription.errors++;
-  }, ["subscription.errors", "http://example.com/", 1, 0], "Increasing subscription.errors");
+  }, ["subscription.errors", "http://example.com/"], "Increasing subscription.errors");
   checkNotifications(() =>
   {
     subscription.errors = 0;
-  }, ["subscription.errors", "http://example.com/", 0, 1], "Resetting subscription.erros");
-
-  subscription.delete();
-  test.done();
-};
+  }, ["subscription.errors", "http://example.com/"], "Resetting subscription.erros");
+
+  subscription.delete();
+  test.done();
+};