ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove enums from tests

Browse Source
This commit is contained in:
Peter Robins
2016-06-03 07:38:15 +00:00
parent d51fecd827
commit 06fd92353b
41 changed files with 379 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/interaction/draganddropinteraction.test.js
+15 -16
View File
@@ -35,13 +35,13 @@ describe('ol.interaction.DragAndDrop', function() {
describe('#setMap()', function() {
it('registers and unregisters listeners', function() {
interaction.setMap(map);
expect(viewport.hasListener(ol.events.EventType.DRAGENTER)).to.be(true);
expect(viewport.hasListener(ol.events.EventType.DRAGOVER)).to.be(true);
expect(viewport.hasListener(ol.events.EventType.DROP)).to.be(true);
expect(viewport.hasListener('dragenter')).to.be(true);
expect(viewport.hasListener('dragover')).to.be(true);
expect(viewport.hasListener('drop')).to.be(true);
interaction.setMap(null);
expect(viewport.hasListener(ol.events.EventType.DRAGENTER)).to.be(false);
expect(viewport.hasListener(ol.events.EventType.DRAGOVER)).to.be(false);
expect(viewport.hasListener(ol.events.EventType.DROP)).to.be(false);
expect(viewport.hasListener('dragenter')).to.be(false);
expect(viewport.hasListener('dragover')).to.be(false);
expect(viewport.hasListener('drop')).to.be(false);
});
it('registers and unregisters listeners on a custom target', function() {
@@ -51,13 +51,13 @@ describe('ol.interaction.DragAndDrop', function() {
target: customTarget
});
interaction.setMap(map);
expect(customTarget.hasListener(ol.events.EventType.DRAGENTER)).to.be(true);
expect(customTarget.hasListener(ol.events.EventType.DRAGOVER)).to.be(true);
expect(customTarget.hasListener(ol.events.EventType.DROP)).to.be(true);
expect(customTarget.hasListener('dragenter')).to.be(true);
expect(customTarget.hasListener('dragover')).to.be(true);
expect(customTarget.hasListener('drop')).to.be(true);
interaction.setMap(null);
expect(customTarget.hasListener(ol.events.EventType.DRAGENTER)).to.be(false);
expect(customTarget.hasListener(ol.events.EventType.DRAGOVER)).to.be(false);
expect(customTarget.hasListener(ol.events.EventType.DROP)).to.be(false);
expect(customTarget.hasListener('dragenter')).to.be(false);
expect(customTarget.hasListener('dragover')).to.be(false);
expect(customTarget.hasListener('drop')).to.be(false);
});
});
@@ -87,11 +87,11 @@ describe('ol.interaction.DragAndDrop', function() {
interaction.setMap(map);
var event = new ol.events.Event();
event.dataTransfer = {};
event.type = ol.events.EventType.DRAGENTER;
event.type = 'dragenter';
viewport.dispatchEvent(event);
event.type = ol.events.EventType.DRAGOVER;
event.type = 'dragover';
viewport.dispatchEvent(event);
event.type = ol.events.EventType.DROP;
event.type = 'drop';
event.dataTransfer.files = {
length: 1,
item: function() {
@@ -113,5 +113,4 @@ goog.require('ol.interaction.DragAndDrop');
goog.require('ol.View');
goog.require('ol.events.Event');
goog.require('ol.events.EventTarget');
goog.require('ol.events.EventType');
goog.require('ol.format.GeoJSON');
test/spec/ol/interaction/drawinteraction.test.js
+26 -29
View File
@@ -62,7 +62,7 @@ describe('ol.interaction.Draw', function() {
it('creates a new interaction', function() {
var draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.POINT
type: 'Point'
});
expect(draw).to.be.a(ol.interaction.Draw);
expect(draw).to.be.a(ol.interaction.Interaction);
@@ -76,7 +76,7 @@ describe('ol.interaction.Draw', function() {
var draw = new ol.interaction.Draw({
source: source,
geometryName: 'the_geom',
type: ol.geom.GeometryType.POINT
type: 'Point'
});
map.addInteraction(draw);
});
@@ -96,7 +96,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
var draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.POINT,
type: 'Point',
clickTolerance: 6
});
map.addInteraction(draw);
@@ -125,7 +125,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.POINT
type: 'Point'
});
map.addInteraction(draw);
});
@@ -161,8 +161,8 @@ describe('ol.interaction.Draw', function() {
it('triggers draw events', function() {
var ds = sinon.spy();
var de = sinon.spy();
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWSTART, ds);
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWEND, de);
ol.events.listen(draw, 'drawstart', ds);
ol.events.listen(draw, 'drawend', de);
simulateEvent('pointermove', 10, 20);
simulateEvent('pointerdown', 10, 20);
simulateEvent('pointerup', 10, 20);
@@ -178,13 +178,13 @@ describe('ol.interaction.Draw', function() {
end: 0,
addfeature: 0
};
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWEND,
ol.events.listen(draw, 'drawend',
function() {
expect(receivedEvents.end).to.be(0);
expect(receivedEvents.addfeature).to.be(0);
++receivedEvents.end;
});
source.on(ol.source.VectorEventType.ADDFEATURE, function() {
source.on('addfeature', function() {
expect(receivedEvents.end).to.be(1);
expect(receivedEvents.addfeature).to.be(0);
receivedEvents.addfeature++;
@@ -203,7 +203,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
map.addInteraction(new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.MULTI_POINT
type: 'MultiPoint'
}));
});
@@ -226,7 +226,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.LINE_STRING
type: 'LineString'
});
map.addInteraction(draw);
});
@@ -307,8 +307,8 @@ describe('ol.interaction.Draw', function() {
it('triggers draw events', function() {
var ds = sinon.spy();
var de = sinon.spy();
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWSTART, ds);
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWEND, de);
ol.events.listen(draw, 'drawstart', ds);
ol.events.listen(draw, 'drawend', de);
// first point
simulateEvent('pointermove', 10, 20);
@@ -337,7 +337,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
var draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.LINE_STRING,
type: 'LineString',
finishCondition: function(event) {
if (ol.array.equals(event.coordinate,[30,-20])) {
return true;
@@ -387,7 +387,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
map.addInteraction(new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.MULTI_LINE_STRING
type: 'MultiLineString'
}));
});
@@ -421,7 +421,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.POLYGON
type: 'Polygon'
});
map.addInteraction(draw);
});
@@ -514,8 +514,8 @@ describe('ol.interaction.Draw', function() {
it('triggers draw events', function() {
var ds = sinon.spy();
var de = sinon.spy();
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWSTART, ds);
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWEND, de);
ol.events.listen(draw, 'drawstart', ds);
ol.events.listen(draw, 'drawend', de);
// first point
simulateEvent('pointermove', 10, 20);
@@ -550,7 +550,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
map.addInteraction(new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.MULTI_POLYGON
type: 'MultiPolygon'
}));
});
@@ -627,7 +627,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.CIRCLE
type: 'Circle'
});
map.addInteraction(draw);
});
@@ -654,8 +654,8 @@ describe('ol.interaction.Draw', function() {
it('triggers draw events', function() {
var ds = sinon.spy();
var de = sinon.spy();
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWSTART, ds);
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWEND, de);
ol.events.listen(draw, 'drawstart', ds);
ol.events.listen(draw, 'drawend', de);
// first point
simulateEvent('pointermove', 10, 20);
@@ -680,7 +680,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
interaction = new ol.interaction.Draw({
type: ol.geom.GeometryType.LINE_STRING
type: 'LineString'
});
expect(interaction.getActive()).to.be(true);
@@ -749,7 +749,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
interaction = new ol.interaction.Draw({
type: ol.geom.GeometryType.LINE_STRING
type: 'LineString'
});
expect(interaction.getActive()).to.be(true);
});
@@ -803,7 +803,7 @@ describe('ol.interaction.Draw', function() {
it('creates a regular polygon in Circle mode', function() {
var draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.CIRCLE,
type: 'Circle',
geometryFunction:
ol.interaction.Draw.createRegularPolygon(4, Math.PI / 4)
});
@@ -836,7 +836,7 @@ describe('ol.interaction.Draw', function() {
beforeEach(function() {
draw = new ol.interaction.Draw({
source: source,
type: ol.geom.GeometryType.LINE_STRING
type: 'LineString'
});
map.addInteraction(draw);
feature = new ol.Feature(
@@ -852,7 +852,7 @@ describe('ol.interaction.Draw', function() {
it('dispatches a drawstart event', function() {
var spy = sinon.spy();
ol.events.listen(draw, ol.interaction.DrawEventType.DRAWSTART, spy);
ol.events.listen(draw, 'drawstart', spy);
draw.extend(feature);
expect(spy.callCount).to.be(1);
});
@@ -867,7 +867,6 @@ goog.require('ol.Map');
goog.require('ol.MapBrowserPointerEvent');
goog.require('ol.View');
goog.require('ol.geom.Circle');
goog.require('ol.geom.GeometryType');
goog.require('ol.geom.LineString');
goog.require('ol.geom.MultiLineString');
goog.require('ol.geom.MultiPoint');
@@ -875,9 +874,7 @@ goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.interaction.Draw');
goog.require('ol.interaction.DrawEventType');
goog.require('ol.interaction.Interaction');
goog.require('ol.layer.Vector');
goog.require('ol.pointer.PointerEvent');
goog.require('ol.source.Vector');
goog.require('ol.source.VectorEventType');
test/spec/ol/interaction/keyboardpaninteraction.test.js
+6 -8
View File
@@ -23,18 +23,18 @@ describe('ol.interaction.KeyboardPan', function() {
describe('handleEvent()', function() {
it('pans on arrow keys', function() {
var spy = sinon.spy(ol.interaction.Interaction, 'pan');
var event = new ol.MapBrowserEvent(ol.events.EventType.KEYDOWN, map, {
type: ol.events.EventType.KEYDOWN,
var event = new ol.MapBrowserEvent('keydown', map, {
type: 'keydown',
target: map.getTargetElement(),
preventDefault: ol.events.Event.prototype.preventDefault
});
event.originalEvent.keyCode = ol.events.KeyCode.DOWN;
event.originalEvent.keyCode = 40; // DOWN
map.handleMapBrowserEvent(event);
event.originalEvent.keyCode = ol.events.KeyCode.UP;
event.originalEvent.keyCode = 38; // UP
map.handleMapBrowserEvent(event);
event.originalEvent.keyCode = ol.events.KeyCode.LEFT;
event.originalEvent.keyCode = 37; // LEFT
map.handleMapBrowserEvent(event);
event.originalEvent.keyCode = ol.events.KeyCode.RIGHT;
event.originalEvent.keyCode = 39; // RIGHT
map.handleMapBrowserEvent(event);
expect(spy.getCall(0).args[2]).to.eql([0, -128]);
expect(spy.getCall(1).args[2]).to.eql([0, 128]);
@@ -51,7 +51,5 @@ goog.require('ol.Map');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View');
goog.require('ol.events.Event');
goog.require('ol.events.EventType');
goog.require('ol.events.KeyCode');
goog.require('ol.interaction.Interaction');
goog.require('ol.interaction.KeyboardPan');
test/spec/ol/interaction/keyboardzoominteraction.test.js
+2 -3
View File
@@ -23,8 +23,8 @@ describe('ol.interaction.KeyboardZoom', function() {
describe('handleEvent()', function() {
it('zooms on + and - keys', function() {
var spy = sinon.spy(ol.interaction.Interaction, 'zoomByDelta');
var event = new ol.MapBrowserEvent(ol.events.EventType.KEYDOWN, map, {
type: ol.events.EventType.KEYDOWN,
var event = new ol.MapBrowserEvent('keydown', map, {
type: 'keydown',
target: map.getTargetElement(),
preventDefault: ol.events.Event.prototype.preventDefault
});
@@ -45,6 +45,5 @@ goog.require('ol.Map');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View');
goog.require('ol.events.Event');
goog.require('ol.events.EventType');
goog.require('ol.interaction.Interaction');
goog.require('ol.interaction.KeyboardZoom');
test/spec/ol/interaction/mousewheelzoominteraction.test.js
+10 -11
View File
@@ -32,8 +32,8 @@ describe('ol.interaction.MouseWheelZoom', function() {
ol.has.FIREFOX = origHasFirefox;
done();
});
var event = new ol.MapBrowserEvent(ol.events.EventType.WHEEL, map, {
type: ol.events.EventType.WHEEL,
var event = new ol.MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_PIXEL,
deltaY: ol.has.DEVICE_PIXEL_RATIO,
target: map.getViewport(),
@@ -53,8 +53,8 @@ describe('ol.interaction.MouseWheelZoom', function() {
ol.has.FIREFOX = origHasFirefox;
done();
});
var event = new ol.MapBrowserEvent(ol.events.EventType.WHEEL, map, {
type: ol.events.EventType.WHEEL,
var event = new ol.MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_PIXEL,
deltaY: 1,
target: map.getViewport(),
@@ -71,8 +71,8 @@ describe('ol.interaction.MouseWheelZoom', function() {
ol.interaction.Interaction.zoomByDelta.restore();
done();
});
var event = new ol.MapBrowserEvent(ol.events.EventType.WHEEL, map, {
type: ol.events.EventType.WHEEL,
var event = new ol.MapBrowserEvent('wheel', map, {
type: 'wheel',
deltaMode: WheelEvent.DOM_DELTA_LINE,
deltaY: 1 / 40,
target: map.getViewport(),
@@ -92,8 +92,8 @@ describe('ol.interaction.MouseWheelZoom', function() {
ol.has.SAFARI = origHasSafari;
done();
});
var event = new ol.MapBrowserEvent(ol.events.EventType.MOUSEWHEEL, map, {
type: ol.events.EventType.MOUSEWHEEL,
var event = new ol.MapBrowserEvent('mousewheel', map, {
type: 'mousewheel',
wheelDeltaY: -3,
target: map.getViewport(),
preventDefault: ol.events.Event.prototype.preventDefault
@@ -112,8 +112,8 @@ describe('ol.interaction.MouseWheelZoom', function() {
ol.has.SAFARI = origHasSafari;
done();
});
var event = new ol.MapBrowserEvent(ol.events.EventType.MOUSEWHEEL, map, {
type: ol.events.EventType.MOUSEWHEEL,
var event = new ol.MapBrowserEvent('mousewheel', map, {
type: 'mousewheel',
wheelDeltaY: -1,
target: map.getViewport(),
preventDefault: ol.events.Event.prototype.preventDefault
@@ -130,6 +130,5 @@ goog.require('ol.Map');
goog.require('ol.MapBrowserEvent');
goog.require('ol.View');
goog.require('ol.events.Event');
goog.require('ol.events.EventType');
goog.require('ol.interaction.Interaction');
goog.require('ol.interaction.MouseWheelZoom');
test/spec/ol/interaction/selectinteraction.test.js
+14 -15
View File
@@ -122,7 +122,7 @@ describe('ol.interaction.Select', function() {
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
expect(listenerSpy.callCount).to.be(1);
@@ -136,7 +136,7 @@ describe('ol.interaction.Select', function() {
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20, true);
simulateEvent('singleclick', 10, -20, true);
expect(listenerSpy.callCount).to.be(1);
@@ -161,7 +161,7 @@ describe('ol.interaction.Select', function() {
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
expect(listenerSpy.callCount).to.be(1);
@@ -175,7 +175,7 @@ describe('ol.interaction.Select', function() {
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20, true);
simulateEvent('singleclick', 10, -20, true);
expect(listenerSpy.callCount).to.be(1);
@@ -184,7 +184,7 @@ describe('ol.interaction.Select', function() {
expect(select.getLayer(features.item(0))).to.equal(layer);
// Select again to make sure the internal layer isn't reported
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
expect(listenerSpy.callCount).to.be(2);
@@ -208,7 +208,7 @@ describe('ol.interaction.Select', function() {
var listenerSpy = sinon.spy();
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20, true);
simulateEvent('singleclick', 10, -20, true);
expect(listenerSpy.callCount).to.be(1);
@@ -217,7 +217,7 @@ describe('ol.interaction.Select', function() {
map.renderSync();
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20, true);
simulateEvent('singleclick', 10, -20, true);
expect(listenerSpy.callCount).to.be(2);
@@ -239,7 +239,7 @@ describe('ol.interaction.Select', function() {
});
map.addInteraction(select);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
var features = select.getFeatures();
expect(features.getLength()).to.equal(2);
expect(features.item(0).get('type')).to.be('bar');
@@ -256,7 +256,7 @@ describe('ol.interaction.Select', function() {
});
map.addInteraction(select);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20,
simulateEvent('singleclick', 10, -20,
true);
var features = select.getFeatures();
expect(features.getLength()).to.equal(2);
@@ -275,7 +275,7 @@ describe('ol.interaction.Select', function() {
}
});
map.addInteraction(select);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
var features = select.getFeatures();
expect(features.getLength()).to.equal(1);
expect(features.item(0).get('type')).to.be('bar');
@@ -290,7 +290,7 @@ describe('ol.interaction.Select', function() {
}
});
map.addInteraction(select);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20,
simulateEvent('singleclick', 10, -20,
true);
var features = select.getFeatures();
expect(features.getLength()).to.equal(1);
@@ -321,9 +321,9 @@ describe('ol.interaction.Select', function() {
});
interaction.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
// Select again to make sure that the internal layer doesn't get reported.
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
});
});
@@ -339,7 +339,7 @@ describe('ol.interaction.Select', function() {
expect(interaction.featureOverlay_).not.to.be(null);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
simulateEvent('singleclick', 10, -20);
});
afterEach(function() {
@@ -406,7 +406,6 @@ describe('ol.interaction.Select', function() {
goog.require('ol.Collection');
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.MapBrowserEvent.EventType');
goog.require('ol.MapBrowserPointerEvent');
goog.require('ol.View');
goog.require('ol.geom.Polygon');