Merge pull request #644 from twpayne/remove-fragile-test

Remove fragile test
This commit is contained in:
Tom Payne
2013-04-23 05:56:38 -07:00

View File

@@ -120,118 +120,13 @@ describe('ol.Map', function() {
});
});
describe('user animation', function() {
var layer, map;
beforeEach(function() {
// always use setTimeout based shim for requestAnimationFrame
sinon.stub(goog.async.AnimationDelay.prototype, 'getRaf_',
function() {return null;});
layer = new ol.layer.TileLayer({
source: new ol.source.XYZ({
url: 'foo',
maxZoom: 2
})
});
map = new ol.Map({
layers: new ol.Collection([layer]),
renderer: ol.RendererHint.DOM,
target: document.createElement('div'),
view: new ol.View2D({
center: [0, 0],
zoom: 1
})
});
});
afterEach(function() {
map.dispose();
layer.dispose();
});
it('can set up an animation loop', function(done) {
function quadInOut(t, b, c, d) {
if ((t /= d / 2) < 1) {
return c / 2 * t * t + b;
}
return -c / 2 * ((--t) * (t - 2) - 1) + b;
}
var duration = 500;
var destination = [1000, 1000];
var origin = map.getView().getCenter();
var start = new Date().getTime();
var x0 = origin[0];
var y0 = origin[1];
var dx = destination[0] - origin[0];
var dy = destination[1] - origin[1];
var o = {
callback: function() {
var dt = new Date().getTime() - start;
var more = dt <= duration,
x, y;
if (more) {
x = quadInOut(dt, x0, dx, duration);
y = quadInOut(dt, y0, dy, duration);
} else {
x = destination[0];
y = destination[1];
}
map.getView().setCenter([x, y]);
if (more) {
animationDelay.start();
}
}
};
sinon.spy(o, 'callback');
var animationDelay = new goog.async.AnimationDelay(o.callback);
animationDelay.start();
// confirm that the center is somewhere between origin and destination
// after a short delay
setTimeout(function() {
expect(o.callback).to.be.called();
var loc = map.getView().getCenter();
expect(loc[0]).not.to.eql(origin[0]);
expect(loc[1]).not.to.eql(origin[1]);
if (new Date().getTime() - start < duration) {
expect(loc[0]).not.to.eql(destination[0]);
expect(loc[1]).not.to.eql(destination[1]);
}
}, goog.async.AnimationDelay.TIMEOUT);
// confirm that the map has reached the destination after the duration
setTimeout(function() {
var loc = map.getView().getCenter();
expect(loc[0]).to.eql(destination[0]);
expect(loc[1]).to.eql(destination[1]);
done();
}, duration + 2 * goog.async.AnimationDelay.TIMEOUT);
});
});
});
goog.require('goog.async.AnimationDelay');
goog.require('goog.dispose');
goog.require('goog.dom');
goog.require('ol.Collection');
goog.require('ol.Map');
goog.require('ol.RendererHint');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.interaction.DblClickZoom');
goog.require('ol.interaction.MouseWheelZoom');
goog.require('ol.interaction.defaults');
goog.require('ol.layer.TileLayer');
goog.require('ol.source.XYZ');