From 846b8d846c0813551d1e8ad335d872042b7bcff6 Mon Sep 17 00:00:00 2001 From: Jonathan Ong Date: Sun, 21 Apr 2013 02:02:38 -0700 Subject: [PATCH] tests: getter size should test GIF and PNG as well --- test/getterSize.js | 53 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/test/getterSize.js b/test/getterSize.js index 10ed487..52c673d 100644 --- a/test/getterSize.js +++ b/test/getterSize.js @@ -1,20 +1,53 @@ var assert = require('assert'); -module.exports = function (gm, dir, finish, GM) { - if (!GM.integration) +module.exports = function (_, dir, finish, gm) { + if (!gm.integration) return finish(); - gm - .size(function gettersize (err, size) { + sizeJPEG(function (err) { if (err) return finish(err); - assert.equal(size.width, 460); - assert.equal(size.height, 155); - - GM(dir + '/identifyParseErr.jpg').size(function (err) { + sizeGIF(function (err) { if (err) return finish(err); - finish(); + + sizePNG(finish); + }) + }) + + function sizeJPEG(done) { + gm(dir + '/original.jpg') + .size(function gettersize (err, size) { + if (err) return done(err); + + assert.equal(size.width, 460); + assert.equal(size.height, 155); + + gm(dir + '/identifyParseErr.jpg').size(done); }); - }); + } + + function sizeGIF(done) { + gm(dir + '/original.gif') + .size(function (err, size) { + if (err) return done(err); + + assert.equal(size.width, 192) + assert.equal(size.height, 56) + + done() + }) + } + + function sizePNG(done) { + gm(dir + '/original.png') + .size(function (err, size) { + if (err) return done(err); + + assert.equal(size.width, 460) + assert.equal(size.height, 155) + + done() + }) + } }