From a5113715ef3291c4c33c473d62d5d9e12b9a52db Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 3 Jul 2017 14:15:00 -0600 Subject: [PATCH] Conditionally run WebGL rendering tests --- test/rendering/ol/layer/image.test.js | 2 +- test/rendering/ol/layer/tile.test.js | 10 +++++----- test/rendering/ol/map.test.js | 10 +++++----- test/rendering/ol/source/tilewms.test.js | 8 ++++---- test/rendering/ol/style/circle.test.js | 2 +- test/rendering/ol/style/icon.test.js | 2 +- test/rendering/ol/style/linestring.test.js | 2 +- test/rendering/ol/style/polygon.test.js | 8 ++++---- test/rendering/ol/style/regularshape.test.js | 4 ++-- test/rendering/ol/style/text.test.js | 4 ++-- test/test-extensions.js | 3 ++- 11 files changed, 28 insertions(+), 27 deletions(-) diff --git a/test/rendering/ol/layer/image.test.js b/test/rendering/ol/layer/image.test.js index 148e523c03..121c5b6906 100644 --- a/test/rendering/ol/layer/image.test.js +++ b/test/rendering/ol/layer/image.test.js @@ -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(); map = createMap('webgl'); waitForImages([source], {}, function() { diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js index 0e7f4f732c..4be6ab5654 100644 --- a/test/rendering/ol/layer/tile.test.js +++ b/test/rendering/ol/layer/tile.test.js @@ -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(); map = createMap('webgl'); 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(); map = createMap('webgl'); 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(); map = createMap('webgl'); 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(); var source = createSource('512x256'); 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(); var source = createSource('192x256'); map = createMap('webgl', [-11271098, 3747248], [100, 100], undefined, diff --git a/test/rendering/ol/map.test.js b/test/rendering/ol/map.test.js index 8dff9af2e4..f82e60bb1b 100644 --- a/test/rendering/ol/map.test.js +++ b/test/rendering/ol/map.test.js @@ -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(); map = createMap('webgl'); map.once('postrender', function() { @@ -92,7 +92,7 @@ describe('ol.rendering.Map', function() { 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(); map = createMap('webgl'); expectResemble( @@ -112,7 +112,7 @@ describe('ol.rendering.Map', function() { 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(); map = createMap('webgl'); map.getView().setCenter([10, 10]); @@ -134,7 +134,7 @@ describe('ol.rendering.Map', function() { 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(); map = createMap('webgl'); map.getView().setRotation(90); @@ -157,7 +157,7 @@ describe('ol.rendering.Map', function() { 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(); map = createMap('webgl'); map.getView().setCenter([10, 10]); diff --git a/test/rendering/ol/source/tilewms.test.js b/test/rendering/ol/source/tilewms.test.js index cf7770b1fc..85bae35dec 100644 --- a/test/rendering/ol/source/tilewms.test.js +++ b/test/rendering/ol/source/tilewms.test.js @@ -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(); var map = createMap('webgl', 1); 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(); var map = createMap('webgl', 2); 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(); var map = createMap('webgl', 1); 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(); var map = createMap('webgl', 2); var source = createSource(20); diff --git a/test/rendering/ol/style/circle.test.js b/test/rendering/ol/style/circle.test.js index c921553c21..5e6e78a149 100644 --- a/test/rendering/ol/style/circle.test.js +++ b/test/rendering/ol/style/circle.test.js @@ -190,7 +190,7 @@ describe('ol.rendering.style.Circle', function() { 8.0, done); }); - it('tests the WebGL renderer', function(done) { + where('WebGL').it('tests the WebGL renderer', function(done) { assertWebGL(); map = createMap('webgl'); createFeatures(); diff --git a/test/rendering/ol/style/icon.test.js b/test/rendering/ol/style/icon.test.js index 61f575161c..67759ee524 100644 --- a/test/rendering/ol/style/icon.test.js +++ b/test/rendering/ol/style/icon.test.js @@ -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(); map = createMap('webgl'); createFeatures('rendering/ol/data/icon.png', imgInfo, function() { diff --git a/test/rendering/ol/style/linestring.test.js b/test/rendering/ol/style/linestring.test.js index 7ef1616e28..5ebe3ac9f1 100644 --- a/test/rendering/ol/style/linestring.test.js +++ b/test/rendering/ol/style/linestring.test.js @@ -117,7 +117,7 @@ describe('ol.rendering.style.LineString', function() { map, 'rendering/ol/style/expected/linestring-strokes-canvas.png', 3.0, done); }); - it('tests the WebGL renderer', function(done) { + where('WebGL').it('tests the WebGL renderer', function(done) { assertWebGL(); map = createMap('webgl'); createFeatures(); diff --git a/test/rendering/ol/style/polygon.test.js b/test/rendering/ol/style/polygon.test.js index 2ac45d9dae..d5eea4efec 100644 --- a/test/rendering/ol/style/polygon.test.js +++ b/test/rendering/ol/style/polygon.test.js @@ -92,7 +92,7 @@ describe('ol.rendering.style.Polygon', function() { IMAGE_TOLERANCE, done); }); - it('tests the webgl renderer', function(done) { + where('WebGL').it('tests the webgl renderer', function(done) { map = createMap('webgl'); createFeatures(); expectResemble(map, 'rendering/ol/style/expected/polygon-types-webgl.png', @@ -161,7 +161,7 @@ describe('ol.rendering.style.Polygon', function() { IMAGE_TOLERANCE, done); }); - it('tests the webgl renderer', function(done) { + where('WebGL').it('tests the webgl renderer', function(done) { map = createMap('webgl', 100); map.getView().setResolution(0.5); createFeatures(); @@ -222,7 +222,7 @@ describe('ol.rendering.style.Polygon', function() { IMAGE_TOLERANCE, done); }); - it('tests the webgl renderer', function(done) { + where('WebGL').it('tests the webgl renderer', function(done) { map = createMap('webgl'); createFeatures(); expectResemble(map, 'rendering/ol/style/expected/polygon-zindex-webgl.png', @@ -282,7 +282,7 @@ describe('ol.rendering.style.Polygon', function() { IMAGE_TOLERANCE, done); }); - it('tests the webgl renderer', function(done) { + where('WebGL').it('tests the webgl renderer', function(done) { map = createMap('webgl'); createFeatures(); expectResemble( diff --git a/test/rendering/ol/style/regularshape.test.js b/test/rendering/ol/style/regularshape.test.js index 432cd4cd33..613ba0b015 100644 --- a/test/rendering/ol/style/regularshape.test.js +++ b/test/rendering/ol/style/regularshape.test.js @@ -136,7 +136,7 @@ describe('ol.rendering.style.RegularShape', function() { 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(); map = createMap('webgl'); 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); }); - it('tests the WebGL renderer', function(done) { + where('WebGL').it('tests the WebGL renderer', function(done) { assertWebGL(); map = createMap('webgl'); createFeatures(stroke, fill); diff --git a/test/rendering/ol/style/text.test.js b/test/rendering/ol/style/text.test.js index 26d766be46..135c5617e0 100644 --- a/test/rendering/ol/style/text.test.js +++ b/test/rendering/ol/style/text.test.js @@ -102,13 +102,13 @@ describe('ol.rendering.style.Text', function() { 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'); createFeatures(); 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'); createFeatures(); map.getView().setRotation(Math.PI / 7); diff --git a/test/test-extensions.js b/test/test-extensions.js index 15044332b1..32b47d9b24 100644 --- a/test/test-extensions.js +++ b/test/test-extensions.js @@ -467,7 +467,8 @@ ArrayBuffer: 'ArrayBuffer' in global, 'ArrayBuffer.isView': 'ArrayBuffer' in global && !!ArrayBuffer.isView, FileReader: 'FileReader' in global, - Uint8ClampedArray: ('Uint8ClampedArray' in global) + Uint8ClampedArray: ('Uint8ClampedArray' in global), + WebGL: false }; /**