ashatora/node-mbtiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update tests

Browse Source
This commit is contained in:
Dane Springmeyer
2011-11-18 17:45:15 -08:00
parent 970330575d
commit cf427905fd
6 changed files with 84 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/info.test.js
+2 -3
View File
@@ -2,7 +2,6 @@ process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var Step = require('step'); var Step = require('step');
var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
var fixtures = { var fixtures = {
@@ -13,7 +12,7 @@ var fixtures = {
try { fs.unlink(fixtures.empty); } catch (err) {} try { fs.unlink(fixtures.empty); } catch (err) {}
exports['get metadata'] = function(beforeExit) { exports['get metadata'] = function(beforeExit, assert) {
var completed = false; var completed = false;
new MBTiles(fixtures.plain_1, function(err, mbtiles) { new MBTiles(fixtures.plain_1, function(err, mbtiles) {
@@ -48,7 +47,7 @@ exports['get metadata'] = function(beforeExit) {
}); });
}; };
exports['get/put metadata from empty file'] = function(beforeExit) { exports['get/put metadata from empty file'] = function(beforeExit, assert) {
var completion = {}; var completion = {};
new MBTiles(fixtures.empty, function(err, mbtiles) { new MBTiles(fixtures.empty, function(err, mbtiles) {
test/list.test.js
+3 -4
View File
@@ -2,7 +2,6 @@ process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var Step = require('step'); var Step = require('step');
var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
var fixtures = { var fixtures = {
@@ -12,17 +11,17 @@ var fixtures = {
try { fs.unlink(fixtures.doesnotexist); } catch (err) {} try { fs.unlink(fixtures.doesnotexist); } catch (err) {}
exports['list'] = function(beforeExit) { exports['list'] = function(beforeExit, assert) {
var completed = false; beforeExit(function() { assert.ok(completed); }); var completed = false; beforeExit(function() { assert.ok(completed); });
MBTiles.list(fixtures.doesnotexist, function(err, list) { MBTiles.list(fixtures.doesnotexist, function(err, list) {
assert.ok(err); assert.ok(err);
assert.equal(err.message, 'ENOENT, No such file or directory'); assert.ok(err.code.match(/^ENOENT/));
MBTiles.list(fixtures.doesnotexist, function(err, list) { MBTiles.list(fixtures.doesnotexist, function(err, list) {
completed = true; completed = true;
assert.ok(err); assert.ok(err);
assert.equal(err.message, 'ENOENT, No such file or directory'); assert.ok(err.code.match(/^ENOENT/));
}); });
}); });
}; };
test/read.test.js
+76 -73
View File
@@ -1,7 +1,6 @@
process.env.NODE_ENV = 'test'; process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
@@ -16,15 +15,17 @@ var fixtures = {
try { fs.unlink(fixtures.non_existent); } catch (err) {} try { fs.unlink(fixtures.non_existent); } catch (err) {}
function yieldsError(status, error, msg) { function yieldsError(assert, status, error, msg) {
return function(err) { return function(err) {
assert.ok(err); assert.ok(err);
assert.equal(err.message, msg); var re = new RegExp( "^" + msg, "i");
assert.ok(err.message.match(re));
status[error]++; status[error]++;
}; };
} }
exports['get tiles'] = function(beforeExit) {
exports['get tiles'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -45,13 +46,13 @@ exports['get tiles'] = function(beforeExit) {
} }
}); });
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 1, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(-1, 0, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, 1, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 0, 1, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, -1, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 1, -1, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 3, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(2, -3, 3, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 262140, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(18, 2, 262140, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 15, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 15, yieldsError(assert, status, 'error', 'Tile does not exist'));
}); });
@@ -61,7 +62,7 @@ exports['get tiles'] = function(beforeExit) {
}); });
}; };
exports['get grids'] = function(beforeExit) { exports['get grids'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -82,13 +83,13 @@ exports['get grids'] = function(beforeExit) {
} }
}); });
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, 1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, -1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 3, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 262140, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 15, yieldsError(assert, status, 'error', 'Grid does not exist'));
}); });
@@ -99,7 +100,7 @@ exports['get grids'] = function(beforeExit) {
}; };
exports['get grids from file without interaction'] = function(beforeExit) { exports['get grids from file without interaction'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -107,20 +108,20 @@ exports['get grids from file without interaction'] = function(beforeExit) {
new MBTiles(fixtures.plain_1, function(err, mbtiles) { new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err; if (err) throw err;
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, -1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 3, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 3, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 4, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 5, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 13, 4, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 14, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 0, 7, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 6, 2, yieldsError(assert, status, 'error', 'Grid does not exist'));
}); });
beforeExit(function() { beforeExit(function() {
@@ -129,7 +130,7 @@ exports['get grids from file without interaction'] = function(beforeExit) {
}); });
}; };
exports['get grids with different schema'] = function(beforeExit) { exports['get grids with different schema'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -150,13 +151,13 @@ exports['get grids with different schema'] = function(beforeExit) {
} }
}); });
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, 1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, 1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, -1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 3, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 262140, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 262140, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 15, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 15, yieldsError(assert, status, 'error', 'Grid does not exist'));
}); });
beforeExit(function() { beforeExit(function() {
@@ -166,7 +167,7 @@ exports['get grids with different schema'] = function(beforeExit) {
}; };
exports['get grids from file without interaction'] = function(beforeExit) { exports['get grids from file without interaction'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -174,20 +175,20 @@ exports['get grids from file without interaction'] = function(beforeExit) {
new MBTiles(fixtures.plain_1, function(err, mbtiles) { new MBTiles(fixtures.plain_1, function(err, mbtiles) {
if (err) throw err; if (err) throw err;
mbtiles.getGrid(0, 1, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 1, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(-1, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(-1, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(0, 0, -1, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 1, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 1, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(2, -3, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(2, -3, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(18, 2, 3, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(18, 2, 3, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 0, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 0, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 3, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 3, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 4, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 4, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 5, 8, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 5, 8, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 13, 4, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 13, 4, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(4, 0, 14, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(4, 0, 14, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 0, 7, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 0, 7, yieldsError(assert, status, 'error', 'Grid does not exist'));
mbtiles.getGrid(3, 6, 2, yieldsError(status, 'error', 'Grid does not exist')); mbtiles.getGrid(3, 6, 2, yieldsError(assert, status, 'error', 'Grid does not exist'));
}); });
beforeExit(function() { beforeExit(function() {
@@ -196,7 +197,7 @@ exports['get grids from file without interaction'] = function(beforeExit) {
}); });
}; };
exports['get tiles from non-existent file'] = function(beforeExit) { exports['get tiles from non-existent file'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -204,20 +205,20 @@ exports['get tiles from non-existent file'] = function(beforeExit) {
new MBTiles(fixtures.non_existent, function(err, mbtiles) { new MBTiles(fixtures.non_existent, function(err, mbtiles) {
if (err) throw err; if (err) throw err;
mbtiles.getTile(0, 1, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 1, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(-1, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(-1, 0, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(0, 0, -1, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 1, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 1, 8, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(2, -3, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(2, -3, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(18, 2, 3, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(18, 2, 3, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 0, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 0, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 3, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 3, 8, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 4, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 4, 8, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 5, 8, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 5, 8, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 13, 4, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 13, 4, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(4, 0, 14, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(4, 0, 14, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 0, 7, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 0, 7, yieldsError(assert, status, 'error', 'Tile does not exist'));
mbtiles.getTile(3, 6, 2, yieldsError(status, 'error', 'Tile does not exist')); mbtiles.getTile(3, 6, 2, yieldsError(assert, status, 'error', 'Tile does not exist'));
}); });
beforeExit(function() { beforeExit(function() {
@@ -226,7 +227,7 @@ exports['get tiles from non-existent file'] = function(beforeExit) {
}); });
}; };
exports['get tiles from corrupt file'] = function(beforeExit) { exports['get tiles from corrupt file'] = function(beforeExit, assert) {
var status = { var status = {
success: 0, success: 0,
error: 0 error: 0
@@ -245,3 +246,5 @@ exports['get tiles from corrupt file'] = function(beforeExit) {
); );
}); });
}; };
test/reloading.test.js
+1 -2
View File
@@ -1,7 +1,6 @@
process.env.NODE_ENV = 'test'; process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
var fixtureDir = __dirname + '/fixtures/output'; var fixtureDir = __dirname + '/fixtures/output';
@@ -17,7 +16,7 @@ var file = fs.readFileSync(fixtures.source);
try { fs.unlinkSync(fixtures.destination); } catch(err) {} try { fs.unlinkSync(fixtures.destination); } catch(err) {}
try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {} try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {}
exports['test file reloading during copying'] = function(beforeExit) { exports['test file reloading during copying'] = function(beforeExit, assert) {
var completed = false; var completed = false;
var status = { var status = {
success: 0, success: 0,
test/write.test.js
+1 -1
View File
@@ -10,7 +10,7 @@ var fixtureDir = __dirname + '/fixtures/output';
try { fs.unlinkSync(fixtureDir + '/write_1.mbtiles'); } catch(err) {} try { fs.unlinkSync(fixtureDir + '/write_1.mbtiles'); } catch(err) {}
try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {} try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {}
exports['test mbtiles file creation'] = function(beforeExit) { exports['test mbtiles file creation'] = function(beforeExit, assert) {
var completed = { written: 0, read: 0 }; var completed = { written: 0, read: 0 };
new MBTiles(fixtureDir + '/write_1.mbtiles', function(err, mbtiles) { new MBTiles(fixtureDir + '/write_1.mbtiles', function(err, mbtiles) {
completed.open = true; completed.open = true;
test/write_grids.test.js
+1 -2
View File
@@ -1,7 +1,6 @@
process.env.NODE_ENV = 'test'; process.env.NODE_ENV = 'test';
var fs = require('fs'); var fs = require('fs');
var assert = require('assert');
var MBTiles = require('..'); var MBTiles = require('..');
var fixtureDir = __dirname + '/fixtures/output'; var fixtureDir = __dirname + '/fixtures/output';
@@ -10,7 +9,7 @@ var fixtureDir = __dirname + '/fixtures/output';
try { fs.unlinkSync(fixtureDir + '/write_2.mbtiles'); } catch(err) {} try { fs.unlinkSync(fixtureDir + '/write_2.mbtiles'); } catch(err) {}
try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {} try { fs.mkdirSync(fixtureDir, 0755); } catch(err) {}
exports['test mbtiles file creation'] = function(beforeExit) { exports['test mbtiles file creation'] = function(beforeExit, assert) {
var completed = { written: 0, read: 0 }; var completed = { written: 0, read: 0 };
new MBTiles(fixtureDir + '/write_2.mbtiles', function(err, mbtiles) { new MBTiles(fixtureDir + '/write_2.mbtiles', function(err, mbtiles) {
completed.open = true; completed.open = true;