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

Switch map and layer constructor in tests

Browse Source 
The webgl tests do not run currently (which is why these have not been failing).
This commit is contained in:
Tim Schaub
2018-11-04 20:29:54 -07:00
parent ca5b0c63a5
commit a69eeceeba
14 changed files with 122 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/rendering/ol/layer/image.test.js
View File

@@ -1,6 +1,8 @@
import Map from '../../../../src/ol/Map.js';
import WebGLMap from '../../../../src/ol/WebGLMap.js';
import View from '../../../../src/ol/View.js';
import ImageLayer from '../../../../src/ol/layer/Image.js';
import WebGLImageLayer from '../../../../src/ol/layer/Image.js';
import {assign} from '../../../../src/ol/obj.js';
import {get as getProjection, transform, transformExtent} from '../../../../src/ol/proj.js';
import Static from '../../../../src/ol/source/ImageStatic.js';
@@ -12,10 +14,10 @@ describe('ol.rendering.layer.Image', function() {
let map;
function createMap(renderer) {
map = new Map({
const MapConstructor = renderer === 'webgl' ? WebGLMap : Map;
map = new MapConstructor({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
view: new View({
center: transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
@@ -31,7 +33,8 @@ describe('ol.rendering.layer.Image', function() {
map = null;
});
function waitForImages(sources, layerOptions, onImagesLoaded) {
function waitForImages(renderer, sources, layerOptions, onImagesLoaded) {
const LayerConstructor = renderer === 'webgl' ? WebGLImageLayer : ImageLayer;
let imagesLoading = 0;
let imagesLoaded = 0;
@@ -57,7 +60,7 @@ describe('ol.rendering.layer.Image', function() {
source: source
};
assign(options, layerOptions);
map.addLayer(new ImageLayer(options));
map.addLayer(new LayerConstructor(options));
});
}
@@ -75,7 +78,7 @@ describe('ol.rendering.layer.Image', function() {
it('tests the canvas renderer', function(done) {
createMap('canvas');
waitForImages([source], {}, function() {
waitForImages('canvas', [source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-canvas.png',
IMAGE_TOLERANCE, done);
});
@@ -84,7 +87,7 @@ describe('ol.rendering.layer.Image', function() {
where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL();
createMap('webgl');
waitForImages([source], {}, function() {
waitForImages('webgl', [source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-webgl.png',
IMAGE_TOLERANCE, done);
});
@@ -104,7 +107,7 @@ describe('ol.rendering.layer.Image', function() {
it('renders correctly', function(done) {
createMap('canvas');
waitForImages([source], {}, function() {
waitForImages('canvas', [source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-scaled.png',
IMAGE_TOLERANCE, done);
});