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

Cleanup after goog.array, goog.object and goog.isDef removal

Browse Source
This commit is contained in:
Andreas Hocevar
2016-02-05 14:50:00 +01:00
parent 57c5632de2
commit d0eb6322c3
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/spec/ol/tilegrid/wmtstilegrid.test.js
View File

@@ -42,17 +42,17 @@ describe('ol.tilegrid.WMTS', function() {
expect(tileGrid.origins_).to.be.an('array');
expect(tileGrid.origins_).to.have.length(20);
expect(tileGrid.origins_).to.eql(
goog.array.repeat([-20037508.3428, 20037508.3428], 20));
Array.apply(null, Array(20)).map(Array.prototype.valueOf,
[-20037508.3428, 20037508.3428]));
expect(tileGrid.tileSizes_).to.be.an('array');
expect(tileGrid.tileSizes_).to.have.length(20);
expect(tileGrid.tileSizes_).to.eql(
goog.array.repeat(256, 20));
Array.apply(null, Array(20)).map(Number.prototype.valueOf, 256));
});
});
});
goog.require('goog.array');
goog.require('ol.format.WMTSCapabilities');
goog.require('ol.tilegrid.WMTS');

7
test/test-extensions.js
View File

@@ -311,7 +311,7 @@
*/
expect.Assertion.prototype.arreql = function(obj) {
this.assert(
goog.array.equals(this.obj, obj),
ol.array.equals(this.obj, obj),
function() {
return 'expected ' + expect.stringify(this.obj) +
' to sort of equal ' + expect.stringify(obj);
@@ -330,12 +330,13 @@
* @return {expect.Assertion} The assertion.
*/
expect.Assertion.prototype.arreqlNaN = function(obj) {
function compare(a, b) {
function compare(a, i) {
var b = obj[i];
return a === b || (typeof a === 'number' && typeof b === 'number' &&
isNaN(a) && isNaN(b));
}
this.assert(
goog.array.equals(this.obj, obj, compare),
this.obj.length === obj.length && this.obj.every(compare),
function() {
return 'expected ' + expect.stringify(this.obj) +
' to sort of equal ' + expect.stringify(obj);