All tests now use vanilla JS

Author: mihaifm

extensions/linq.qunit.js

@@ -2,25 +2,25 @@
   "name": "linq",
   "author": "Mihai Ciuraru <mihaixc@gmail.com>",
   "description": "linq.js - LINQ for JavaScript library packaged for node.js",
-  "version": "3.2.2",
+  "version": "3.2.3",
+  "license": "MIT",
   "homepage": "https://github.com/mihaifm/linq",
   "repository": {
     "type": "git",
     "url": "https://github.com/mihaifm/linq.git"
   },
   "scripts": {
-    "test": "node test/testrunner.js"
+    "test": "node test/testrunner.js",
+    "minify": "uglifyjs linq.js -c -m -o linq.min.js"
   },
   "preferGlobal": false,
   "keywords": [
     "linq"
   ],
   "dependencies": {},
   "devDependencies": {
-    "node-minify": "^1.2.0",
-    "qunit": "~0.6.0"
+    "uglify-js": "3.10.3"
   },
-  "optionalDependencies": {},
   "engines": {
     "node": "*"
   },

package.json

@@ -1,15 +1,12 @@
-var module = QUnit.module;
+var {test, testModule, deepEqual} = require('./testutils.js')
 var Enumerable = require('../linq.min');
-require("../extensions/linq.qunit.js")({'Enumerable': Enumerable});
 
-module("Action");
-
-var expected, actual; // will be removed
+testModule("Action");
 
 test("doAction", function ()
 {
     var array = [];
-    actual = Enumerable.range(1, 10).doAction(function (i) { array.push(i) }).toArray();
+    let actual = Enumerable.range(1, 10).doAction(function (i) { array.push(i) }).toArray();
     deepEqual(actual, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 
     array = []
@@ -22,7 +19,7 @@ test("doAction", function ()
 
 test("forEach", function ()
 {
-    actual = [];
+    let actual = [];
     Enumerable.range(1, 10).forEach(function (i) { actual.push(i) });
     deepEqual(actual, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 
@@ -45,7 +42,7 @@ test("forEach", function ()
 
 test("force", function ()
 {
-    var actual = [];
+    let actual = [];
     Enumerable.range(1, 10).doAction(function (i) { actual.push(i) }).force();
     deepEqual(actual, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 });

test/action.js

@@ -1,26 +1,22 @@
-var module = QUnit.module;
+var {test, testModule, deepEqual, strictEqual, equal} = require('./testutils.js')
 var Enumerable = require('../linq.min');
-require("../extensions/linq.qunit.js")({'Enumerable': Enumerable});
 
-module("Aggregate");
-
-var expected, actual; // will be removed
+testModule("Aggregate");
 
 test("aggregate", function () {
-    Enumerable.range(1, 10).aggregate("a,b=>a+b").is(55);
-    Enumerable.range(1, 10).aggregate(10, "a,b=>a+b").is(65);
-    Enumerable.range(1, 10).aggregate(10, "a,b=>a+b", "val=>val*10").is(650);
-
-    Enumerable.range(1, 10).aggregate("", "s,x=>s+x", "'hoge' + $").is("hoge12345678910");
+    strictEqual(Enumerable.range(1, 10).aggregate("a,b=>a+b"), 55);
+    strictEqual(Enumerable.range(1, 10).aggregate(10, "a,b=>a+b"), 65);
+    strictEqual(Enumerable.range(1, 10).aggregate(10, "a,b=>a+b", "val=>val*10"), 650);
+    strictEqual(Enumerable.range(1, 10).aggregate("", "s,x=>s+x", "'hoge' + $"), "hoge12345678910");
 });
 
 test("average", function () {
-    Enumerable.range(1, 10).average().is(5.5);
-    Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").average("t=>t.i").is(4.5);
+    strictEqual(Enumerable.range(1, 10).average(), 5.5);
+    strictEqual(Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").average("t=>t.i"), 4.5);
 });
 
 test("count", function () {
-    actual = Enumerable.range(1, 10).count();
+    let actual = Enumerable.range(1, 10).count();
     equal(actual, 10);
     actual = Enumerable.empty().count();
     equal(actual, 0);
@@ -30,33 +26,33 @@ test("count", function () {
 });
 
 test("Max", function () {
-    actual = Enumerable.range(1, 10).max();
+    let actual = Enumerable.range(1, 10).max();
     equal(actual, 10);
 
     actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").max("t=>t.i");
     equal(actual, 9);
 });
 
 test("min", function () {
-    actual = Enumerable.range(1, 10).min();
+    let actual = Enumerable.range(1, 10).min();
     equal(actual, 1);
 
     actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").min("t=>t.i");
     equal(actual, 0);
 });
 
 test("maxBy", function () {
-    actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").maxBy("t=>t.i");
+    let actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").maxBy("t=>t.i");
     deepEqual(actual, { v: 10, i: 9 });
 });
 
 test("minBy", function () {
-    actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").minBy("t=>t.i");
+    let actual = Enumerable.range(1, 10).select("v,i=>{v:v,i:i}").minBy("t=>t.i");
     deepEqual(actual, { v: 1, i: 0 });
 });
 
 test("sum", function () {
-    actual = Enumerable.range(1, 10).sum();
+    let actual = Enumerable.range(1, 10).sum();
     equal(actual, 55);
     actual = Enumerable.empty().sum();
     equal(actual, 0);

test/aggregate.js

@@ -1,8 +1,7 @@
-var module = QUnit.module;
+var {test, testModule, deepEqual, strictEqual, equal, ok} = require('./testutils.js')
 var Enumerable = require('../linq.min');
-require("../extensions/linq.qunit.js")({'Enumerable': Enumerable});
 
-module("ArrayEnumerable");
+testModule("ArrayEnumerable");
 
 var arraySequence = Enumerable.from([1, 10, 100, 1000, 10000]);
 var emptySequence = Enumerable.from([]);

test/arrayEnumerable.js

@@ -1,21 +1,18 @@
-var module = QUnit.module;
+var {test, testModule, deepEqual, equal, ok} = require('./testutils.js')
 var Enumerable = require('../linq.min');
-require("../extensions/linq.qunit.js")({'Enumerable': Enumerable});
 
-module("Convert");
-
-var expected, actual; // will be removed
+testModule("Convert");
 
 test("toArray", function ()
 {
-    actual = Enumerable.range(1, 10).toArray();
+    let actual = Enumerable.range(1, 10).toArray();
     deepEqual(actual, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 });
 
 test("toLookup", function ()
 {
     var fileList = ["temp.xls", "temp2.xls", "temp.pdf", "temp.jpg", "temp2.pdf"];
-    actual = Enumerable.from(fileList).toLookup("file=>file.match(/\\.(.+$)/)[1]");
+    let actual = Enumerable.from(fileList).toLookup("file=>file.match(/\\.(.+$)/)[1]");
 
     deepEqual(["temp.xls", "temp2.xls"], actual.get("xls").toArray());
     deepEqual(["temp.pdf", "temp2.pdf"], actual.get("pdf").toArray());
@@ -44,14 +41,14 @@ test("toLookup", function ()
 
 test("toObject", function ()
 {
-    actual = Enumerable.range(1, 3).toObject("i=>'foo'+i", "i=>i*4");
+    let actual = Enumerable.range(1, 3).toObject("i=>'foo'+i", "i=>i*4");
     deepEqual(actual, { foo1: 4, foo2: 8, foo3: 12 });
 });
 
 
 test("toDictionary", function ()
 {
-    actual = Enumerable.range(1, 3).toDictionary("i=>'foo'+i", "i=>i*4");
+    let actual = Enumerable.range(1, 3).toDictionary("i=>'foo'+i", "i=>i*4");
     equal(4, actual.get("foo1"));
     equal(8, actual.get("foo2"));
     equal(12, actual.get("foo3"));
@@ -64,7 +61,7 @@ test("toDictionary", function ()
 
 test("toJoinedString", function ()
 {
-    actual = Enumerable.range(1, 3).toJoinedString();
+    let actual = Enumerable.range(1, 3).toJoinedString();
     equal(actual, "123");
 
     actual = Enumerable.range(1, 3).toJoinedString("-");
@@ -76,7 +73,7 @@ test("toJoinedString", function ()
 
 test("toJSONString", function ()
 {
-    actual = Enumerable.from([{ a: 1, b: true }, { a: null, b: "aaa"}]).toJSONString();
+    let actual = Enumerable.from([{ a: 1, b: true }, { a: null, b: "aaa"}]).toJSONString();
     equal(actual, '[{"a":1,"b":true},{"a":null,"b":"aaa"}]');
 
     actual = Enumerable.range(1, 5).toJSONString();