diff --git a/test/spec/ol/proj/epsg3857projection.test.js b/test/spec/ol/proj/epsg3857projection.test.js index baabe31de1..a832168740 100644 --- a/test/spec/ol/proj/epsg3857projection.test.js +++ b/test/spec/ol/proj/epsg3857projection.test.js @@ -3,6 +3,14 @@ goog.provide('ol.test.proj.EPSG3857'); describe('ol.proj.EPSG3857', function() { + beforeEach(function() { + ol.proj.common.add(); + }); + + afterEach(function() { + ol.proj.clearAllProjections(); + }); + describe('getPointResolution', function() { it('returns the correct point scale at the equator', function() { @@ -44,4 +52,5 @@ describe('ol.proj.EPSG3857', function() { goog.require('ol.proj'); +goog.require('ol.proj.common'); goog.require('ol.proj.EPSG3857'); diff --git a/test/spec/ol/proj/proj.test.js b/test/spec/ol/proj/proj.test.js index 4c80a78ec5..c78956690e 100644 --- a/test/spec/ol/proj/proj.test.js +++ b/test/spec/ol/proj/proj.test.js @@ -3,24 +3,13 @@ goog.provide('ol.test.proj'); describe('ol.proj', function() { beforeEach(function() { + ol.proj.common.add(); sinon.spy(ol.proj, 'addTransform'); }); afterEach(function() { - var argsForCall = ol.proj.addTransform.args; - for (var i = 0, ii = argsForCall.length; i < ii; ++i) { - try { - ol.proj.removeTransform.apply(ol.proj, argsForCall[i].splice(0, 2)); - } catch (error) { - if (error instanceof goog.asserts.AssertionError) { - // The removeTransform function may have been called explicitly by the - // tests, so we pass. - } else { - throw error; - } - } - } ol.proj.addTransform.restore(); + ol.proj.clearAllProjections(); }); describe('projection equivalence', function() { @@ -364,7 +353,7 @@ describe('ol.proj', function() { goog.require('goog.array'); -goog.require('goog.asserts.AssertionError'); goog.require('ol.Projection'); goog.require('ol.ProjectionUnits'); goog.require('ol.proj'); +goog.require('ol.proj.common');