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

More test cleanup

Browse Source
This commit is contained in:
Tim Schaub
2017-07-03 15:39:02 -06:00
parent a2c043d1b4
commit 3bdddeac1d
14 changed files with 219 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rendering/ol/layer/image.test.js
+12 -16
View File
@@ -11,13 +11,11 @@ goog.require('ol.tilegrid');
describe('ol.rendering.layer.Image', function() {
var target, map;
var map;
function createMap(renderer) {
target = createMapDiv(50, 50);
map = new ol.Map({
target: target,
target: createMapDiv(50, 50),
renderer: renderer,
view: new ol.View({
center: ol.proj.transform(
@@ -25,9 +23,15 @@ describe('ol.rendering.layer.Image', function() {
zoom: 5
})
});
return map;
}
afterEach(function() {
if (map) {
disposeMap(map);
}
map = null;
});
function waitForImages(sources, layerOptions, onImagesLoaded) {
var imagesLoading = 0;
var imagesLoaded = 0;
@@ -70,12 +74,8 @@ describe('ol.rendering.layer.Image', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('tests the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-canvas.png',
IMAGE_TOLERANCE, done);
@@ -84,7 +84,7 @@ describe('ol.rendering.layer.Image', function() {
where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL();
map = createMap('webgl');
createMap('webgl');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-webgl.png',
IMAGE_TOLERANCE, done);
@@ -103,12 +103,8 @@ describe('ol.rendering.layer.Image', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('renders correctly', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-scaled.png',
IMAGE_TOLERANCE, done);
test/rendering/ol/layer/tile.test.js
+24 -39
View File
@@ -17,15 +17,14 @@ goog.require('ol.tilegrid');
describe('ol.rendering.layer.Tile', function() {
var target, map;
var map;
function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) {
var size = opt_size !== undefined ? opt_size : [50, 50];
target = createMapDiv(size[0], size[1]);
map = new ol.Map({
pixelRatio: opt_pixelRatio || 1,
target: target,
target: createMapDiv(size[0], size[1]),
renderer: renderer,
view: new ol.View({
center: opt_center !== undefined ? opt_center : ol.proj.transform(
@@ -34,9 +33,15 @@ describe('ol.rendering.layer.Tile', function() {
zoom: 5
})
});
return map;
}
afterEach(function() {
if (map) {
disposeMap(map);
}
map = null;
});
function waitForTiles(sources, layerOptions, onTileLoaded) {
var tilesLoading = 0;
var tileLoaded = 0;
@@ -76,12 +81,8 @@ describe('ol.rendering.layer.Tile', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('tests the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/osm-canvas.png',
IMAGE_TOLERANCE, done);
@@ -90,7 +91,7 @@ describe('ol.rendering.layer.Tile', function() {
where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL();
map = createMap('webgl');
createMap('webgl');
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/osm-webgl.png',
IMAGE_TOLERANCE, done);
@@ -110,12 +111,8 @@ describe('ol.rendering.layer.Tile', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('tests the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForTiles([source1, source2], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas.png',
IMAGE_TOLERANCE, done);
@@ -124,7 +121,7 @@ describe('ol.rendering.layer.Tile', function() {
where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL();
map = createMap('webgl');
createMap('webgl');
waitForTiles([source1, source2], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-webgl.png',
IMAGE_TOLERANCE, done);
@@ -139,7 +136,7 @@ describe('ol.rendering.layer.Tile', function() {
}
it('tests canvas layer extent clipping', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent.png',
IMAGE_TOLERANCE, done);
@@ -147,7 +144,7 @@ describe('ol.rendering.layer.Tile', function() {
});
it('tests canvas layer extent clipping with rotation', function(done) {
map = createMap('canvas');
createMap('canvas');
map.getView().setRotation(Math.PI / 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-rotate.png',
@@ -156,7 +153,7 @@ describe('ol.rendering.layer.Tile', function() {
});
it('tests canvas layer extent clipping (HiDPI)', function(done) {
map = createMap('canvas', undefined, undefined, 2);
createMap('canvas', undefined, undefined, 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-hidpi.png',
IMAGE_TOLERANCE, done);
@@ -164,7 +161,7 @@ describe('ol.rendering.layer.Tile', function() {
});
it('tests canvas layer extent clipping with rotation (HiDPI)', function(done) {
map = createMap('canvas', undefined, undefined, 2);
createMap('canvas', undefined, undefined, 2);
map.getView().setRotation(Math.PI / 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-rotate-hidpi.png',
@@ -183,12 +180,8 @@ describe('ol.rendering.layer.Tile', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('tests the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForTiles([source], {opacity: 0.2}, function() {
expectResemble(map, 'rendering/ol/layer/expected/opacity-canvas.png',
IMAGE_TOLERANCE, done);
@@ -197,7 +190,7 @@ describe('ol.rendering.layer.Tile', function() {
where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL();
map = createMap('webgl');
createMap('webgl');
waitForTiles([source], {opacity: 0.2}, function() {
expectResemble(map, 'rendering/ol/layer/expected/opacity-webgl.png',
IMAGE_TOLERANCE, done);
@@ -216,13 +209,9 @@ describe('ol.rendering.layer.Tile', function() {
});
}
afterEach(function() {
disposeMap(map);
});
it('512x256 renders correcly using the canvas renderer', function(done) {
var source = createSource('512x256');
map = createMap('canvas', [-10997148, 4569099]);
createMap('canvas', [-10997148, 4569099]);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/512x256-canvas.png',
IMAGE_TOLERANCE, done);
@@ -232,7 +221,7 @@ describe('ol.rendering.layer.Tile', function() {
where('WebGL').it('512x256 renders correcly using the webgl renderer', function(done) {
assertWebGL();
var source = createSource('512x256');
map = createMap('webgl', [-10997148, 4569099]);
createMap('webgl', [-10997148, 4569099]);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/512x256-webgl.png',
IMAGE_TOLERANCE, done);
@@ -241,7 +230,7 @@ describe('ol.rendering.layer.Tile', function() {
it('192x256 renders correcly using the canvas renderer', function(done) {
var source = createSource('192x256');
map = createMap('canvas', [-11271098, 3747248], [100, 100], undefined,
createMap('canvas', [-11271098, 3747248], [100, 100], undefined,
source.getTileGrid().getResolutions());
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/192x256-canvas.png',
@@ -252,7 +241,7 @@ describe('ol.rendering.layer.Tile', function() {
where('WebGL').it('192x256 renders correcly using the webgl renderer', function(done) {
assertWebGL();
var source = createSource('192x256');
map = createMap('webgl', [-11271098, 3747248], [100, 100], undefined,
createMap('webgl', [-11271098, 3747248], [100, 100], undefined,
source.getTileGrid().getResolutions());
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/192x256-webgl.png',
@@ -282,12 +271,8 @@ describe('ol.rendering.layer.Tile', function() {
};
});
afterEach(function() {
disposeMap(map);
});
it('works with the canvas renderer', function(done) {
map = createMap('canvas', undefined, [100, 100]);
createMap('canvas', undefined, [100, 100]);
map.getLayers().on('add', onAddLayer);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/render-canvas.png',
test/rendering/ol/layer/vector.test.js
+33 -31
View File
@@ -16,23 +16,27 @@ goog.require('ol.style.Style');
describe('ol.rendering.layer.Vector', function() {
var center, target, map;
var center = [1825927.7316762917, 6143091.089223046];
var map;
function createMap(renderer) {
target = createMapDiv(80, 80);
center = [1825927.7316762917, 6143091.089223046];
map = new ol.Map({
target: target,
target: createMapDiv(80, 80),
renderer: renderer,
view: new ol.View({
center: center,
zoom: 13
})
});
return map;
}
afterEach(function() {
if (map) {
disposeMap(map);
}
map = null;
});
var source;
function addCircle(r) {
@@ -67,12 +71,8 @@ describe('ol.rendering.layer.Vector', function() {
source = new ol.source.Vector();
});
afterEach(function() {
disposeMap(map);
});
it('renders opacity correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
var smallLine = new ol.Feature(new ol.geom.LineString([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
@@ -137,7 +137,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders rotation correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
map.getView().setRotation(Math.PI + Math.PI / 4);
addPolygon(300);
addCircle(500);
@@ -157,7 +157,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders fill/stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
source = new ol.source.Vector({
overlaps: false
});
@@ -183,7 +183,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
source = new ol.source.Vector({
overlaps: false
});
@@ -207,7 +207,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('interrupts fill/stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
var color;
function createSource(overlaps) {
color = '#3399CC';
@@ -260,7 +260,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('interrupts stroke batches correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
var color;
function createSource(overlaps) {
color = '#3399CC';
@@ -313,9 +313,9 @@ describe('ol.rendering.layer.Vector', function() {
describe('polygon rendering', function() {
var map;
var map2;
beforeEach(function() {
map = new ol.Map({
map2 = new ol.Map({
target: createMapDiv(128, 128),
view: new ol.View({
center: [0, 0],
@@ -325,7 +325,8 @@ describe('ol.rendering.layer.Vector', function() {
});
afterEach(function() {
disposeMap(map);
disposeMap(map2);
map2 = null;
});
it('renders a feature that spans the world', function(done) {
@@ -359,10 +360,10 @@ describe('ol.rendering.layer.Vector', function() {
})
});
map.addLayer(layer);
map2.addLayer(layer);
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/inverted-star.png', 1, done);
map2.once('postrender', function() {
expectResemble(map2, 'rendering/ol/layer/expected/inverted-star.png', 1, done);
});
});
@@ -371,7 +372,7 @@ describe('ol.rendering.layer.Vector', function() {
describe('Polygon simplification', function() {
var layer, map;
var layer, map3;
beforeEach(function() {
var src = new ol.source.Vector({
@@ -402,7 +403,7 @@ describe('ol.rendering.layer.Vector', function() {
projection: 'EPSG:4326'
});
map = new ol.Map({
map3 = new ol.Map({
layers: [layer],
target: createMapDiv(100, 100),
view: view
@@ -410,7 +411,8 @@ describe('ol.rendering.layer.Vector', function() {
});
afterEach(function() {
disposeMap(map);
disposeMap(map3);
map3 = null;
});
it('renders partially out-of-view polygons with a fill and stroke', function(done) {
@@ -423,8 +425,8 @@ describe('ol.rendering.layer.Vector', function() {
color: [255, 0, 0, 1]
})
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-simplified.png',
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified.png',
IMAGE_TOLERANCE, done);
});
});
@@ -435,8 +437,8 @@ describe('ol.rendering.layer.Vector', function() {
color: [0, 0, 0, 1]
})
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-simplified-fill.png',
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified-fill.png',
IMAGE_TOLERANCE, done);
});
});
@@ -448,8 +450,8 @@ describe('ol.rendering.layer.Vector', function() {
width: 2
})
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-simplified-stroke.png',
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified-stroke.png',
IMAGE_TOLERANCE, done);
});
});
test/rendering/ol/layer/vectortile.test.js
+13 -15
View File
@@ -11,23 +11,25 @@ goog.require('ol.tilegrid');
describe('ol.rendering.layer.VectorTile', function() {
var target, map;
var map;
function createMap(renderer, opt_pixelRatio) {
target = createMapDiv(50, 50);
map = new ol.Map({
pixelRatio: opt_pixelRatio,
target: target,
target: createMapDiv(50, 50),
renderer: renderer,
view: new ol.View({
center: [1825927.7316762917, 6143091.089223046],
zoom: 14
})
});
return map;
}
afterEach(function() {
disposeMap(map);
map = null;
});
function waitForTiles(source, layerOptions, onTileLoaded) {
var tilesLoading = 0;
var tileLoaded = 0;
@@ -68,29 +70,25 @@ describe('ol.rendering.layer.VectorTile', function() {
});
});
afterEach(function() {
disposeMap(map);
});
it('renders correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas.png',
11.7, done);
22, done);
});
});
it('renders rotated view correctly with the canvas renderer', function(done) {
map = createMap('canvas');
createMap('canvas');
map.getView().setRotation(Math.PI / 4);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-rotated.png',
13.4, done);
14, done);
});
});
it('renders correctly with the canvas renderer (HiDPI)', function(done) {
map = createMap('canvas', 2);
createMap('canvas', 2);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-hidpi.png',
11.3, done);
@@ -98,7 +96,7 @@ describe('ol.rendering.layer.VectorTile', function() {
});
it('renders rotated view correctly with the canvas renderer (HiDPI)', function(done) {
map = createMap('canvas', 2);
createMap('canvas', 2);
map.getView().setRotation(Math.PI / 4);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-rotated-hidpi.png',