More test cleanup

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',