Issue 4127 - [emscripten] Convert subscription classes to C++ - Part 2

test/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * 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
  * 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 {createSandbox} = require("./_common");
 
 let Filter = null;
 let Subscription = null;
 let SpecialSubscription = null;
 let DownloadableSubscription = null;
 let RegularSubscription = null;
 let ExternalSubscription = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
-  ({Filter} = sandboxedRequire("../lib/filterClassesNew"));
+  ({Filter} = sandboxedRequire("../lib/filterClasses"));
   (
     {
       Subscription, SpecialSubscription, DownloadableSubscription
-    } = sandboxedRequire("../lib/subscriptionClassesNew")
+    } = sandboxedRequire("../lib/subscriptionClasses")
   );
   callback();
 };
 
 function compareSubscription(test, url, expected, postInit)
 {
   expected.push("[Subscription]")
   let subscription = Subscription.fromURL(url);
   if (postInit)
     postInit(subscription)
@@ skipping 12 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 156 matching lines @@
 
   subscription.removeFilterAt(0);
   test.equal(subscription.serializeFilters(), "[Subscription filters]\nfilter2\nfilter1\n", "One filter removed");
 
   subscription.delete();
   filter1.delete();
   filter2.delete();
 
   test.done();
 };