From 5310b0ed5fc09fed59a3199837f9a9ef818d161b Mon Sep 17 00:00:00 2001 From: Luke Page Date: Thu, 6 Aug 2015 13:12:14 +0100 Subject: [PATCH] Code format test code --- test/bg.js | 24 +++---- test/convert-images-spec.js | 133 ++++++++++++++++++------------------ test/phantom-compare.js | 116 +++++++++++++++---------------- test/run-compare.js | 45 ++++++------ 4 files changed, 159 insertions(+), 159 deletions(-) diff --git a/test/bg.js b/test/bg.js index d36ff79..ad39243 100644 --- a/test/bg.js +++ b/test/bg.js @@ -1,27 +1,27 @@ #!/usr/bin/env node var fs = require('fs'), - PNG = require('pngjs').PNG; + PNG = require('pngjs').PNG; var png = new PNG({ - width: 10, - height: 10, - filterType: -1 + width: 10, + height: 10, + filterType: -1 }); for (var y = 0; y < png.height; y++) { - for (var x = 0; x < png.width; x++) { - var idx = (png.width * y + x) << 2; + for (var x = 0; x < png.width; x++) { + var idx = (png.width * y + x) << 2; - var col = x < (png.width >> 1) ^ y < (png.height >> 1) ? 0xe5 : 0xff; + var col = x < (png.width >> 1) ^ y < (png.height >> 1) ? 0xe5 : 0xff; - png.data[idx ] = col; - png.data[idx+1] = col; - png.data[idx+2] = col; - png.data[idx+3] = 0xff; - } + png.data[idx] = col; + png.data[idx + 1] = col; + png.data[idx + 2] = col; + png.data[idx + 3] = 0xff; + } } png.pack().pipe(fs.createWriteStream(__dirname + '/bg.png')); diff --git a/test/convert-images-spec.js b/test/convert-images-spec.js index 6fbc1c3..2992589 100644 --- a/test/convert-images-spec.js +++ b/test/convert-images-spec.js @@ -1,88 +1,87 @@ - var fs = require('fs'); var PNG = require('../lib/png').PNG; var test = require('tape'); fs.readdir(__dirname + '/in/', function (err, files) { - if (err) throw err; + if (err) throw err; - files = files.filter(function(file) { - return ((process.argv[3] || "").indexOf("nolarge") < 0 || !file.match(/large/i)) && Boolean(file.match(/\.png$/i)); - }); + files = files.filter(function (file) { + return ((process.argv[3] || "").indexOf("nolarge") < 0 || !file.match(/large/i)) && Boolean(file.match(/\.png$/i)); + }); - console.log("Converting images"); + console.log("Converting images"); - files.forEach(function (file) { + files.forEach(function (file) { - var expectedError = false; - if (file.match(/^x/)) { - expectedError = true; + var expectedError = false; + if (file.match(/^x/)) { + expectedError = true; + } + + test('convert sync - ' + file, function (t) { + + if (file.match(/large/)) { + t.timeoutAfter(1000 * 60); + } else { + t.timeoutAfter(1000); } - test('convert sync - ' + file, function(t) { - - if (file.match(/large/)) { - t.timeoutAfter(1000 * 60); + var data = fs.readFileSync(__dirname + '/in/' + file); + try { + var png = PNG.sync.read(data); + } catch (e) { + if (!expectedError) { + t.fail('Unexpected error parsing..' + file + '\n' + e.message + "\n" + e.stack); } else { - t.timeoutAfter(1000); + t.pass("completed"); } + return t.end(); + } - var data = fs.readFileSync(__dirname + '/in/' + file); - try { - var png = PNG.sync.read(data); - } catch (e) { - if (!expectedError) { - t.fail('Unexpected error parsing..' + file + '\n' + e.message + "\n" + e.stack); - } else { - t.pass("completed"); - } - return t.end(); - } + if (expectedError) { + t.fail("Sync: Error expected, parsed fine .. - " + file); + return t.end(); + } - if (expectedError) { - t.fail("Sync: Error expected, parsed fine .. - " + file); - return t.end(); - } + var outpng = new PNG(); + outpng.gamma = png.gamma; + outpng.data = png.data; + outpng.width = png.width; + outpng.height = png.height; + outpng.pack() + .pipe(fs.createWriteStream(__dirname + '/outsync/' + file) + .on("finish", function () { + t.pass("completed"); + t.end(); + })); + }); - var outpng = new PNG(); - outpng.gamma = png.gamma; - outpng.data = png.data; - outpng.width = png.width; - outpng.height = png.height; - outpng.pack() - .pipe(fs.createWriteStream(__dirname + '/outsync/' + file) - .on("finish", function () { - t.pass("completed"); - t.end(); - })); - }); + test('convert async - ' + file, function (t) { + fs.createReadStream(__dirname + '/in/' + file) + .pipe(new PNG()) + .on('error', function (err) { + if (!expectedError) { + t.fail("Async: Unexpected error parsing.." + file + '\n' + err.message + '\n' + err.stack); + } else { + t.pass("completed"); + } + t.end(); + }) + .on('parsed', function () { - test('convert async - ' + file, function(t) { - fs.createReadStream(__dirname + '/in/' + file) - .pipe(new PNG()) - .on('error', function (err) { - if (!expectedError) { - t.fail("Async: Unexpected error parsing.." + file + '\n' + err.message + '\n' + err.stack); - } else { - t.pass("completed"); - } - t.end(); - }) - .on('parsed', function () { + if (expectedError) { + t.fail("Async: Error expected, parsed fine .." + file); + return t.end(); + } - if (expectedError) { - t.fail("Async: Error expected, parsed fine .." + file); - return t.end(); - } - - this.pack() - .pipe( - fs.createWriteStream(__dirname + '/out/' + file) - .on("finish", function() { - t.pass("completed"); - t.end(); - })); - }); + this.pack() + .pipe( + fs.createWriteStream(__dirname + '/out/' + file) + .on("finish", function () { + t.pass("completed"); + t.end(); + })); }); }); + }); }); diff --git a/test/phantom-compare.js b/test/phantom-compare.js index 7d2a731..289a760 100644 --- a/test/phantom-compare.js +++ b/test/phantom-compare.js @@ -1,58 +1,58 @@ -/*global phantom:true*/ - -'use strict'; - -var page = require('webpage').create(); - -var last = new Date(); -var timeout = 10000; - -setInterval(function() { - var results = page.evaluate(function(){ - if (window.isFinished && window.isFinished()) { - return window.results; - } - }); - - if (results) { - var success = true; - var successes = [], - failures = []; - for(var i = 0; i < results.length; i++) { - var result = results[i]; - if (result.success) { - successes.push(result.name); - } else { - failures.push(result.name); - } - success = success && result.success; - } - console.log("Success:", successes.join(", ")); - if (failures.length) { - console.log("Failure:", failures.join(", ")); - } - - phantom.exit(success ? 0 : 1); - return; - } - - if (new Date() - last > timeout) { - phantom.exit(); - } -}, 100); - -page.onConsoleMessage = function(msg, lineNum, sourceId) { - //console.log('CONSOLE: ' + msg); -}; - -page.onError = function(msg, trace) { - console.log('error.onError', msg, trace); - phantom.exit(); -}; - -phantom.onError = function(msg, trace) { - console.log('error.onError', msg, trace); - phantom.exit(); -}; - -page.open("http://localhost:8000"); +/*global phantom:true*/ + +'use strict'; + +var page = require('webpage').create(); + +var last = new Date(); +var timeout = 10000; + +setInterval(function () { + var results = page.evaluate(function () { + if (window.isFinished && window.isFinished()) { + return window.results; + } + }); + + if (results) { + var success = true; + var successes = [], + failures = []; + for (var i = 0; i < results.length; i++) { + var result = results[i]; + if (result.success) { + successes.push(result.name); + } else { + failures.push(result.name); + } + success = success && result.success; + } + console.log("Success:", successes.join(", ")); + if (failures.length) { + console.log("Failure:", failures.join(", ")); + } + + phantom.exit(success ? 0 : 1); + return; + } + + if (new Date() - last > timeout) { + phantom.exit(); + } +}, 100); + +page.onConsoleMessage = function (msg, lineNum, sourceId) { + //console.log('CONSOLE: ' + msg); +}; + +page.onError = function (msg, trace) { + console.log('error.onError', msg, trace); + phantom.exit(); +}; + +phantom.onError = function (msg, trace) { + console.log('error.onError', msg, trace); + phantom.exit(); +}; + +page.open("http://localhost:8000"); diff --git a/test/run-compare.js b/test/run-compare.js index 4484fc3..b9a98de 100644 --- a/test/run-compare.js +++ b/test/run-compare.js @@ -1,23 +1,24 @@ -require("./http-server"); - -var path = require('path'); -var childProcess = require('child_process'); -var phantomjs = require('phantomjs'); -var binPath = phantomjs.path; - -var childArgs = [ - path.join(__dirname, 'phantom-compare.js') -]; - -try { - console.log("Comparing in PhantomJS"); - - childProcess.execFile(binPath, childArgs, function (err, stdout, stderr) { - // handle results - console.log("Comparison Test Results:"); - console.log(stdout); - process.exit(err ? 1 : 0); - }); -} catch(e) { - console.log("Error starting phantomjs"); +require("./http-server"); + +var path = require('path'); +var childProcess = require('child_process'); +var phantomjs = require('phantomjs'); +var binPath = phantomjs.path; + +var childArgs = [ + path.join(__dirname, 'phantom-compare.js') +]; + +try { + console.log("Comparing in PhantomJS"); + + childProcess.execFile(binPath, childArgs, function (err, stdout, stderr) { + + // handle results + console.log("Comparison Test Results:"); + console.log(stdout); + process.exit(err ? 1 : 0); + }); +} catch (e) { + console.log("Error starting phantomjs"); } \ No newline at end of file