Tests: remove assertions from benchmark code

This commit is contained in:
Lovell Fuller 2022-09-19 16:09:31 +01:00
parent 28b87db760
commit 4de74bea94

View File

@ -5,7 +5,6 @@ const fs = require('fs');
const { exec } = require('child_process'); const { exec } = require('child_process');
const async = require('async'); const async = require('async');
const assert = require('assert');
const Benchmark = require('benchmark'); const Benchmark = require('benchmark');
// Contenders // Contenders
@ -212,11 +211,10 @@ async.series({
.filter('Lanczos') .filter('Lanczos')
.resize(width, height) .resize(width, height)
.quality(80) .quality(80)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -243,11 +241,10 @@ async.series({
.filter('Lanczos') .filter('Lanczos')
.resize(width, height) .resize(width, height)
.quality(80) .quality(80)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -272,11 +269,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -311,11 +307,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(fixtures.inputJpg) sharp(fixtures.inputJpg)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -326,8 +321,7 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.toBuffer() .toBuffer()
.then(function (buffer) { .then(function () {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
}) })
.catch(function (err) { .catch(function (err) {
@ -350,11 +344,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.sharpen() .sharpen()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -365,11 +358,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.sharpen(3, 1, 3) .sharpen(3, 1, 3)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -380,11 +372,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.blur() .blur()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -395,11 +386,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.blur(3) .blur(3)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -410,11 +400,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.gamma() .gamma()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -425,11 +414,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.normalise() .normalise()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -440,11 +428,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.greyscale() .greyscale()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -456,11 +443,10 @@ async.series({
.resize(width, height) .resize(width, height)
.gamma() .gamma()
.greyscale() .greyscale()
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -471,11 +457,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.jpeg({ progressive: true }) .jpeg({ progressive: true })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -486,11 +471,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.jpeg({ chromaSubsampling: '4:4:4' }) .jpeg({ chromaSubsampling: '4:4:4' })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -501,11 +485,10 @@ async.series({
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.rotate(90) .rotate(90)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -516,12 +499,11 @@ async.series({
sharp.simd(false); sharp.simd(false);
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
sharp.simd(true); sharp.simd(true);
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -531,11 +513,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputJpgBuffer, { sequentialRead: true }) sharp(inputJpgBuffer, { sequentialRead: true })
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -548,11 +529,10 @@ async.series({
fit: 'cover', fit: 'cover',
position: sharp.strategy.entropy position: sharp.strategy.entropy
}) })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -565,11 +545,10 @@ async.series({
fit: 'cover', fit: 'cover',
position: sharp.strategy.attention position: sharp.strategy.attention
}) })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -588,11 +567,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height, { kernel: 'cubic' }) .resize(width, height, { kernel: 'cubic' })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -602,11 +580,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height, { kernel: 'lanczos2' }) .resize(width, height, { kernel: 'lanczos2' })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -616,11 +593,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputJpgBuffer) sharp(inputJpgBuffer)
.resize(width, height, { kernel: 'lanczos3' }) .resize(width, height, { kernel: 'lanczos3' })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -774,11 +750,10 @@ async.series({
.resize(width, height) .resize(width, height)
.define('PNG:compression-level=6') .define('PNG:compression-level=6')
.define('PNG:compression-filter=0') .define('PNG:compression-filter=0')
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -807,11 +782,10 @@ async.series({
sharp(inputPngBuffer) sharp(inputPngBuffer)
.resize(width, height) .resize(width, height)
.png({ compressionLevel: 6 }) .png({ compressionLevel: 6 })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -838,11 +812,10 @@ async.series({
sharp(fixtures.inputPngAlphaPremultiplicationLarge) sharp(fixtures.inputPngAlphaPremultiplicationLarge)
.resize(width, height) .resize(width, height)
.png({ compressionLevel: 6 }) .png({ compressionLevel: 6 })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -854,11 +827,10 @@ async.series({
sharp(inputPngBuffer) sharp(inputPngBuffer)
.resize(width, height) .resize(width, height)
.png({ compressionLevel: 6, progressive: true }) .png({ compressionLevel: 6, progressive: true })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -870,11 +842,10 @@ async.series({
sharp(inputPngBuffer) sharp(inputPngBuffer)
.resize(width, height) .resize(width, height)
.png({ adaptiveFiltering: true, compressionLevel: 6 }) .png({ adaptiveFiltering: true, compressionLevel: 6 })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -886,11 +857,10 @@ async.series({
sharp(inputPngBuffer) sharp(inputPngBuffer)
.resize(width, height) .resize(width, height)
.png({ compressionLevel: 9 }) .png({ compressionLevel: 9 })
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -923,11 +893,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(inputWebPBuffer) sharp(inputWebPBuffer)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -950,11 +919,10 @@ async.series({
fn: function (deferred) { fn: function (deferred) {
sharp(fixtures.inputWebP) sharp(fixtures.inputWebP)
.resize(width, height) .resize(width, height)
.toBuffer(function (err, buffer) { .toBuffer(function (err) {
if (err) { if (err) {
throw err; throw err;
} else { } else {
assert.notStrictEqual(null, buffer);
deferred.resolve(); deferred.resolve();
} }
}); });
@ -966,7 +934,9 @@ async.series({
}).run(); }).run();
} }
}, function (err, results) { }, function (err, results) {
assert(!err, err); if (err) {
throw err;
}
Object.keys(results).forEach(function (format) { Object.keys(results).forEach(function (format) {
if (results[format].toString().substr(0, 5) !== 'sharp') { if (results[format].toString().substr(0, 5) !== 'sharp') {
console.log('sharp was slower than ' + results[format] + ' for ' + format); console.log('sharp was slower than ' + results[format] + ' for ' + format);