From d1e879e03f6e05065e611e7b7daf2a4970337e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Tue, 27 Aug 2013 22:11:33 +0200 Subject: [PATCH] Use ol.Collection#getElement in tests --- test/spec/ol/collection.test.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/spec/ol/collection.test.js b/test/spec/ol/collection.test.js index ef80e683cb..3020ba0f36 100644 --- a/test/spec/ol/collection.test.js +++ b/test/spec/ol/collection.test.js @@ -117,7 +117,7 @@ describe('ol.collection', function() { goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb); expect(collection.remove(1)).to.eql(1); expect(cb).to.be.called(); - expect(cb.lastCall.args[0].elem).to.eql(1); + expect(cb.lastCall.args[0].getElement()).to.eql(1); }); it('does not remove more than one matching element', function() { var collection = new ol.Collection([0, 1, 1, 2]); @@ -138,11 +138,11 @@ describe('ol.collection', function() { var collection = new ol.Collection(['a', 'b']); var added, removed; goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) { - added = e.elem; + added = e.getElement(); }); goog.events.listen( collection, ol.CollectionEventType.REMOVE, function(e) { - removed = e.elem; + removed = e.getElement(); }); collection.setAt(1, 1); expect(added).to.eql(1); @@ -156,7 +156,7 @@ describe('ol.collection', function() { var removed; goog.events.listen( collection, ol.CollectionEventType.REMOVE, function(e) { - removed = e.elem; + removed = e.getElement(); }); collection.pop(); expect(removed).to.eql('a'); @@ -169,7 +169,7 @@ describe('ol.collection', function() { var added; goog.events.listen( collection, ol.CollectionEventType.ADD, function(e) { - added = e.elem; + added = e.getElement(); }); collection.insertAt(1, 1); expect(added).to.eql(1); @@ -181,7 +181,7 @@ describe('ol.collection', function() { var added = []; goog.events.listen( collection, ol.CollectionEventType.ADD, function(e) { - added.push(e.elem); + added.push(e.getElement()); }); collection.setAt(2, 0); expect(collection.getLength()).to.eql(3); @@ -230,7 +230,7 @@ describe('ol.collection', function() { var collection = new ol.Collection(); var elem; goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) { - elem = e.elem; + elem = e.getElement(); }); collection.push(1); expect(elem).to.eql(1); @@ -249,16 +249,15 @@ describe('ol.collection', function() { goog.events.listen(collection, ol.CollectionEventType.ADD, cb1); goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb2); collection.setAt(0, 2); - expect(cb2.lastCall.args[0].elem).to.eql(1); - expect(cb1.lastCall.args[0].elem).to.eql(2); + expect(cb2.lastCall.args[0].getElement()).to.eql(1); + expect(cb1.lastCall.args[0].getElement()).to.eql(2); }); }); describe('pop', function() { it('triggers remove', function() { - var elem; goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb1); collection.pop(); - expect(cb1.lastCall.args[0].elem).to.eql(1); + expect(cb1.lastCall.args[0].getElement()).to.eql(1); }); }); });