Conditionally run WebGL rendering tests

This commit is contained in:
Tim Schaub
2017-07-03 14:15:00 -06:00
parent 36f01e7b08
commit a5113715ef
11 changed files with 28 additions and 27 deletions

View File

@@ -82,7 +82,7 @@ describe('ol.rendering.layer.Image', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
waitForImages([source], {}, function() { waitForImages([source], {}, function() {

View File

@@ -88,7 +88,7 @@ describe('ol.rendering.layer.Tile', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
waitForTiles([source], {}, function() { waitForTiles([source], {}, function() {
@@ -122,7 +122,7 @@ describe('ol.rendering.layer.Tile', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
waitForTiles([source1, source2], {}, function() { waitForTiles([source1, source2], {}, function() {
@@ -195,7 +195,7 @@ describe('ol.rendering.layer.Tile', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
waitForTiles([source], {opacity: 0.2}, function() { waitForTiles([source], {opacity: 0.2}, function() {
@@ -229,7 +229,7 @@ describe('ol.rendering.layer.Tile', function() {
}); });
}); });
it('512x256 renders correcly using the webgl renderer', function(done) { where('WebGL').it('512x256 renders correcly using the webgl renderer', function(done) {
assertWebGL(); assertWebGL();
var source = createSource('512x256'); var source = createSource('512x256');
map = createMap('webgl', [-10997148, 4569099]); map = createMap('webgl', [-10997148, 4569099]);
@@ -249,7 +249,7 @@ describe('ol.rendering.layer.Tile', function() {
}); });
}); });
it('192x256 renders correcly using the webgl renderer', function(done) { where('WebGL').it('192x256 renders correcly using the webgl renderer', function(done) {
assertWebGL(); assertWebGL();
var source = createSource('192x256'); var source = createSource('192x256');
map = createMap('webgl', [-11271098, 3747248], [100, 100], undefined, map = createMap('webgl', [-11271098, 3747248], [100, 100], undefined,

View File

@@ -69,7 +69,7 @@ describe('ol.rendering.Map', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
map.once('postrender', function() { map.once('postrender', function() {
@@ -92,7 +92,7 @@ describe('ol.rendering.Map', function() {
map, 'rendering/ol/expected/render-canvas.png', IMAGE_TOLERANCE, done); map, 'rendering/ol/expected/render-canvas.png', IMAGE_TOLERANCE, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
expectResemble( expectResemble(
@@ -112,7 +112,7 @@ describe('ol.rendering.Map', function() {
map, 'rendering/ol/expected/pan-canvas.png', IMAGE_TOLERANCE, done); map, 'rendering/ol/expected/pan-canvas.png', IMAGE_TOLERANCE, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
map.getView().setCenter([10, 10]); map.getView().setCenter([10, 10]);
@@ -134,7 +134,7 @@ describe('ol.rendering.Map', function() {
map, 'rendering/ol/expected/rotate-canvas.png', 2.8, done); map, 'rendering/ol/expected/rotate-canvas.png', 2.8, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
map.getView().setRotation(90); map.getView().setRotation(90);
@@ -157,7 +157,7 @@ describe('ol.rendering.Map', function() {
map, 'rendering/ol/expected/zoom-canvas.png', IMAGE_TOLERANCE, done); map, 'rendering/ol/expected/zoom-canvas.png', IMAGE_TOLERANCE, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
map.getView().setCenter([10, 10]); map.getView().setCenter([10, 10]);

View File

@@ -59,7 +59,7 @@ describe('ol.rendering.source.TileWMS', function() {
})); }));
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
var map = createMap('webgl', 1); var map = createMap('webgl', 1);
var source = createSource(0); var source = createSource(0);
@@ -84,7 +84,7 @@ describe('ol.rendering.source.TileWMS', function() {
})); }));
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
var map = createMap('webgl', 2); var map = createMap('webgl', 2);
var source = createSource(0); var source = createSource(0);
@@ -110,7 +110,7 @@ describe('ol.rendering.source.TileWMS', function() {
})); }));
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
var map = createMap('webgl', 1); var map = createMap('webgl', 1);
var source = createSource(20); var source = createSource(20);
@@ -135,7 +135,7 @@ describe('ol.rendering.source.TileWMS', function() {
})); }));
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
var map = createMap('webgl', 2); var map = createMap('webgl', 2);
var source = createSource(20); var source = createSource(20);

View File

@@ -190,7 +190,7 @@ describe('ol.rendering.style.Circle', function() {
8.0, done); 8.0, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();

View File

@@ -110,7 +110,7 @@ describe('ol.rendering.style.Icon', function() {
}); });
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
createFeatures('rendering/ol/data/icon.png', imgInfo, function() { createFeatures('rendering/ol/data/icon.png', imgInfo, function() {

View File

@@ -117,7 +117,7 @@ describe('ol.rendering.style.LineString', function() {
map, 'rendering/ol/style/expected/linestring-strokes-canvas.png', map, 'rendering/ol/style/expected/linestring-strokes-canvas.png',
3.0, done); 3.0, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();

View File

@@ -92,7 +92,7 @@ describe('ol.rendering.style.Polygon', function() {
IMAGE_TOLERANCE, done); IMAGE_TOLERANCE, done);
}); });
it('tests the webgl renderer', function(done) { where('WebGL').it('tests the webgl renderer', function(done) {
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();
expectResemble(map, 'rendering/ol/style/expected/polygon-types-webgl.png', expectResemble(map, 'rendering/ol/style/expected/polygon-types-webgl.png',
@@ -161,7 +161,7 @@ describe('ol.rendering.style.Polygon', function() {
IMAGE_TOLERANCE, done); IMAGE_TOLERANCE, done);
}); });
it('tests the webgl renderer', function(done) { where('WebGL').it('tests the webgl renderer', function(done) {
map = createMap('webgl', 100); map = createMap('webgl', 100);
map.getView().setResolution(0.5); map.getView().setResolution(0.5);
createFeatures(); createFeatures();
@@ -222,7 +222,7 @@ describe('ol.rendering.style.Polygon', function() {
IMAGE_TOLERANCE, done); IMAGE_TOLERANCE, done);
}); });
it('tests the webgl renderer', function(done) { where('WebGL').it('tests the webgl renderer', function(done) {
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();
expectResemble(map, 'rendering/ol/style/expected/polygon-zindex-webgl.png', expectResemble(map, 'rendering/ol/style/expected/polygon-zindex-webgl.png',
@@ -282,7 +282,7 @@ describe('ol.rendering.style.Polygon', function() {
IMAGE_TOLERANCE, done); IMAGE_TOLERANCE, done);
}); });
it('tests the webgl renderer', function(done) { where('WebGL').it('tests the webgl renderer', function(done) {
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();
expectResemble( expectResemble(

View File

@@ -136,7 +136,7 @@ describe('ol.rendering.style.RegularShape', function() {
expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedashoffset.png', 5, done); expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedashoffset.png', 5, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
createFeatures(stroke, fill); createFeatures(stroke, fill);
@@ -158,7 +158,7 @@ describe('ol.rendering.style.RegularShape', function() {
expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-default-style.png', 3.0, done); expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-default-style.png', 3.0, done);
}); });
it('tests the WebGL renderer', function(done) { where('WebGL').it('tests the WebGL renderer', function(done) {
assertWebGL(); assertWebGL();
map = createMap('webgl'); map = createMap('webgl');
createFeatures(stroke, fill); createFeatures(stroke, fill);

View File

@@ -102,13 +102,13 @@ describe('ol.rendering.style.Text', function() {
expectResemble(map, 'rendering/ol/style/expected/text-rotated-canvas.png', IMAGE_TOLERANCE, done); expectResemble(map, 'rendering/ol/style/expected/text-rotated-canvas.png', IMAGE_TOLERANCE, done);
}); });
it('tests the webgl renderer without rotation', function(done) { where('WebGL').it('tests the webgl renderer without rotation', function(done) {
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();
expectResemble(map, 'rendering/ol/style/expected/text-webgl.png', 1.8, done); expectResemble(map, 'rendering/ol/style/expected/text-webgl.png', 1.8, done);
}); });
it('tests the webgl renderer with rotation', function(done) { where('WebGL').it('tests the webgl renderer with rotation', function(done) {
map = createMap('webgl'); map = createMap('webgl');
createFeatures(); createFeatures();
map.getView().setRotation(Math.PI / 7); map.getView().setRotation(Math.PI / 7);

View File

@@ -467,7 +467,8 @@
ArrayBuffer: 'ArrayBuffer' in global, ArrayBuffer: 'ArrayBuffer' in global,
'ArrayBuffer.isView': 'ArrayBuffer' in global && !!ArrayBuffer.isView, 'ArrayBuffer.isView': 'ArrayBuffer' in global && !!ArrayBuffer.isView,
FileReader: 'FileReader' in global, FileReader: 'FileReader' in global,
Uint8ClampedArray: ('Uint8ClampedArray' in global) Uint8ClampedArray: ('Uint8ClampedArray' in global),
WebGL: false
}; };
/** /**