From 73afb656d7fe03c5a1db6893ac4d01ba3c199729 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 16 Aug 2017 14:24:42 -0400 Subject: [PATCH] Test fixes --- .../ol/expected/render-polygon-linedash.png | Bin .../ol/expected/render-polygon-linedashoffset.png | Bin .../ol/layer/expected/vector-canvas-transparent.png | Bin test/rendering/ol/layer/vector.test.js | 4 ++-- test/rendering/ol/render.test.js | 6 ++++-- .../style/expected/regularshape-canvas-linedash.png | Bin .../expected/regularshape-canvas-linedashoffset.png | Bin test/rendering/ol/style/regularshape.test.js | 8 ++++---- test/spec/ol/format/mvt.test.js | 3 ++- test/spec/ol/map.test.js | 4 ++++ test/spec/ol/renderer/canvas/replay.test.js | 6 ++++++ .../spec/ol/renderer/canvas/vectortilelayer.test.js | 1 + test/spec/ol/sphere.test.js | 5 +++++ 13 files changed, 28 insertions(+), 9 deletions(-) rename {test_rendering/spec => test/rendering}/ol/expected/render-polygon-linedash.png (100%) rename {test_rendering/spec => test/rendering}/ol/expected/render-polygon-linedashoffset.png (100%) rename {test_rendering/spec => test/rendering}/ol/layer/expected/vector-canvas-transparent.png (100%) rename {test_rendering/spec => test/rendering}/ol/style/expected/regularshape-canvas-linedash.png (100%) rename {test_rendering/spec => test/rendering}/ol/style/expected/regularshape-canvas-linedashoffset.png (100%) diff --git a/test_rendering/spec/ol/expected/render-polygon-linedash.png b/test/rendering/ol/expected/render-polygon-linedash.png similarity index 100% rename from test_rendering/spec/ol/expected/render-polygon-linedash.png rename to test/rendering/ol/expected/render-polygon-linedash.png diff --git a/test_rendering/spec/ol/expected/render-polygon-linedashoffset.png b/test/rendering/ol/expected/render-polygon-linedashoffset.png similarity index 100% rename from test_rendering/spec/ol/expected/render-polygon-linedashoffset.png rename to test/rendering/ol/expected/render-polygon-linedashoffset.png diff --git a/test_rendering/spec/ol/layer/expected/vector-canvas-transparent.png b/test/rendering/ol/layer/expected/vector-canvas-transparent.png similarity index 100% rename from test_rendering/spec/ol/layer/expected/vector-canvas-transparent.png rename to test/rendering/ol/layer/expected/vector-canvas-transparent.png diff --git a/test/rendering/ol/layer/vector.test.js b/test/rendering/ol/layer/vector.test.js index e324569d3b..558bc02535 100644 --- a/test/rendering/ol/layer/vector.test.js +++ b/test/rendering/ol/layer/vector.test.js @@ -98,7 +98,7 @@ describe('ol.rendering.layer.Vector', function() { }); it('renders transparent layers 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] @@ -131,7 +131,7 @@ describe('ol.rendering.layer.Vector', function() { opacity: 0.5 })); map.once('postrender', function() { - expectResemble(map, 'spec/ol/layer/expected/vector-canvas-transparent.png', + expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-transparent.png', 7, done); }); }); diff --git a/test/rendering/ol/render.test.js b/test/rendering/ol/render.test.js index ed101ac5a6..80b92578dd 100644 --- a/test/rendering/ol/render.test.js +++ b/test/rendering/ol/render.test.js @@ -138,6 +138,7 @@ describe('ol.render', function() { }); it('supports lineDash styles', function(done) { + var context = getContext(); var vectorContext = ol.render.toContext(context, {size: [100, 100]}); var style = new ol.style.Style({ @@ -154,11 +155,12 @@ describe('ol.render', function() { ])); resembleCanvas(context.canvas, - 'spec/ol/expected/render-polygon-linedash.png', IMAGE_TOLERANCE, done); + 'rendering/ol/expected/render-polygon-linedash.png', IMAGE_TOLERANCE, done); }); it('supports lineDashOffset', function(done) { + var context = getContext(); var vectorContext = ol.render.toContext(context, {size: [100, 100]}); var style = new ol.style.Style({ @@ -176,7 +178,7 @@ describe('ol.render', function() { ])); resembleCanvas(context.canvas, - 'spec/ol/expected/render-polygon-linedashoffset.png', IMAGE_TOLERANCE, done); + 'rendering/ol/expected/render-polygon-linedashoffset.png', IMAGE_TOLERANCE, done); }); diff --git a/test_rendering/spec/ol/style/expected/regularshape-canvas-linedash.png b/test/rendering/ol/style/expected/regularshape-canvas-linedash.png similarity index 100% rename from test_rendering/spec/ol/style/expected/regularshape-canvas-linedash.png rename to test/rendering/ol/style/expected/regularshape-canvas-linedash.png diff --git a/test_rendering/spec/ol/style/expected/regularshape-canvas-linedashoffset.png b/test/rendering/ol/style/expected/regularshape-canvas-linedashoffset.png similarity index 100% rename from test_rendering/spec/ol/style/expected/regularshape-canvas-linedashoffset.png rename to test/rendering/ol/style/expected/regularshape-canvas-linedashoffset.png diff --git a/test/rendering/ol/style/regularshape.test.js b/test/rendering/ol/style/regularshape.test.js index c8681fa6d5..e0da26e6ab 100644 --- a/test/rendering/ol/style/regularshape.test.js +++ b/test/rendering/ol/style/regularshape.test.js @@ -119,20 +119,20 @@ describe('ol.rendering.style.RegularShape', function() { }); it('supports lineDash', function(done) { - map = createMap('canvas'); + createMap('canvas'); createFeatures(new ol.style.Stroke({ lineDash: [10, 5] })); - expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedash.png', 5, done); + expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-linedash.png', 5, done); }); it('supports lineDashOffset', function(done) { - map = createMap('canvas'); + createMap('canvas'); createFeatures(new ol.style.Stroke({ lineDash: [10, 5], lineDashOffset: 5 })); - expectResemble(map, 'spec/ol/style/expected/regularshape-canvas-linedashoffset.png', 5, done); + expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-linedashoffset.png', 5, done); }); where('WebGL').it('tests the WebGL renderer', function(done) { diff --git a/test/spec/ol/format/mvt.test.js b/test/spec/ol/format/mvt.test.js index bc4f2ec517..d1c106bdad 100644 --- a/test/spec/ol/format/mvt.test.js +++ b/test/spec/ol/format/mvt.test.js @@ -3,6 +3,7 @@ goog.provide('ol.test.format.MVT'); goog.require('ol.Feature'); goog.require('ol.ext.PBF'); goog.require('ol.ext.vectortile.VectorTile'); +goog.require('ol.extent'); goog.require('ol.format.MVT'); goog.require('ol.geom.Point'); goog.require('ol.render.Feature'); @@ -92,7 +93,7 @@ where('ArrayBuffer.isView').describe('ol.format.MVT', function() { var format = new ol.format.MVT(); format.readFeatures(data); var extent = format.getLastExtent(); - expect(extent.getWidth()).to.be(4096); + expect(ol.extent.getWidth(extent)).to.be(4096); }); }); diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index e576fc1078..5ee928c401 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -1,9 +1,11 @@ goog.provide('ol.test.Map'); +goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.MapEvent'); goog.require('ol.Overlay'); goog.require('ol.View'); +goog.require('ol.geom.Point'); goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.interaction.DoubleClickZoom'); @@ -11,7 +13,9 @@ goog.require('ol.interaction.Interaction'); goog.require('ol.interaction.MouseWheelZoom'); goog.require('ol.interaction.PinchZoom'); goog.require('ol.layer.Tile'); +goog.require('ol.layer.Vector'); goog.require('ol.renderer.canvas.IntermediateCanvas'); +goog.require('ol.source.Vector'); goog.require('ol.source.XYZ'); describe('ol.Map', function() { diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js index c4118adb11..3ea0066442 100644 --- a/test/spec/ol/renderer/canvas/replay.test.js +++ b/test/spec/ol/renderer/canvas/replay.test.js @@ -2,6 +2,12 @@ goog.provide('ol.test.renderer.canvas.Replay'); goog.require('ol'); goog.require('ol.Feature'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.render.canvas.LineStringReplay'); goog.require('ol.render.canvas.PolygonReplay'); diff --git a/test/spec/ol/renderer/canvas/vectortilelayer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js index 5ef41ccb71..9b8a3ca451 100644 --- a/test/spec/ol/renderer/canvas/vectortilelayer.test.js +++ b/test/spec/ol/renderer/canvas/vectortilelayer.test.js @@ -7,6 +7,7 @@ goog.require('ol.TileState'); goog.require('ol.VectorImageTile'); goog.require('ol.VectorTile'); goog.require('ol.View'); +goog.require('ol.extent'); goog.require('ol.format.MVT'); goog.require('ol.geom.Point'); goog.require('ol.layer.VectorTile'); diff --git a/test/spec/ol/sphere.test.js b/test/spec/ol/sphere.test.js index 771c871e5a..1b6124d959 100644 --- a/test/spec/ol/sphere.test.js +++ b/test/spec/ol/sphere.test.js @@ -5,6 +5,11 @@ goog.provide('ol.test.Sphere'); goog.require('ol.Sphere'); goog.require('ol.format.WKT'); +goog.require('ol.geom.GeometryCollection'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.MultiLineString'); +goog.require('ol.geom.MultiPoint'); +goog.require('ol.geom.Point'); goog.require('ol.proj.EPSG4326');