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

5
test/rendering/ol/source/raster.test.js
View File

@@ -27,11 +27,10 @@ where('Uint8ClampedArray').describe('ol.rendering.source.Raster', function() {
}
let map;
function createMap(renderer, pixelRatio) {
function createMap(pixelRatio) {
map = new Map({
target: createMapDiv(200, 200),
pixelRatio: pixelRatio,
renderer: renderer,
view: new View({
center: [0, 0],
zoom: 0
@@ -48,7 +47,7 @@ where('Uint8ClampedArray').describe('ol.rendering.source.Raster', function() {
describe('raster source rendering', function() {
it('renders the result of an operation', function(done) {
createMap('canvas', 1);
createMap(1);
const source = new XYZ({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',

15
test/rendering/ol/source/tilewms.test.js
View File

@@ -1,6 +1,8 @@
import WebGLMap from '../../../../src/ol/WebGLMap.js';
import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import WebGLTileLayer from '../../../../src/ol/layer/WebGLTile.js';
import TileWMS from '../../../../src/ol/source/TileWMS.js';
describe('ol.rendering.source.TileWMS', function() {
@@ -25,10 +27,11 @@ describe('ol.rendering.source.TileWMS', function() {
let map;
function createMap(renderer, pixelRatio) {
map = new Map({
const MapConstructor = renderer === 'webgl' ? WebGLMap : Map;
map = new MapConstructor({
target: createMapDiv(200, 200),
pixelRatio: pixelRatio,
renderer: renderer,
view: new View({
center: [0, 0],
zoom: 5
@@ -74,7 +77,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_1.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new TileLayer({
map.addLayer(new WebGLTileLayer({
source: source
}));
});
@@ -99,7 +102,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_2.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new TileLayer({
map.addLayer(new WebGLTileLayer({
source: source
}));
});
@@ -125,7 +128,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_1.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new TileLayer({
map.addLayer(new WebGLTileLayer({
source: source
}));
});
@@ -150,7 +153,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_2.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new TileLayer({
map.addLayer(new WebGLTileLayer({
source: source
}));
});