From da570c3a74c7a3e2280a490fc05ed7e994fec199 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Thu, 24 May 2018 16:52:06 +0200
Subject: [PATCH] Update tests

---
 .../ol/renderer/canvas/vectortilelayer.test.js     | 13 ++++++++-----
 test/spec/ol/vectorimagetile.test.js               | 14 +++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/test/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js
index c5d76856bb..1c66cc7d61 100644
--- a/test/spec/ol/renderer/canvas/vectortilelayer.test.js
+++ b/test/spec/ol/renderer/canvas/vectortilelayer.test.js
@@ -251,7 +251,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
       sourceTile.getImage = function() {
         return document.createElement('canvas');
       };
-      const tile = new VectorImageTile([0, 0, 0]);
+      const tile = new VectorImageTile([0, 0, 0], undefined, undefined, undefined,
+        undefined, undefined, undefined, undefined, undefined, undefined, undefined,
+        undefined, undefined, undefined, 0);
       tile.transition_ = 0;
       tile.wrappedTileCoord = [0, 0, 0];
       tile.setState(TileState.LOADED);
@@ -262,7 +264,6 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
         return tile;
       };
       const renderer = new CanvasVectorTileLayerRenderer(layer);
-      renderer.renderTileImage_ = sinon.spy();
       const proj = getProjection('EPSG:3857');
       const frameState = {
         extent: proj.getExtent(),
@@ -279,12 +280,13 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
         wantedTiles: {}
       };
       renderer.prepareFrame(frameState, {});
-      expect(renderer.renderTileImage_.getCalls().length).to.be(1);
+      const replayState = renderer.renderedTiles[0].getReplayState(layer);
+      const revision = replayState.renderedTileRevision;
       renderer.prepareFrame(frameState, {});
-      expect(renderer.renderTileImage_.getCalls().length).to.be(1);
+      expect(replayState.renderedTileRevision).to.be(revision);
       layer.changed();
       renderer.prepareFrame(frameState, {});
-      expect(renderer.renderTileImage_.getCalls().length).to.be(2);
+      expect(replayState.renderedTileRevision).to.be(revision + 1);
     });
   });
 
@@ -292,6 +294,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
     let layer, renderer, replayGroup;
     const TileClass = function() {
       VectorImageTile.apply(this, arguments);
+      this.extent = [-Infinity, -Infinity, Infinity, Infinity];
       this.setState(TileState.LOADED);
       const sourceTile = new VectorTile([0, 0, 0]);
       sourceTile.setState(TileState.LOADED);
diff --git a/test/spec/ol/vectorimagetile.test.js b/test/spec/ol/vectorimagetile.test.js
index 625f648ae3..d4d7b9376a 100644
--- a/test/spec/ol/vectorimagetile.test.js
+++ b/test/spec/ol/vectorimagetile.test.js
@@ -17,7 +17,7 @@ describe('ol.VectorImageTile', function() {
       defaultLoadFunction, [0, 0, -1], function() {
         return url;
       }, createXYZ(), createXYZ(), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
     const sourceTile = tile.getTile(tile.tileKeys[0]);
@@ -41,7 +41,7 @@ describe('ol.VectorImageTile', function() {
       }, [0, 0, -1], function() {
         return url;
       }, createXYZ(), createXYZ(), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
     let calls = 0;
@@ -65,7 +65,7 @@ describe('ol.VectorImageTile', function() {
       defaultLoadFunction, [0, 0, -1], function() {
         return url;
       }, createXYZ(), createXYZ(), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
 
@@ -81,7 +81,7 @@ describe('ol.VectorImageTile', function() {
     const tile = new VectorImageTile([0, 0, -1], 0, url, format,
       defaultLoadFunction, [0, 0, -1], function() {},
       createXYZ(), createXYZ(), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
 
@@ -105,7 +105,7 @@ describe('ol.VectorImageTile', function() {
         return url;
       }, tileGrid,
       createXYZ({extent: [-180, -90, 180, 90], tileSize: 512}),
-      sourceTiles, 1, getProjection('EPSG:4326'), VectorTile, function() {});
+      sourceTiles, 1, getProjection('EPSG:4326'), VectorTile, function() {}, 1);
     tile.load();
     expect(tile.tileKeys.length).to.be(1);
     expect(tile.getTile(tile.tileKeys[0]).tileCoord).to.eql([0, 16, -10]);
@@ -118,7 +118,7 @@ describe('ol.VectorImageTile', function() {
       defaultLoadFunction, [0, 0, -1], function() {
         return url;
       }, createXYZ(), createXYZ({tileSize: 512}), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
     expect(tile.loadListenerKeys_.length).to.be(4);
@@ -138,7 +138,7 @@ describe('ol.VectorImageTile', function() {
       defaultLoadFunction, [0, 0, -1], function() {
         return url;
       }, createXYZ(), createXYZ({tileSize: 512}), {},
-      1, getProjection('EPSG:3857'), VectorTile, function() {});
+      1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
 
     tile.load();
     listenOnce(tile, 'change', function() {