ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update tests

Browse Source
This commit is contained in:
ahocevar
2018-05-24 16:52:06 +02:00
parent c24976155b
commit da570c3a74
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/renderer/canvas/vectortilelayer.test.js
+8 -5
View File
@@ -251,7 +251,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
sourceTile.getImage = function() { sourceTile.getImage = function() {
return document.createElement('canvas'); 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.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0]; tile.wrappedTileCoord = [0, 0, 0];
tile.setState(TileState.LOADED); tile.setState(TileState.LOADED);
@@ -262,7 +264,6 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
return tile; return tile;
}; };
const renderer = new CanvasVectorTileLayerRenderer(layer); const renderer = new CanvasVectorTileLayerRenderer(layer);
renderer.renderTileImage_ = sinon.spy();
const proj = getProjection('EPSG:3857'); const proj = getProjection('EPSG:3857');
const frameState = { const frameState = {
extent: proj.getExtent(), extent: proj.getExtent(),
@@ -279,12 +280,13 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
wantedTiles: {} wantedTiles: {}
}; };
renderer.prepareFrame(frameState, {}); 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, {}); renderer.prepareFrame(frameState, {});
expect(renderer.renderTileImage_.getCalls().length).to.be(1); expect(replayState.renderedTileRevision).to.be(revision);
layer.changed(); layer.changed();
renderer.prepareFrame(frameState, {}); 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; let layer, renderer, replayGroup;
const TileClass = function() { const TileClass = function() {
VectorImageTile.apply(this, arguments); VectorImageTile.apply(this, arguments);
this.extent = [-Infinity, -Infinity, Infinity, Infinity];
this.setState(TileState.LOADED); this.setState(TileState.LOADED);
const sourceTile = new VectorTile([0, 0, 0]); const sourceTile = new VectorTile([0, 0, 0]);
sourceTile.setState(TileState.LOADED); sourceTile.setState(TileState.LOADED);
test/spec/ol/vectorimagetile.test.js
+7 -7
View File
@@ -17,7 +17,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, -1], function() { defaultLoadFunction, [0, 0, -1], function() {
return url; return url;
}, createXYZ(), createXYZ(), {}, }, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
const sourceTile = tile.getTile(tile.tileKeys[0]); const sourceTile = tile.getTile(tile.tileKeys[0]);
@@ -41,7 +41,7 @@ describe('ol.VectorImageTile', function() {
}, [0, 0, -1], function() { }, [0, 0, -1], function() {
return url; return url;
}, createXYZ(), createXYZ(), {}, }, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
let calls = 0; let calls = 0;
@@ -65,7 +65,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, -1], function() { defaultLoadFunction, [0, 0, -1], function() {
return url; return url;
}, createXYZ(), createXYZ(), {}, }, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
@@ -81,7 +81,7 @@ describe('ol.VectorImageTile', function() {
const tile = new VectorImageTile([0, 0, -1], 0, url, format, const tile = new VectorImageTile([0, 0, -1], 0, url, format,
defaultLoadFunction, [0, 0, -1], function() {}, defaultLoadFunction, [0, 0, -1], function() {},
createXYZ(), createXYZ(), {}, createXYZ(), createXYZ(), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
@@ -105,7 +105,7 @@ describe('ol.VectorImageTile', function() {
return url; return url;
}, tileGrid, }, tileGrid,
createXYZ({extent: [-180, -90, 180, 90], tileSize: 512}), 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(); tile.load();
expect(tile.tileKeys.length).to.be(1); expect(tile.tileKeys.length).to.be(1);
expect(tile.getTile(tile.tileKeys[0]).tileCoord).to.eql([0, 16, -10]); 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() { defaultLoadFunction, [0, 0, -1], function() {
return url; return url;
}, createXYZ(), createXYZ({tileSize: 512}), {}, }, createXYZ(), createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
expect(tile.loadListenerKeys_.length).to.be(4); expect(tile.loadListenerKeys_.length).to.be(4);
@@ -138,7 +138,7 @@ describe('ol.VectorImageTile', function() {
defaultLoadFunction, [0, 0, -1], function() { defaultLoadFunction, [0, 0, -1], function() {
return url; return url;
}, createXYZ(), createXYZ({tileSize: 512}), {}, }, createXYZ(), createXYZ({tileSize: 512}), {},
1, getProjection('EPSG:3857'), VectorTile, function() {}); 1, getProjection('EPSG:3857'), VectorTile, function() {}, 0);
tile.load(); tile.load();
listenOnce(tile, 'change', function() { listenOnce(tile, 'change', function() {