Noissue - Merge current tip to Edge bookmark

qunit/tests/versionComparator.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/>.
  */
 
+/* globals Cu */
+
 "use strict";
 
+(function()
 {
-  let compare = Services.vc.compare;
+  const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+  const {compare} = Services.vc;
 
   function allPairs(array)
   {
     let pairs = [];
     for (let i = 0; i < array.length - 1; i++)
+    {
       for (let j = i + 1; j < array.length; j++)
         pairs.push([array[i], array[j]]);
+    }
     return pairs;
   }
 
   function versionsEqual(versions)
   {
     allPairs(versions).forEach(pair =>
     {
       let v1 = pair[0];
       let v2 = pair[1];
       equal(compare(v1, v2), 0, "'" + v1 + "' should be equal to '" + v2 + "'");
@@ skipping 41 matching lines @@
       "1.0+a",
       "1.0a",
       "1.0pre1",
       "1.0pre2",
       ["1.0", "1.0.0", "1.0.0.0"],
       ["1.1pre", "1.1pre0", "1.0+"],
       "1.1pre1a",
       "1.1pre1",
       "1.1pre10a",
       ["1.1pre10", "1.1pre010"],
-      ["1.10", "1.010", "1.00010"],
+      ["1.10", "1.010", "1.00010"]
     ];
 
     examples.forEach(example =>
     {
       if (example instanceof Array)
         versionsEqual(example);
     });
 
     allPairs(examples).forEach(pair =>
     {
       let v1 = [].concat(pair[0]);
       let v2 = [].concat(pair[1]);
       for (let i = 0; i < v1.length; i++)
+      {
         for (let j = 0; j < v2.length; j++)
           versionSmaller(v1[i], v2[j]);
+      }
     });
   });
-}
+}());