Use ol.Collection#getElement in tests

This commit is contained in:
Éric Lemoine
2013-08-27 22:11:33 +02:00
parent 9895f879f9
commit d1e879e03f
+10 -11
View File
@@ -117,7 +117,7 @@ describe('ol.collection', function() {
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb); goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb);
expect(collection.remove(1)).to.eql(1); expect(collection.remove(1)).to.eql(1);
expect(cb).to.be.called(); 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() { it('does not remove more than one matching element', function() {
var collection = new ol.Collection([0, 1, 1, 2]); 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 collection = new ol.Collection(['a', 'b']);
var added, removed; var added, removed;
goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) { goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) {
added = e.elem; added = e.getElement();
}); });
goog.events.listen( goog.events.listen(
collection, ol.CollectionEventType.REMOVE, function(e) { collection, ol.CollectionEventType.REMOVE, function(e) {
removed = e.elem; removed = e.getElement();
}); });
collection.setAt(1, 1); collection.setAt(1, 1);
expect(added).to.eql(1); expect(added).to.eql(1);
@@ -156,7 +156,7 @@ describe('ol.collection', function() {
var removed; var removed;
goog.events.listen( goog.events.listen(
collection, ol.CollectionEventType.REMOVE, function(e) { collection, ol.CollectionEventType.REMOVE, function(e) {
removed = e.elem; removed = e.getElement();
}); });
collection.pop(); collection.pop();
expect(removed).to.eql('a'); expect(removed).to.eql('a');
@@ -169,7 +169,7 @@ describe('ol.collection', function() {
var added; var added;
goog.events.listen( goog.events.listen(
collection, ol.CollectionEventType.ADD, function(e) { collection, ol.CollectionEventType.ADD, function(e) {
added = e.elem; added = e.getElement();
}); });
collection.insertAt(1, 1); collection.insertAt(1, 1);
expect(added).to.eql(1); expect(added).to.eql(1);
@@ -181,7 +181,7 @@ describe('ol.collection', function() {
var added = []; var added = [];
goog.events.listen( goog.events.listen(
collection, ol.CollectionEventType.ADD, function(e) { collection, ol.CollectionEventType.ADD, function(e) {
added.push(e.elem); added.push(e.getElement());
}); });
collection.setAt(2, 0); collection.setAt(2, 0);
expect(collection.getLength()).to.eql(3); expect(collection.getLength()).to.eql(3);
@@ -230,7 +230,7 @@ describe('ol.collection', function() {
var collection = new ol.Collection(); var collection = new ol.Collection();
var elem; var elem;
goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) { goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) {
elem = e.elem; elem = e.getElement();
}); });
collection.push(1); collection.push(1);
expect(elem).to.eql(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.ADD, cb1);
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb2); goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb2);
collection.setAt(0, 2); collection.setAt(0, 2);
expect(cb2.lastCall.args[0].elem).to.eql(1); expect(cb2.lastCall.args[0].getElement()).to.eql(1);
expect(cb1.lastCall.args[0].elem).to.eql(2); expect(cb1.lastCall.args[0].getElement()).to.eql(2);
}); });
}); });
describe('pop', function() { describe('pop', function() {
it('triggers remove', function() { it('triggers remove', function() {
var elem;
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb1); goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb1);
collection.pop(); collection.pop();
expect(cb1.lastCall.args[0].elem).to.eql(1); expect(cb1.lastCall.args[0].getElement()).to.eql(1);
}); });
}); });
}); });