diff --git a/.travis.yml b/.travis.yml index 5c4ff86..b6e33e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - sudo apt-get install -qq xvfb install: - npm install - - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.0.3.zip + - wget -O test_data.zip https://github.com/klokantech/tileserver-gl-data/archive/v0.8.zip - unzip -q test_data.zip -d tmp_test_data - mkdir test_data - mv tmp_test_data/tileserver-gl-data-*/* -t test_data diff --git a/test/metadata.js b/test/metadata.js index 2a9a3c5..2414445 100644 --- a/test/metadata.js +++ b/test/metadata.js @@ -64,6 +64,6 @@ describe('Metadata', function() { }); }); - testTileJSON('/styles/test/rendered.json', 'test'); + testTileJSON('/styles/bright/rendered.json', 'bright'); testTileJSON('/data/zurich-vector.json', 'zurich-vector'); }); diff --git a/test/static.js b/test/static.js index 2435c4d..ae7c17d 100644 --- a/test/static.js +++ b/test/static.js @@ -12,88 +12,90 @@ var testStatic = function(prefix, q, format, status, scale, type, query) { }); }; +var prefix = 'bright'; + describe('Static endpoints', function() { describe('center-based', function() { describe('valid requests', function() { describe('various formats', function() { - testStatic('test', '0,0,0/256x256', 'png', 200, undefined, /image\/png/); - testStatic('test', '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/); - testStatic('test', '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/); - testStatic('test', '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/); + testStatic(prefix, '0,0,0/256x256', 'png', 200, undefined, /image\/png/); + testStatic(prefix, '0,0,0/256x256', 'jpg', 200, undefined, /image\/jpeg/); + testStatic(prefix, '0,0,0/256x256', 'jpeg', 200, undefined, /image\/jpeg/); + testStatic(prefix, '0,0,0/256x256', 'webp', 200, undefined, /image\/webp/); }); describe('different parameters', function() { - testStatic('test', '0,0,0/300x300', 'png', 200, 2); - testStatic('test', '0,0,0/300x300', 'png', 200, 3); + testStatic(prefix, '0,0,0/300x300', 'png', 200, 2); + testStatic(prefix, '0,0,0/300x300', 'png', 200, 3); - testStatic('test', '80,40,20/600x300', 'png', 200, 3); - testStatic('test', '8.5,40.5,20/300x150', 'png', 200, 3); - testStatic('test', '-8.5,-40.5,20/300x150', 'png', 200, 3); + testStatic(prefix, '80,40,20/600x300', 'png', 200, 3); + testStatic(prefix, '8.5,40.5,20/300x150', 'png', 200, 3); + testStatic(prefix, '-8.5,-40.5,20/300x150', 'png', 200, 3); - testStatic('test', '8,40,2@0,0/300x150', 'png', 200); - testStatic('test', '8,40,2@180,45/300x150', 'png', 200, 2); - testStatic('test', '8,40,2@10/300x150', 'png', 200, 3); - testStatic('test', '8,40,2@10.3,20.4/300x300', 'png', 200); - testStatic('test', '0,0,2@390,120/300x300', 'png', 200); + testStatic(prefix, '8,40,2@0,0/300x150', 'png', 200); + testStatic(prefix, '8,40,2@180,45/300x150', 'png', 200, 2); + testStatic(prefix, '8,40,2@10/300x150', 'png', 200, 3); + testStatic(prefix, '8,40,2@10.3,20.4/300x300', 'png', 200); + testStatic(prefix, '0,0,2@390,120/300x300', 'png', 200); }); }); describe('invalid requests return 4xx', function() { - testStatic('test', '190,0,0/256x256', 'png', 400); - testStatic('test', '0,86,0/256x256', 'png', 400); - testStatic('test', '80,40,20/0x0', 'png', 400); - testStatic('test', '0,0,0/256x256', 'gif', 400); - testStatic('test', '0,0,0/256x256', 'png', 404, 1); + testStatic(prefix, '190,0,0/256x256', 'png', 400); + testStatic(prefix, '0,86,0/256x256', 'png', 400); + testStatic(prefix, '80,40,20/0x0', 'png', 400); + testStatic(prefix, '0,0,0/256x256', 'gif', 400); + testStatic(prefix, '0,0,0/256x256', 'png', 404, 1); - testStatic('test', '0,0,-1/256x256', 'png', 404); - testStatic('test', '0,0,1.5/256x256', 'png', 404); - testStatic('test', '0,0,0/256.5x256.5', 'png', 404); + testStatic(prefix, '0,0,-1/256x256', 'png', 404); + testStatic(prefix, '0,0,1.5/256x256', 'png', 404); + testStatic(prefix, '0,0,0/256.5x256.5', 'png', 404); - testStatic('test', '0,0,0,/256x256', 'png', 404); - testStatic('test', '0,0,0,0,/256x256', 'png', 404); + testStatic(prefix, '0,0,0,/256x256', 'png', 404); + testStatic(prefix, '0,0,0,0,/256x256', 'png', 404); }); }); describe('area-based', function() { describe('valid requests', function() { describe('various formats', function() { - testStatic('test', '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/); - testStatic('test', '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/); - testStatic('test', '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/); - testStatic('test', '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/); + testStatic(prefix, '-180,-80,180,80/10x10', 'png', 200, undefined, /image\/png/); + testStatic(prefix, '-180,-80,180,80/10x10', 'jpg', 200, undefined, /image\/jpeg/); + testStatic(prefix, '-180,-80,180,80/10x10', 'jpeg', 200, undefined, /image\/jpeg/); + testStatic(prefix, '-180,-80,180,80/10x10', 'webp', 200, undefined, /image\/webp/); }); describe('different parameters', function() { - testStatic('test', '-180,-90,180,90/20x20', 'png', 200, 2); - testStatic('test', '0,0,1,1/200x200', 'png', 200, 3); + testStatic(prefix, '-180,-90,180,90/20x20', 'png', 200, 2); + testStatic(prefix, '0,0,1,1/200x200', 'png', 200, 3); - testStatic('test', '-280,-80,0,80/280x160', 'png', 200); + testStatic(prefix, '-280,-80,0,80/280x160', 'png', 200); }); }); describe('invalid requests return 4xx', function() { - testStatic('test', '0,87,1,88/5x2', 'png', 400); + testStatic(prefix, '0,87,1,88/5x2', 'png', 400); - testStatic('test', '0,0,1,1/1x1', 'gif', 400); + testStatic(prefix, '0,0,1,1/1x1', 'gif', 400); - testStatic('test', '-180,-80,180,80/0.5x2.6', 'png', 404); + testStatic(prefix, '-180,-80,180,80/0.5x2.6', 'png', 404); }); }); describe('autofit path', function() { describe('valid requests', function() { - testStatic('test', 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20'); + testStatic(prefix, 'auto/256x256', 'png', 200, undefined, /image\/png/, '?path=10,10|20,20'); describe('different parameters', function() { - testStatic('test', 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20'); - testStatic('test', 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20'); + testStatic(prefix, 'auto/20x20', 'png', 200, 2, /image\/png/, '?path=10,10|20,20'); + testStatic(prefix, 'auto/200x200', 'png', 200, 3, /image\/png/, '?path=-10,-10|-20,-20'); }); }); describe('invalid requests return 4xx', function() { - testStatic('test', 'auto/256x256', 'png', 400); - testStatic('test', 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10'); - testStatic('test', 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20'); + testStatic(prefix, 'auto/256x256', 'png', 400); + testStatic(prefix, 'auto/256x256', 'png', 400, undefined, undefined, '?path=10,10'); + testStatic(prefix, 'auto/2560x2560', 'png', 400, undefined, undefined, '?path=10,10|20,20'); }); }); }); diff --git a/test/style.js b/test/style.js index de839c1..f66c91c 100644 --- a/test/style.js +++ b/test/style.js @@ -8,13 +8,15 @@ var testIs = function(url, type, status) { }); }; +var prefix = 'bright'; + describe('Styles', function() { - describe('/styles/test.json is valid style', function() { - testIs('/styles/test.json', /application\/json/); + describe('/styles/' + prefix + '.json is valid style', function() { + testIs('/styles/' + prefix + '.json', /application\/json/); it('contains expected properties', function(done) { supertest(app) - .get('/styles/test.json') + .get('/styles/' + prefix + '.json') .expect(function(res) { res.body.version.should.equal(8); res.body.name.should.be.String(); @@ -29,17 +31,17 @@ describe('Styles', function() { testIs('/styles/streets.json', /./, 404); }); - describe('/styles/test/sprite[@2x].{format}', function() { - testIs('/styles/test/sprite.json', /application\/json/); - testIs('/styles/test/sprite@2x.json', /application\/json/); - testIs('/styles/test/sprite.png', /image\/png/); - testIs('/styles/test/sprite@2x.png', /image\/png/); + describe('/styles/' + prefix + '/sprite[@2x].{format}', function() { + testIs('/styles/' + prefix + '/sprite.json', /application\/json/); + testIs('/styles/' + prefix + '/sprite@2x.json', /application\/json/); + testIs('/styles/' + prefix + '/sprite.png', /image\/png/); + testIs('/styles/' + prefix + '/sprite@2x.png', /image\/png/); }); }); describe('Fonts', function() { testIs('/fonts/Open Sans Bold/0-255.pbf', /application\/x-protobuf/); - testIs('/fonts/Open Sans Regular/65280-65533.pbf', /application\/x-protobuf/); + testIs('/fonts/Open Sans Regular/65280-65535.pbf', /application\/x-protobuf/); testIs('/fonts/Open Sans Bold,Open Sans Regular/0-255.pbf', /application\/x-protobuf/); testIs('/fonts/Nonsense,Open Sans Bold/0-255.pbf', /./, 400); diff --git a/test/tiles_rendered.js b/test/tiles_rendered.js index dcb3735..1310a9a 100644 --- a/test/tiles_rendered.js +++ b/test/tiles_rendered.js @@ -9,35 +9,37 @@ var testTile = function(prefix, z, x, y, format, status, scale, type) { }); }; +var prefix = 'bright'; + describe('Raster tiles', function() { describe('valid requests', function() { describe('various formats', function() { - testTile('test', 0, 0, 0, 'png', 200, undefined, /image\/png/); - testTile('test', 0, 0, 0, 'jpg', 200, undefined, /image\/jpeg/); - testTile('test', 0, 0, 0, 'jpeg', 200, undefined, /image\/jpeg/); - testTile('test', 0, 0, 0, 'webp', 200, undefined, /image\/webp/); + 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('different coordinates and scales', function() { - testTile('test', 1, 1, 1, 'png', 200); + testTile(prefix, 1, 1, 1, 'png', 200); - testTile('test', 0, 0, 0, 'png', 200, 2); - testTile('test', 0, 0, 0, 'png', 200, 3); - testTile('test', 2, 1, 1, 'png', 200, 3); + testTile(prefix, 0, 0, 0, 'png', 200, 2); + testTile(prefix, 0, 0, 0, 'png', 200, 3); + testTile(prefix, 2, 1, 1, 'png', 200, 3); }); }); describe('invalid requests return 4xx', function() { testTile('non_existent', 0, 0, 0, 'png', 404); - testTile('test', -1, 0, 0, 'png', 404); - testTile('test', 25, 0, 0, 'png', 404); - testTile('test', 0, 1, 0, 'png', 404); - testTile('test', 0, 0, 1, 'png', 404); - testTile('test', 0, 0, 0, 'gif', 400); - testTile('test', 0, 0, 0, 'pbf', 400); + 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); - testTile('test', 0, 0, 0, 'png', 404, 1); - testTile('test', 0, 0, 0, 'png', 404, 4); + testTile(prefix, 0, 0, 0, 'png', 404, 1); + testTile(prefix, 0, 0, 0, 'png', 404, 4); //testTile('hybrid', 0, 0, 0, 'png', 404); //TODO: test this });