diff --git a/tests/parallel.js b/tests/parallel.js index 1377833f..2692dac6 100755 --- a/tests/parallel.js +++ b/tests/parallel.js @@ -1,10 +1,12 @@ -var sharp = require("../index"); -var fs = require("fs"); -var path = require("path"); -var assert = require("assert"); -var async = require("async"); +/*jslint node: true */ +'use strict'; -var inputJpg = path.join(__dirname, "fixtures/2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/ +var sharp = require('../index'); +var path = require('path'); +var assert = require('assert'); +var async = require('async'); + +var inputJpg = path.join(__dirname, 'fixtures/2569067123_aca715a2ee_o.jpg'); // http://www.flickr.com/photos/grizdave/2569067123/ var width = 720; var height = 480; @@ -18,6 +20,7 @@ async.mapSeries([1, 1, 2, 4, 8, 16, 32, 64, 128], function(parallelism, next) { var start = new Date().getTime(); async.times(parallelism, function(id, callback) { + /*jslint unused: false */ sharp(inputJpg).resize(width, height).toBuffer(function(err, buffer) { buffer = null; callback(err, new Date().getTime() - start); @@ -29,7 +32,7 @@ async.mapSeries([1, 1, 2, 4, 8, 16, 32, 64, 128], function(parallelism, next) { var mean = ids.reduce(function(a, b) { return a + b; }) / ids.length; - console.log(parallelism + " parallel calls: fastest=" + ids[0] + "ms slowest=" + ids[ids.length - 1] + "ms mean=" + mean + "ms"); + console.log(parallelism + ' parallel calls: fastest=' + ids[0] + 'ms slowest=' + ids[ids.length - 1] + 'ms mean=' + mean + 'ms'); next(); } ); diff --git a/tests/random.js b/tests/random.js index 4df63bca..b1168d59 100755 --- a/tests/random.js +++ b/tests/random.js @@ -1,68 +1,69 @@ -var sharp = require("../index"); -var fs = require("fs"); -var path = require("path"); -var imagemagick = require("imagemagick"); -var gm = require("gm"); -var async = require("async"); -var assert = require("assert"); -var Benchmark = require("benchmark"); - -var fixturesPath = path.join(__dirname, "fixtures"); -var inputJpg = path.join(fixturesPath, "2569067123_aca715a2ee_o.jpg"); // http://www.flickr.com/photos/grizdave/2569067123/ -var outputJpg = path.join(fixturesPath, "output.jpg"); - -var min = 320; -var max = 960; - -var randomDimension = function() { - return Math.random() * (max - min) + min; -}; - -new Benchmark.Suite("random").add("imagemagick", { - defer: true, - fn: function(deferred) { - imagemagick.resize({ - srcPath: inputJpg, - dstPath: outputJpg, - quality: 0.8, - width: randomDimension(), - height: randomDimension() - }, function(err) { - if (err) { - throw err; - } else { - deferred.resolve(); - } - }); - } -}).add("gm", { - defer: true, - fn: function(deferred) { - gm(inputJpg).resize(randomDimension(), randomDimension()).quality(80).toBuffer(function (err, buffer) { - if (err) { - throw err; - } else { - assert.notStrictEqual(null, buffer); - deferred.resolve(); - } - }); - } -}).add("sharp", { - defer: true, - fn: function(deferred) { - sharp(inputJpg).resize(randomDimension(), randomDimension()).toBuffer(function(err, buffer) { - if (err) { - throw err; - } else { - assert.notStrictEqual(null, buffer); - deferred.resolve(); - } - }); - } -}).on("cycle", function(event) { - console.log(String(event.target)); -}).on("complete", function() { - var winner = this.filter("fastest").pluck("name"); - assert.strictEqual("sharp", String(winner), "sharp was slower than " + winner); - console.dir(sharp.cache()); -}).run(); +/*jslint node: true */ +'use strict'; + +var sharp = require('../index'); +var path = require('path'); +var imagemagick = require('imagemagick'); +var gm = require('gm'); +var assert = require('assert'); +var Benchmark = require('benchmark'); + +var fixturesPath = path.join(__dirname, 'fixtures'); +var inputJpg = path.join(fixturesPath, '2569067123_aca715a2ee_o.jpg'); // http://www.flickr.com/photos/grizdave/2569067123/ +var outputJpg = path.join(fixturesPath, 'output.jpg'); + +var min = 320; +var max = 960; + +var randomDimension = function() { + return Math.random() * (max - min) + min; +}; + +new Benchmark.Suite('random').add('imagemagick', { + defer: true, + fn: function(deferred) { + imagemagick.resize({ + srcPath: inputJpg, + dstPath: outputJpg, + quality: 0.8, + width: randomDimension(), + height: randomDimension() + }, function(err) { + if (err) { + throw err; + } else { + deferred.resolve(); + } + }); + } +}).add('gm', { + defer: true, + fn: function(deferred) { + gm(inputJpg).resize(randomDimension(), randomDimension()).quality(80).toBuffer(function (err, buffer) { + if (err) { + throw err; + } else { + assert.notStrictEqual(null, buffer); + deferred.resolve(); + } + }); + } +}).add('sharp', { + defer: true, + fn: function(deferred) { + sharp(inputJpg).resize(randomDimension(), randomDimension()).toBuffer(function(err, buffer) { + if (err) { + throw err; + } else { + assert.notStrictEqual(null, buffer); + deferred.resolve(); + } + }); + } +}).on('cycle', function(event) { + console.log(String(event.target)); +}).on('complete', function() { + var winner = this.filter('fastest').pluck('name'); + assert.strictEqual('sharp', String(winner), 'sharp was slower than ' + winner); + console.dir(sharp.cache()); +}).run();