Merge pull request #1027 from tschaub/closure-util

Use the closure-util package.  Documentation will come when this is a more complete solution.  See #1027 for basic usage instructions.
This commit is contained in:
Tim Schaub
2013-09-15 15:36:13 -07:00
9 changed files with 164 additions and 32 deletions
@@ -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');
+3 -16
View File
@@ -3,24 +3,11 @@ goog.provide('ol.test.proj');
describe('ol.proj', function() {
beforeEach(function() {
sinon.spy(ol.proj, 'addTransform');
ol.proj.common.add();
});
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 +351,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');