[Tests] refactor so tests are not recursive

test/aes.js

@@ -5,9 +5,10 @@ var bcCrypto = require('browserify-cipher/browser');
 var bcCyphers = bcCrypto.getCiphers();
 var randomBytes = require('pseudorandombytes');
 
-function runIt(i) {
+for (var i = 0; i < 4; i += 1) {
 	bcCrypto.listCiphers().forEach(function (cipher) {
 		test('run: ' + i, function (t) {
+			/* eslint no-loop-func: 0 */
 			t.test('ciphers: ' + cipher, function (st) {
 				st.plan(1);
 				var data = randomBytes(562);
@@ -26,13 +27,8 @@ function runIt(i) {
 			});
 		});
 	});
-	if (i < 4) {
-		setTimeout(runIt, 0, i + 1);
-	}
 }
 
-runIt(1);
-
 test('getCiphers', function (t) {
 	t.plan(1);
 	t.ok(bcCyphers.length, 'get ciphers returns an array');

test/create-hash.js

@@ -8,40 +8,27 @@ var vectors = require('hash-test-vectors');
 
 function runTest(name, createHash, algorithm) {
 	test(name + ' test ' + algorithm + ' against test vectors', function (t) {
-		function run(i) {
-			if (i >= vectors.length) {
-				t.end();
-				return;
-			}
-			var obj = vectors[i];
-
+		vectors.forEach(function (obj, i) {
 			var input = new Buffer(obj.input, 'base64');
 			var node = obj[algorithm];
 			var js = createHash(algorithm).update(input).digest('hex');
-			if (js !== node) {
-				t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node);
-			}
+			t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node);
 
 			encodings.forEach(function (encoding) {
 				var eInput = new Buffer(obj.input, 'base64').toString(encoding);
 				var eNode = obj[algorithm];
 				var eJS = createHash(algorithm).update(eInput, encoding).digest('hex');
-				if (eJS !== eNode) {
-					t.equal(eJS, eNode, algorithm + '(testVector[' + i + '], ' + encoding + ') == ' + eNode);
-				}
+				t.equal(eJS, eNode, algorithm + '(testVector[' + i + '], ' + encoding + ') == ' + eNode);
 			});
 			input = new Buffer(obj.input, 'base64');
 			node = obj[algorithm];
 			var hash = createHash(algorithm);
 			hash.end(input);
 			js = hash.read().toString('hex');
-			if (js !== node) {
-				t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node);
-			}
-			setTimeout(run, 0, i + 1);
-		}
+			t.equal(js, node, algorithm + '(testVector[' + i + ']) == ' + node);
+		});
 
-		run(0);
+		t.end();
 	});
 }
 

test/create-hmac.js

@@ -8,47 +8,31 @@ var vectors = require('hash-test-vectors/hmac');
 function testLib(name, createHmac) {
 	algorithms.forEach(function (alg) {
 		test(name + ' hmac(' + alg + ')', function (t) {
-			function run(i) {
-				if (i >= vectors.length) {
-					t.end();
-					return;
-				}
-				var input = vectors[i];
+			vectors.forEach(function (input) {
 				var output = createHmac(alg, new Buffer(input.key, 'hex'))
 					.update(input.data, 'hex').digest();
 
 				output = input.truncate ? output.slice(0, input.truncate) : output;
 				output = output.toString('hex');
-				if (output !== input[alg]) {
-					t.equal(output, input[alg]);
-				}
-				setTimeout(run, 0, i + 1);
-			}
+				t.equal(output, input[alg]);
+			});
 
-			run(0);
+			t.end();
 		});
 
 		test('hmac(' + alg + ')', function (t) {
-			function run(i) {
-				if (i >= vectors.length) {
-					t.end();
-					return;
-				}
-				var input = vectors[i];
+			vectors.forEach(function (input) {
 				var hmac = createHmac(alg, new Buffer(input.key, 'hex'));
 
 				hmac.end(input.data, 'hex');
 				var output = hmac.read();
 
 				output = input.truncate ? output.slice(0, input.truncate) : output;
 				output = output.toString('hex');
-				if (output !== input[alg]) {
-					t.equal(output, input[alg]);
-				}
-				setTimeout(run, 0, i + 1);
-			}
+				t.equal(output, input[alg]);
+			});
 
-			run(0);
+			t.end();
 		});
 	});
 }

test/node/dh.js

@@ -37,10 +37,13 @@ test('diffie-hellman mod groups', function (t) {
 
 test('diffie-hellman key lengths', function (t) {
 	[
-		64, 65, 192
+		64,
+		65,
+		192
 	].forEach(function (len) {
 		t.test(String(len), function (st) {
-			t.plan(3);
+			st.plan(3);
+
 			var dh2 = cryptoB.createDiffieHellman(len);
 			var prime2 = dh2.getPrime();
 			var p2 = prime2.toString('hex');