change tests to new interface
This commit is contained in:
Konstantin Käfer
@@ -1,61 +0,0 @@
|
||||
var assert = require('assert');
|
||||
var MBTiles = require('..').MBTiles;
|
||||
|
||||
var fixture = __dirname + '/fixtures/online.mbtiles';
|
||||
|
||||
exports['get online metadata'] = function(beforeExit) {
|
||||
var completion = {};
|
||||
|
||||
var mbtiles = new MBTiles(fixture);
|
||||
mbtiles.metadata('name', function(err, value) { if (err) throw err; completion.name = value; });
|
||||
mbtiles.metadata('type', function(err, value) { if (err) throw err; completion.type = value; });
|
||||
mbtiles.metadata('description', function(err, value) { if (err) throw err; completion.description = value; });
|
||||
mbtiles.metadata('version', function(err, value) { if (err) throw err; completion.version = value; });
|
||||
mbtiles.metadata('formatter', function(err, value) { if (err) throw err; completion.formatter = value; });
|
||||
mbtiles.metadata('bounds', function(err, value) { if (err) throw err; completion.bounds = value; });
|
||||
mbtiles.metadata('online', function(err, value) { if (err) throw err; completion.online = value; });
|
||||
mbtiles.metadata('invalid', function(err, value) { completion.invalid = err.message; });
|
||||
|
||||
beforeExit(function() {
|
||||
assert.deepEqual(completion, {
|
||||
name: 'MapQuest streets',
|
||||
type: 'baselayer',
|
||||
description: 'MapQuest’s OpenStreetMap based street level tiles.',
|
||||
version: '1.0.0',
|
||||
formatter: null,
|
||||
bounds: '-180,-90,180,90',
|
||||
online: 'http://otile1.mqcdn.com/tiles/1.0.0/osm/%z/%x/%y.png',
|
||||
invalid: 'Key does not exist'
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
exports['get online tiles'] = function(beforeExit) {
|
||||
var status = {
|
||||
success: 0,
|
||||
error: 0
|
||||
};
|
||||
|
||||
var mbtiles = new MBTiles(fixture);
|
||||
|
||||
mbtiles.db.serialize(function() {
|
||||
mbtiles.db.run("DELETE FROM map");
|
||||
mbtiles.db.run("DELETE FROM images");
|
||||
});
|
||||
|
||||
mbtiles.tile(0, 0, 0, function(err, tile) {
|
||||
if (err) throw new Error(err);
|
||||
status.success++;
|
||||
});
|
||||
|
||||
mbtiles.tile(0, 0, 18, function(err, tile) {
|
||||
if (err) throw new Error(err);
|
||||
status.success++;
|
||||
});
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 2);
|
||||
assert.equal(status.error, 0);
|
||||
});
|
||||
};
|
||||
@@ -1,6 +1,6 @@
|
||||
var fs = require('fs');
|
||||
var assert = require('assert');
|
||||
var MBTiles = require('..').MBTiles;
|
||||
var MBTiles = require('..');
|
||||
|
||||
var fixtures = {
|
||||
plain_1: __dirname + '/fixtures/plain_1.mbtiles',
|
||||
@@ -36,6 +36,7 @@ exports['get metadata'] = function(beforeExit) {
|
||||
|
||||
function yieldsError(status, error, msg) {
|
||||
return function(err) {
|
||||
assert.ok(err);
|
||||
assert.equal(err.message, msg);
|
||||
status[error]++;
|
||||
};
|
||||
@@ -51,7 +52,7 @@ exports['get tiles'] = function(beforeExit) {
|
||||
fs.readdirSync(__dirname + '/fixtures/images/').forEach(function(file) {
|
||||
var coords = file.match(/^plain_1_(\d+)_(\d+)_(\d+).png$/);
|
||||
if (coords) {
|
||||
mbtiles.tile(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, tile) {
|
||||
mbtiles.getTile(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, tile) {
|
||||
if (err) throw err;
|
||||
assert.deepEqual(tile, fs.readFileSync(__dirname + '/fixtures/images/' + file));
|
||||
status.success++;
|
||||
@@ -59,13 +60,13 @@ exports['get tiles'] = function(beforeExit) {
|
||||
}
|
||||
});
|
||||
|
||||
mbtiles.tile(1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(0, -1, 0, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(1, 8, 3, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(-3, 0, 2, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(2, 3, 18, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.tile(0, 0, 4, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(1, 0, 0, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(0, 0, -1, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(0, -1, 0, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(1, 8, 3, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(-3, 0, 2, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(2, 3, 18, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
mbtiles.getTile(0, 0, 4, yieldsError(status, 'error', 'Tile does not exist'));
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 285);
|
||||
@@ -83,7 +84,7 @@ exports['get grids'] = function(beforeExit) {
|
||||
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
|
||||
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
|
||||
if (coords) {
|
||||
mbtiles.grid(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, grid) {
|
||||
mbtiles.getGrid(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, grid) {
|
||||
if (err) throw err;
|
||||
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
|
||||
status.success++;
|
||||
@@ -91,21 +92,21 @@ exports['get grids'] = function(beforeExit) {
|
||||
}
|
||||
});
|
||||
|
||||
mbtiles.grid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
|
||||
mbtiles.grid(3, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(4, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(5, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(13, 4, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(0, 14, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(0, 7, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(6, 2, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(3, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(4, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(5, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(13, 4, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(0, 14, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(0, 7, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(6, 2, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 241);
|
||||
@@ -121,20 +122,20 @@ exports['get grids from file without interaction'] = function(beforeExit) {
|
||||
};
|
||||
|
||||
var mbtiles = new MBTiles(fixtures.plain_1);
|
||||
mbtiles.grid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(3, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(4, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(5, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(13, 4, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 14, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 7, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(6, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(3, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(4, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(5, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(13, 4, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 14, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 7, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(6, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 0);
|
||||
@@ -152,7 +153,7 @@ exports['get grids with different schema'] = function(beforeExit) {
|
||||
fs.readdirSync(__dirname + '/fixtures/grids/').forEach(function(file) {
|
||||
var coords = file.match(/^plain_2_(\d+)_(\d+)_(\d+).json$/);
|
||||
if (coords) {
|
||||
mbtiles.grid(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, grid) {
|
||||
mbtiles.getGrid(coords[1] | 0, coords[2] | 0, coords[3] | 0, function(err, grid) {
|
||||
if (err) throw err;
|
||||
assert.deepEqual(JSON.stringify(grid), fs.readFileSync(__dirname + '/fixtures/grids/' + file, 'utf8'));
|
||||
status.success++;
|
||||
@@ -160,21 +161,21 @@ exports['get grids with different schema'] = function(beforeExit) {
|
||||
}
|
||||
});
|
||||
|
||||
mbtiles.grid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
|
||||
mbtiles.grid(3, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(4, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(5, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(13, 4, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(0, 14, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(0, 7, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.grid(6, 2, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(3, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(4, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(5, 8, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(13, 4, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(0, 14, 4, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(0, 7, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
mbtiles.getGrid(6, 2, 3, yieldsError(status, 'error', 'Grid is invalid'));
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 241);
|
||||
@@ -190,20 +191,20 @@ exports['get grids from file without interaction'] = function(beforeExit) {
|
||||
};
|
||||
|
||||
var mbtiles = new MBTiles(fixtures.plain_1);
|
||||
mbtiles.grid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(3, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(4, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(5, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(13, 4, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 14, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(0, 7, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.grid(6, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 0, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, -1, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, -1, 0, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(1, 8, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(-3, 0, 2, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(2, 3, 18, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 0, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(3, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(4, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(5, 8, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(13, 4, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 14, 4, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(0, 7, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
mbtiles.getGrid(6, 2, 3, yieldsError(status, 'error', 'Grid does not exist'));
|
||||
|
||||
beforeExit(function() {
|
||||
assert.equal(status.success, 0);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var fs = require('fs');
|
||||
var assert = require('assert');
|
||||
var MBTiles = require('..').MBTiles;
|
||||
var MBTiles = require('..');
|
||||
|
||||
var fixtureDir = __dirname + '/fixtures/output';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user