More test cleanup

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);
     });