More test cleanup

2017-07-03 15:39:02 -06:00
parent a2c043d1b4
commit 3bdddeac1d
14 changed files with 219 additions and 285 deletions
--- a/test/rendering/ol/style/circle.test.js
+++ b/test/rendering/ol/style/circle.test.js
@@ -14,18 +14,16 @@ goog.require('ol.style.Stroke');

 describe('ol.rendering.style.Circle', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  function createMap(renderer) {
-    target = createMapDiv(50, 50);
-
    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
      source: vectorSource
    });

    map = new ol.Map({
-      target: target,
+      target: createMapDiv(50, 50),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -34,13 +32,16 @@ describe('ol.rendering.style.Circle', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  describe('#render', function() {
-    afterEach(function() {
+  afterEach(function() {
+    if (map) {
      disposeMap(map);
-    });
+      map = null;
+    }
+  });
+
+  describe('#render', function() {

    function createFeatures() {
      var feature;
@@ -184,7 +185,7 @@ describe('ol.rendering.style.Circle', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/circle-canvas.png',
          8.0, done);
@@ -192,7 +193,7 @@ describe('ol.rendering.style.Circle', function() {

    where('WebGL').it('tests the WebGL renderer', function(done) {
      assertWebGL();
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/circle-webgl.png',
          8.0, done);
--- a/test/rendering/ol/style/icon.test.js
+++ b/test/rendering/ol/style/icon.test.js
@@ -12,7 +12,7 @@ goog.require('ol.style.Style');

 describe('ol.rendering.style.Icon', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  var imgInfo = {
    anchor: [0.5, 46],
@@ -24,15 +24,13 @@ describe('ol.rendering.style.Icon', function() {
  };

  function createMap(renderer, width, height) {
-    target = createMapDiv(width ? width : 50, height ? height : 50);
-
    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
      source: vectorSource
    });

    map = new ol.Map({
-      target: target,
+      target: createMapDiv(width ? width : 50, height ? height : 50),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -41,13 +39,16 @@ describe('ol.rendering.style.Icon', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  describe('#render', function() {
-    afterEach(function() {
+  afterEach(function() {
+    if (map) {
      disposeMap(map);
-    });
+      map = null;
+    }
+  });
+
+  describe('#render', function() {

    function createFeatures(src, imgInfo, callback) {
      var feature;
@@ -68,7 +69,7 @@ describe('ol.rendering.style.Icon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures('rendering/ol/data/icon.png', imgInfo, function() {
        expectResemble(map, 'rendering/ol/style/expected/icon-canvas.png',
            IMAGE_TOLERANCE, done);
@@ -76,7 +77,7 @@ describe('ol.rendering.style.Icon', function() {
    });

    it('scales svg correctly in the canvas renderer', function(done) {
-      map = createMap('canvas', 512, 512);
+      createMap('canvas', 512, 512);
      createFeatures('rendering/ol/data/me0.svg', {
        scale: 96 / 512,
        imgSize: [512, 512]
@@ -87,7 +88,7 @@ describe('ol.rendering.style.Icon', function() {
    });

    it('uses offset correctly in the canvas renderer', function(done) {
-      map = createMap('canvas', 256, 512);
+      createMap('canvas', 256, 512);
      createFeatures('rendering/ol/data/me0.svg', {
        offset: [0, 256],
        size: [256, 256],
@@ -99,7 +100,7 @@ describe('ol.rendering.style.Icon', function() {
    });

    it('uses offset correctly if it is larger than size in the canvas renderer', function(done) {
-      map = createMap('canvas', 256, 512);
+      createMap('canvas', 256, 512);
      createFeatures('rendering/ol/data/me0.svg', {
        offset: [0, 374],
        size: [256, 256],
@@ -112,7 +113,7 @@ describe('ol.rendering.style.Icon', function() {

    where('WebGL').it('tests the WebGL renderer', function(done) {
      assertWebGL();
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures('rendering/ol/data/icon.png', imgInfo, function() {
        expectResemble(map, 'rendering/ol/style/expected/icon-webgl.png',
            2.0, done);
--- a/test/rendering/ol/style/linestring.test.js
+++ b/test/rendering/ol/style/linestring.test.js
@@ -12,11 +12,9 @@ goog.require('ol.style.Stroke');

 describe('ol.rendering.style.LineString', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  function createMap(renderer, opt_pixelRatio) {
-    target = createMapDiv(50, 50);
-
    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
      source: vectorSource
@@ -24,7 +22,7 @@ describe('ol.rendering.style.LineString', function() {

    map = new ol.Map({
      pixelRatio: opt_pixelRatio || 1,
-      target: target,
+      target: createMapDiv(50, 50),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -33,13 +31,16 @@ describe('ol.rendering.style.LineString', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  describe('different strokes', function() {
-    afterEach(function() {
+  afterEach(function() {
+    if (map) {
      disposeMap(map);
-    });
+      map = null;
+    }
+  });
+
+  describe('different strokes', function() {

    function createFeatures() {
      var feature;
@@ -111,7 +112,7 @@ describe('ol.rendering.style.LineString', function() {
    }

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

    it('tests the canvas renderer (HiDPI)', function(done) {
-      map = createMap('canvas', 2);
+      createMap('canvas', 2);
      createFeatures();
      expectResemble(
          map, 'rendering/ol/style/expected/linestring-strokes-canvas-hidpi.png',
--- a/test/rendering/ol/style/polygon.test.js
+++ b/test/rendering/ol/style/polygon.test.js
@@ -13,11 +13,10 @@ goog.require('ol.style.Stroke');

 describe('ol.rendering.style.Polygon', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  function createMap(renderer, opt_size) {
    var size = opt_size || 50;
-    target = createMapDiv(size, size);

    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
@@ -25,7 +24,7 @@ describe('ol.rendering.style.Polygon', function() {
    });

    map = new ol.Map({
-      target: target,
+      target: createMapDiv(size, size),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -34,13 +33,16 @@ describe('ol.rendering.style.Polygon', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  describe('different types', function() {
-    afterEach(function() {
+  afterEach(function() {
+    if (map) {
      disposeMap(map);
-    });
+      map = null;
+    }
+  });
+
+  describe('different types', function() {

    function createFeatures() {
      var fill = new ol.style.Fill({color: 'red'});
@@ -86,14 +88,14 @@ describe('ol.rendering.style.Polygon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-types-canvas.png',
          IMAGE_TOLERANCE, done);
    });

    where('WebGL').it('tests the webgl renderer', function(done) {
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-types-webgl.png',
          IMAGE_TOLERANCE, done);
@@ -101,9 +103,6 @@ describe('ol.rendering.style.Polygon', function() {
  });

  describe('different types with stroke', function() {
-    afterEach(function() {
-      disposeMap(map);
-    });

    function createFeatures() {
      var stroke = new ol.style.Stroke({
@@ -154,7 +153,7 @@ describe('ol.rendering.style.Polygon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas', 100);
+      createMap('canvas', 100);
      map.getView().setResolution(0.5);
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-types-canvas-stroke.png',
@@ -162,7 +161,7 @@ describe('ol.rendering.style.Polygon', function() {
    });

    where('WebGL').it('tests the webgl renderer', function(done) {
-      map = createMap('webgl', 100);
+      createMap('webgl', 100);
      map.getView().setResolution(0.5);
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-types-webgl-stroke.png',
@@ -171,9 +170,6 @@ describe('ol.rendering.style.Polygon', function() {
  });

  describe('z-index', function() {
-    afterEach(function() {
-      disposeMap(map);
-    });

    function createFeatures() {
      var feature;
@@ -216,14 +212,14 @@ describe('ol.rendering.style.Polygon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-zindex-canvas.png',
          IMAGE_TOLERANCE, done);
    });

    where('WebGL').it('tests the webgl renderer', function(done) {
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/polygon-zindex-webgl.png',
          IMAGE_TOLERANCE, done);
@@ -231,9 +227,6 @@ describe('ol.rendering.style.Polygon', function() {
  });

  describe('different fills and strokes', function() {
-    afterEach(function() {
-      disposeMap(map);
-    });

    function createFeatures() {
      var feature;
@@ -275,7 +268,7 @@ describe('ol.rendering.style.Polygon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(
          map, 'rendering/ol/style/expected/polygon-fill-and-strokes-canvas.png',
@@ -283,7 +276,7 @@ describe('ol.rendering.style.Polygon', function() {
    });

    where('WebGL').it('tests the webgl renderer', function(done) {
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures();
      expectResemble(
          map, 'rendering/ol/style/expected/polygon-fill-and-strokes-webgl.png',
@@ -292,9 +285,6 @@ describe('ol.rendering.style.Polygon', function() {
  });

  describe('CanvasPattern and LinearGradient as fills and strokes', function() {
-    afterEach(function() {
-      disposeMap(map);
-    });

    function createRainbowGradient() {
      var canvas = document.createElement('canvas');
@@ -340,7 +330,7 @@ describe('ol.rendering.style.Polygon', function() {
    }

    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(
          map, 'rendering/ol/style/expected/polygon-pattern-gradient-canvas.png',
--- a/test/rendering/ol/style/regularshape.test.js
+++ b/test/rendering/ol/style/regularshape.test.js
@@ -14,18 +14,16 @@ goog.require('ol.style.Stroke');

 describe('ol.rendering.style.RegularShape', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  function createMap(renderer) {
-    target = createMapDiv(50, 50);
-
    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
      source: vectorSource
    });

    map = new ol.Map({
-      target: target,
+      target: createMapDiv(50, 50),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -34,11 +32,16 @@ describe('ol.rendering.style.RegularShape', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  function createFeatures(stroke, fill) {
+  afterEach(function() {
+    if (map) {
+      disposeMap(map);
+      map = null;
+    }
+  });

+  function createFeatures(stroke, fill) {
    var feature;
    feature = new ol.Feature({
      geometry: new ol.geom.Point([-15, 15])
@@ -109,12 +112,8 @@ describe('ol.rendering.style.RegularShape', function() {
    var stroke = new ol.style.Stroke({width: 2});
    var fill = new ol.style.Fill({color: 'red'});

-    afterEach(function() {
-      disposeMap(map);
-    });
-
    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures(stroke, fill);
      expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas.png', 9.4, done);
    });
@@ -138,7 +137,7 @@ describe('ol.rendering.style.RegularShape', function() {

    where('WebGL').it('tests the WebGL renderer', function(done) {
      assertWebGL();
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures(stroke, fill);
      expectResemble(map, 'rendering/ol/style/expected/regularshape-webgl.png', 8.2, done);
    });
@@ -148,19 +147,15 @@ describe('ol.rendering.style.RegularShape', function() {
    var stroke = new ol.style.Stroke();
    var fill = new ol.style.Fill();

-    afterEach(function() {
-      disposeMap(map);
-    });
-
    it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures(stroke, fill);
      expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-default-style.png', 3.0, done);
    });

    where('WebGL').it('tests the WebGL renderer', function(done) {
      assertWebGL();
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures(stroke, fill);
      expectResemble(map, 'rendering/ol/style/expected/regularshape-webgl-default-style.png', 3.0, done);
    });
--- a/test/rendering/ol/style/text.test.js
+++ b/test/rendering/ol/style/text.test.js
@@ -13,18 +13,16 @@ goog.require('ol.style.Stroke');

 describe('ol.rendering.style.Text', function() {

-  var target, map, vectorSource;
+  var map, vectorSource;

  function createMap(renderer) {
-    target = createMapDiv(200, 200);
-
    vectorSource = new ol.source.Vector();
    var vectorLayer = new ol.layer.Vector({
      source: vectorSource
    });

    map = new ol.Map({
-      target: target,
+      target: createMapDiv(200, 200),
      renderer: renderer,
      layers: [vectorLayer],
      view: new ol.View({
@@ -33,13 +31,16 @@ describe('ol.rendering.style.Text', function() {
        resolution: 1
      })
    });
-    return map;
  }

-  describe('#render', function() {
-    afterEach(function() {
+  afterEach(function() {
+    if (map) {
      disposeMap(map);
-    });
+      map = null;
+    }
+  });
+
+  describe('#render', function() {

    function createFeatures() {
      var feature;
@@ -86,30 +87,29 @@ describe('ol.rendering.style.Text', function() {
        })
      }));
      vectorSource.addFeature(feature);
-
    }

    it('tests the canvas renderer without rotation', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/text-canvas.png', IMAGE_TOLERANCE, done);
    });

    it('tests the canvas renderer with rotation', function(done) {
-      map = createMap('canvas');
+      createMap('canvas');
      createFeatures();
      map.getView().setRotation(Math.PI / 7);
      expectResemble(map, 'rendering/ol/style/expected/text-rotated-canvas.png', IMAGE_TOLERANCE, done);
    });

    where('WebGL').it('tests the webgl renderer without rotation', function(done) {
-      map = createMap('webgl');
+      createMap('webgl');
      createFeatures();
      expectResemble(map, 'rendering/ol/style/expected/text-webgl.png', 1.8, done);
    });

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