From 006375621cda48505f35acdfd02845f4bb7237f0 Mon Sep 17 00:00:00 2001
From: Petteri Pesonen <teemu.p.pesonen@gmail.com>
Date: Tue, 17 Nov 2020 12:32:28 +0200
Subject: [PATCH] Add and fix tiles_rendered tests

---
 test/tiles_rendered.js | 48 +++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/test/tiles_rendered.js b/test/tiles_rendered.js
index 5547f52..de40e7b 100644
--- a/test/tiles_rendered.js
+++ b/test/tiles_rendered.js
@@ -1,6 +1,6 @@
-var 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';
-  var path = '/styles/' + prefix + '/' + z + '/' + x + '/' + y + '.' + format;
+  var path = '/styles/' + prefix + '/' + tileSize + '/' + z + '/' + x + '/' + y + '.' + format;
   it(path + ' returns ' + status, function(done) {
     var test = supertest(app).get(path);
     test.expect(status);
@@ -14,32 +14,42 @@ var 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/);
+      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);
+      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);
+    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
   });