From 68b7ee58a5be4a07b612582149e25b3767678fb2 Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Mon, 24 Feb 2014 15:11:51 +0100 Subject: [PATCH] fixes tests for mapbrowserevent --- test/spec/ol/mapbrowserevent.test.js | 55 ++++++++++++---------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/test/spec/ol/mapbrowserevent.test.js b/test/spec/ol/mapbrowserevent.test.js index 67c13b5872..01438bd0c0 100644 --- a/test/spec/ol/mapbrowserevent.test.js +++ b/test/spec/ol/mapbrowserevent.test.js @@ -28,12 +28,13 @@ describe('ol.MapBrowserEventHandler', function() { }); it('emulates click', function() { - handler.emulateClick_(new goog.events.BrowserEvent({ - type: 'mousedown', - target: target, - clientX: 0, - clientY: 0 - })); + handler.emulateClick_(new ol.pointer.PointerEvent('pointerdown', + new goog.events.BrowserEvent({ + type: 'mousedown', + target: target, + clientX: 0, + clientY: 0 + }))); expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); @@ -41,12 +42,13 @@ describe('ol.MapBrowserEventHandler', function() { expect(singleclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); - handler.emulateClick_(new goog.events.BrowserEvent({ - type: 'mousedown', - target: target, - clientX: 0, - clientY: 0 - })); + handler.emulateClick_(new ol.pointer.PointerEvent('pointerdown', + new goog.events.BrowserEvent({ + type: 'mousedown', + target: target, + clientX: 0, + clientY: 0 + }))); expect(singleclickSpy.calledOnce).to.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); }); @@ -61,12 +63,13 @@ describe('ol.MapBrowserEventHandler', function() { expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.called).to.not.be.ok(); - handler.emulateClick_(new goog.events.BrowserEvent({ - type: 'mousedown', - target: target, - clientX: 0, - clientY: 0 - })); + handler.emulateClick_(new ol.pointer.PointerEvent('pointerdown', + new goog.events.BrowserEvent({ + type: 'mousedown', + target: target, + clientX: 0, + clientY: 0 + }))); expect(singleclickSpy.called).to.not.be.ok(); expect(dblclickSpy.calledOnce).to.be.ok(); @@ -88,24 +91,13 @@ describe('ol.MapBrowserEventHandler', function() { expect(handler.getDown()).to.be(null); }); - it('returns an event after handleMouseDown_ has been called', function() { - var event = new goog.events.BrowserEvent({}); - handler.handleMouseDown_(event); - expect(handler.getDown()).to.be(event); - }); - it('returns an event after handlePointerDown_ has been called', function() { - var event = new goog.events.BrowserEvent({}); + var event = new ol.pointer.PointerEvent('pointerdown', + new goog.events.BrowserEvent({})); handler.handlePointerDown_(event); expect(handler.getDown()).to.be(event); }); - it('returns an event after handleTouchStart_ has been called', function() { - var event = new goog.events.BrowserEvent({}); - handler.handleTouchStart_(event); - expect(handler.getDown()).to.be(event); - }); - }); }); @@ -115,3 +107,4 @@ goog.require('goog.events'); goog.require('goog.events.BrowserEvent'); goog.require('ol.Map'); goog.require('ol.MapBrowserEventHandler'); +goog.require('ol.pointer.PointerEvent');