test: refactor test-zlib.js

Trott · addaleax · commit 7bd9ecdb144a · 2016-12-08T02:33:44.000+01:00
* minor layout changes for clarity * assert.equal() and assert.ok() swapped out for assert.strictEqual() * var -> const for modules included via require() PR-URL: #9544 Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
diff --git a/test/parallel/test-zlib.js b/test/parallel/test-zlib.js
@@ -3,13 +3,17 @@ const common = require('../common');
 const assert = require('assert');
 const zlib = require('zlib');
 const path = require('path');
-
-var zlibPairs =
- [[zlib.Deflate, zlib.Inflate],
- [zlib.Gzip, zlib.Gunzip],
- [zlib.Deflate, zlib.Unzip],
- [zlib.Gzip, zlib.Unzip],
- [zlib.DeflateRaw, zlib.InflateRaw]];
+const fs = require('fs');
+const util = require('util');
+const stream = require('stream');
+
+var zlibPairs = [
+ [zlib.Deflate, zlib.Inflate],
+ [zlib.Gzip, zlib.Gunzip],
+ [zlib.Deflate, zlib.Unzip],
+ [zlib.Gzip, zlib.Unzip],
+ [zlib.DeflateRaw, zlib.InflateRaw]
+];
 
 // how fast to trickle through the slowstream
 var trickle = [128, 1024, 1024 * 1024];
@@ -36,23 +40,18 @@ if (!process.env.PUMMEL) {
 strategy = [0];
 }
 
-var fs = require('fs');
-
 var testFiles = ['person.jpg', 'elipses.txt', 'empty.txt'];
 
 if (process.env.FAST) {
 zlibPairs = [[zlib.Gzip, zlib.Unzip]];
 testFiles = ['person.jpg'];
 }
 
-var tests = {};
+const tests = {};
 testFiles.forEach(function(file) {
 tests[file] = fs.readFileSync(path.resolve(common.fixturesDir, file));
 });
 
-var util = require('util');
-var stream = require('stream');
-
 
 // stream that saves everything
 function BufferStream() {
@@ -197,11 +196,16 @@ Object.keys(tests).forEach(function(file) {
 ss.pipe(def).pipe(inf).pipe(buf);
 ss.end(test);
 });
- }); }); }); }); }); }); // sad stallman is sad.
+ });
+ });
+ });
+ });
+ });
+ });
 });
 
 process.on('exit', function(code) {
 console.log('1..' + done);
- assert.equal(done, total, (total - done) + ' tests left unfinished');
- assert.ok(!failures, 'some test failures');
+ assert.strictEqual(done, total, (total - done) + ' tests left unfinished');
+ assert.strictEqual(failures, 0, 'some test failures');
 });

-Original file line number
+Diff line change
 constassert=require('assert');
 constzlib=require('zlib');
 constpath=require('path');
+-
 -varzlibPairs=
 -[[zlib.Deflate,zlib.Inflate],
 -[zlib.Gzip,zlib.Gunzip],
 -[zlib.Deflate,zlib.Unzip],
 -[zlib.Gzip,zlib.Unzip],
 -[zlib.DeflateRaw,zlib.InflateRaw]];
 +constfs=require('fs');
 +constutil=require('util');
 +conststream=require('stream');
++
 +varzlibPairs=[
 +[zlib.Deflate,zlib.Inflate],
 +[zlib.Gzip,zlib.Gunzip],
 +[zlib.Deflate,zlib.Unzip],
 +[zlib.Gzip,zlib.Unzip],
 +[zlib.DeflateRaw,zlib.InflateRaw]
 +];
 // how fast to trickle through the slowstream
 vartrickle=[128,1024,1024*1024];
 strategy=[0];
+}
 -varfs=require('fs');
+-
 vartestFiles=['person.jpg','elipses.txt','empty.txt'];
 if(process.env.FAST){
 zlibPairs=[[zlib.Gzip,zlib.Unzip]];
 testFiles=['person.jpg'];
+}
 -vartests={};
 +consttests={};
 testFiles.forEach(function(file){
 tests[file]=fs.readFileSync(path.resolve(common.fixturesDir,file));
 });
 -varutil=require('util');
 -varstream=require('stream');
+-
 // stream that saves everything
 functionBufferStream(){
 ss.pipe(def).pipe(inf).pipe(buf);
 ss.end(test);
 });
 -});});});});});});// sad stallman is sad.
 +});
 +});
 +});
 +});
 +});
 +});
 });
 process.on('exit',function(code){
 console.log('1..'+done);
 -assert.equal(done,total,(total-done)+' tests left unfinished');
 -assert.ok(!failures,'some test failures');
 +assert.strictEqual(done,total,(total-done)+' tests left unfinished');
 +assert.strictEqual(failures,0,'some test failures');
 });