From 3a4c8fac56bf3e5dc41b61a220a9ef14814433af Mon Sep 17 00:00:00 2001 From: Sohail Rajdev Date: Wed, 4 Jul 2018 23:10:03 +0530 Subject: [PATCH 1/2] test: swap arguments in strictEqual() and comment the third argument --- test/pummel/test-timers.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/test/pummel/test-timers.js b/test/pummel/test-timers.js index 7e0492a6425b7d..4d7a3b26e09a57 100644 --- a/test/pummel/test-timers.js +++ b/test/pummel/test-timers.js @@ -31,7 +31,7 @@ let interval_count = 0; clearTimeout(null); clearInterval(null); -assert.strictEqual(true, setTimeout instanceof Function); +assert.strictEqual(setTimeout instanceof Function, true); const starttime = new Date(); setTimeout(common.mustCall(function() { const endtime = new Date(); @@ -40,7 +40,7 @@ setTimeout(common.mustCall(function() { assert.ok(diff > 0); console.error(`diff: ${diff}`); - assert.strictEqual(true, 1000 - WINDOW < diff && diff < 1000 + WINDOW); + assert.strictEqual(1000 - WINDOW < diff && diff < 1000 + WINDOW, true); }), 1000); // this timer shouldn't execute @@ -57,9 +57,9 @@ setInterval(function() { const t = interval_count * 1000; - assert.strictEqual(true, t - WINDOW < diff && diff < t + WINDOW); + assert.strictEqual(t - WINDOW < diff && diff < t + WINDOW, true); - assert.strictEqual(true, interval_count <= 3); + assert.strictEqual(interval_count <= 3, true); if (interval_count === 3) clearInterval(this); }, 1000); @@ -67,13 +67,13 @@ setInterval(function() { // Single param: setTimeout(function(param) { - assert.strictEqual('test param', param); + assert.strictEqual(param, 'test param'); }, 1000, 'test param'); let interval_count2 = 0; setInterval(function(param) { ++interval_count2; - assert.strictEqual('test param', param); + assert.strictEqual(param, 'test param'); if (interval_count2 === 3) clearInterval(this); @@ -82,15 +82,15 @@ setInterval(function(param) { // Multiple param setTimeout(function(param1, param2) { - assert.strictEqual('param1', param1); - assert.strictEqual('param2', param2); + assert.strictEqual(param1, 'param1'); + assert.strictEqual(param2, 'param2'); }, 1000, 'param1', 'param2'); let interval_count3 = 0; setInterval(function(param1, param2) { ++interval_count3; - assert.strictEqual('param1', param1); - assert.strictEqual('param2', param2); + assert.strictEqual(param1, 'param1'); + assert.strictEqual(param2, 'param2'); if (interval_count3 === 3) clearInterval(this); @@ -120,8 +120,9 @@ clearTimeout(y); process.on('exit', function() { - assert.strictEqual(3, interval_count); - assert.strictEqual(11, count4); - assert.strictEqual(0, expectedTimeouts, - 'clearTimeout cleared too many timeouts'); + assert.strictEqual(interval_count, 3); + assert.strictEqual(count4, 11); + + // clearTimeout cleared too many timeouts + assert.strictEqual(expectedTimeouts, 0); }); From c52205e17912827a6ec8acc130a9f78f3860ae82 Mon Sep 17 00:00:00 2001 From: Sohail Rajdev Date: Thu, 5 Jul 2018 07:48:28 +0530 Subject: [PATCH 2/2] better comment message --- test/pummel/test-timers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pummel/test-timers.js b/test/pummel/test-timers.js index 4d7a3b26e09a57..a6766b7a33c11d 100644 --- a/test/pummel/test-timers.js +++ b/test/pummel/test-timers.js @@ -123,6 +123,6 @@ process.on('exit', function() { assert.strictEqual(interval_count, 3); assert.strictEqual(count4, 11); - // clearTimeout cleared too many timeouts + // Check that the correct number of timers ran. assert.strictEqual(expectedTimeouts, 0); });