diff --git a/test/tiles_rendered.js b/test/tiles_rendered.js index fb2fcc5..6ceef99 100644 --- a/test/tiles_rendered.js +++ b/test/tiles_rendered.js @@ -1,8 +1,8 @@ -const testTile = function (prefix, z, x, y, format, status, scale, type) { +var testTile = function(prefix, tileSize = 256, z, x, y, format, status, scale, type) { if (scale) y += '@' + scale + 'x'; - const path = '/styles/' + prefix + '/' + z + '/' + x + '/' + y + '.' + format; - it(path + ' returns ' + status, function (done) { - const test = supertest(app).get(path); + var path = '/styles/' + prefix + '/' + tileSize + '/' + z + '/' + x + '/' + y + '.' + format; + it(path + ' returns ' + status, function(done) { + var test = supertest(app).get(path); test.expect(status); if (type) test.expect('Content-Type', type); test.end(done); @@ -11,35 +11,45 @@ const testTile = function (prefix, z, x, y, format, status, scale, type) { const prefix = 'test-style'; -describe('Raster tiles', function () { - describe('valid requests', function () { - describe('various formats', function () { - testTile(prefix, 0, 0, 0, 'png', 200, undefined, /image\/png/); - testTile(prefix, 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/); - testTile(prefix, 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/); - testTile(prefix, 0, 0, 0, 'webp', 200, undefined, /image\/webp/); +describe('Raster tiles', function() { + describe('valid requests', function() { + describe('various formats', function() { + testTile(prefix, 256, 0, 0, 0, 'png', 200, undefined, /image\/png/); + testTile(prefix, 512, 0, 0, 0, 'png', 200, undefined, /image\/png/); + testTile(prefix, 256, 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/); + testTile(prefix, 512, 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/); + testTile(prefix, 256, 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/); + testTile(prefix, 512, 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/); + testTile(prefix, 256, 0, 0, 0, 'webp', 200, undefined, /image\/webp/); + testTile(prefix, 512, 0, 0, 0, 'webp', 200, undefined, /image\/webp/); }); - describe('different coordinates and scales', function () { - testTile(prefix, 1, 1, 1, 'png', 200); + describe('different coordinates and scales', function() { + testTile(prefix, 256, 1, 1, 1, 'png', 200); + testTile(prefix, 512, 0, 0, 0, 'png', 200); - testTile(prefix, 0, 0, 0, 'png', 200, 2); - testTile(prefix, 0, 0, 0, 'png', 200, 3); - testTile(prefix, 2, 1, 1, 'png', 200, 3); + testTile(prefix, 256, 0, 0, 0, 'png', 200, 2); + testTile(prefix, 512, 0, 0, 0, 'png', 200, 2); + testTile(prefix, 256, 0, 0, 0, 'png', 200, 3); + testTile(prefix, 512, 0, 0, 0, 'png', 200, 3); + testTile(prefix, 256, 2, 1, 1, 'png', 200, 3); + testTile(prefix, 512, 2, 1, 1, 'png', 200, 3); }); }); - describe('invalid requests return 4xx', function () { - testTile('non_existent', 0, 0, 0, 'png', 404); - testTile(prefix, -1, 0, 0, 'png', 404); - testTile(prefix, 25, 0, 0, 'png', 404); - testTile(prefix, 0, 1, 0, 'png', 404); - testTile(prefix, 0, 0, 1, 'png', 404); - testTile(prefix, 0, 0, 0, 'gif', 400); - testTile(prefix, 0, 0, 0, 'pbf', 400); + describe('invalid requests return 4xx', function() { + testTile('non_existent', 256, 0, 0, 0, 'png', 404); + testTile(prefix, 256, -1, 0, 0, 'png', 404); + testTile(prefix, 256, 25, 0, 0, 'png', 404); + testTile(prefix, 256, 0, 1, 0, 'png', 404); + testTile(prefix, 256, 0, 0, 1, 'png', 404); + testTile(prefix, 256, 0, 0, 0, 'gif', 400); + testTile(prefix, 256, 0, 0, 0, 'pbf', 400); - testTile(prefix, 0, 0, 0, 'png', 404, 1); - testTile(prefix, 0, 0, 0, 'png', 404, 5); + testTile(prefix, 256, 0, 0, 0, 'png', 404, 1); + testTile(prefix, 256, 0, 0, 0, 'png', 404, 5); + + testTile(prefix, 300, 0, 0, 0, 'png', 404); // testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this });