From 521f06e91cd31f23a42fe7dd9b7b83980191041b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 15:56:20 -0400 Subject: [PATCH 1/6] Remove provide from tile.test.js --- test/spec/ol/source/tile.test.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/test/spec/ol/source/tile.test.js b/test/spec/ol/source/tile.test.js index 181358a9c1..c7f454aa8d 100644 --- a/test/spec/ol/source/tile.test.js +++ b/test/spec/ol/source/tile.test.js @@ -1,5 +1,3 @@ -goog.provide('ol.test.source.TileSource'); // eslint-disable-line openlayers-internal/valid-provide - goog.require('ol'); goog.require('ol.Tile'); goog.require('ol.TileRange'); @@ -18,7 +16,7 @@ goog.require('ol.tilegrid.TileGrid'); * @param {Object.} tileStates Lookup of tile key to * tile state. */ -ol.test.source.TileSource.Mock = function(tileStates) { +var MockTile = function(tileStates) { var tileGrid = new ol.tilegrid.TileGrid({ resolutions: [360 / 256, 180 / 256, 90 / 256, 45 / 256], origin: [-180, -180], @@ -35,13 +33,13 @@ ol.test.source.TileSource.Mock = function(tileStates) { } }; -ol.inherits(ol.test.source.TileSource.Mock, ol.source.Tile); +ol.inherits(MockTile, ol.source.Tile); /** * @inheritDoc */ -ol.test.source.TileSource.Mock.prototype.getTile = function(z, x, y) { +MockTile.prototype.getTile = function(z, x, y) { var key = this.getKeyZXY(z, x, y); if (this.tileCache.containsKey(key)) { return /** @type {!ol.Tile} */ (this.tileCache.get(key)); @@ -121,7 +119,7 @@ describe('ol.source.Tile', function() { }); it('does not call the callback if no tiles are loaded', function() { - var source = new ol.test.source.TileSource.Mock({}); + var source = new MockTile({}); var grid = source.getTileGrid(); var extent = [-180, -180, 180, 180]; var zoom = 3; @@ -132,7 +130,7 @@ describe('ol.source.Tile', function() { }); it('does not call getTile() if no tiles are loaded', function() { - var source = new ol.test.source.TileSource.Mock({}); + var source = new MockTile({}); sinon.spy(source, 'getTile'); var grid = source.getTileGrid(); var extent = [-180, -180, 180, 180]; @@ -146,7 +144,7 @@ describe('ol.source.Tile', function() { it('calls callback for each loaded tile', function() { - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '1/0/0': 2, // LOADED '1/0/1': 2, // LOADED '1/1/0': 1, // LOADING, @@ -162,7 +160,7 @@ describe('ol.source.Tile', function() { it('returns true if range is fully loaded', function() { // a source with no loaded tiles - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '1/0/0': 2, // LOADED, '1/0/1': 2, // LOADED, '1/1/0': 2, // LOADED, @@ -182,7 +180,7 @@ describe('ol.source.Tile', function() { it('returns false if range is not fully loaded', function() { // a source with no loaded tiles - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '1/0/0': 2, // LOADED, '1/0/1': 2, // LOADED, '1/1/0': 1, // LOADING, @@ -202,7 +200,7 @@ describe('ol.source.Tile', function() { it('allows callback to override loaded check', function() { // a source with no loaded tiles - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '1/0/0': 2, // LOADED, '1/0/1': 2, // LOADED, '1/1/0': 2, // LOADED, @@ -274,7 +272,7 @@ describe('ol.source.Tile', function() { describe('#refresh()', function() { it('checks clearing of internal state', function() { // create a source with one loaded tile - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '1/0/0': 2 // LOADED }); // check the loaded tile is there @@ -292,19 +290,19 @@ describe('ol.source.Tile', function() { }); -describe('ol.test.source.TileSource.Mock', function() { +describe('MockTile', function() { describe('constructor', function() { it('creates a tile source', function() { - var source = new ol.test.source.TileSource.Mock({}); + var source = new MockTile({}); expect(source).to.be.a(ol.source.Tile); - expect(source).to.be.a(ol.test.source.TileSource.Mock); + expect(source).to.be.a(MockTile); }); }); describe('#getTile()', function() { it('returns a tile with state based on constructor arg', function() { - var source = new ol.test.source.TileSource.Mock({ + var source = new MockTile({ '0/0/0': 2, // LOADED, '1/0/0': 2 // LOADED }); From 6113821d7c9e9f740bb1d7280ed1ae3be77fb7e5 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 15:57:10 -0400 Subject: [PATCH 2/6] Transform all test .js --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 07582ae12a..b3221ffb0f 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,8 @@ "karma": "node tasks/test.js start test/karma.config.js", "transform-src": "jscodeshift --transform transforms/module.js src", "transform-examples": "jscodeshift --transform transforms/module.js examples", - "transform-test-spec": "jscodeshift --transform transforms/module.js test/spec", - "transform-test-rendering": "jscodeshift --transform transforms/module.js test/rendering", - "transform": "npm run transform-src && npm run transform-examples && npm run transform-test-spec && npm run transform-test-rendering && npm run lint -- --fix" + "transform-test": "jscodeshift --transform transforms/module.js test", + "transform": "npm run transform-src && npm run transform-examples && npm run transform-test && npm run lint -- --fix" }, "main": "dist/ol.js", "repository": { From 670c6d9f3fa73bc6c7079059dd62456502c6efdf Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 16:32:01 -0400 Subject: [PATCH 3/6] Use window for global --- test/test-extensions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-extensions.js b/test/test-extensions.js index a1448d3272..a3d45294fb 100644 --- a/test/test-extensions.js +++ b/test/test-extensions.js @@ -514,4 +514,4 @@ goog.require('ol.renderer.webgl.Map'); } }); -})(this); +})(window); From 145505fa8abfd0663c751200df36860242e3e27e Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 16:48:06 -0400 Subject: [PATCH 4/6] Missing require in epsg3857.test.js --- test/spec/ol/proj/epsg3857.test.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/spec/ol/proj/epsg3857.test.js b/test/spec/ol/proj/epsg3857.test.js index 61ab3faa28..07edcb973a 100644 --- a/test/spec/ol/proj/epsg3857.test.js +++ b/test/spec/ol/proj/epsg3857.test.js @@ -1,6 +1,5 @@ - - goog.require('ol.proj'); +goog.require('ol.proj.EPSG3857'); describe('ol.proj.EPSG3857', function() { From b44db8eb26290b037492dab2b54efcbc805e9221 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 16:53:39 -0400 Subject: [PATCH 5/6] Missing require in tileurlfunction.test.js --- test/spec/ol/tileurlfunction.test.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/spec/ol/tileurlfunction.test.js b/test/spec/ol/tileurlfunction.test.js index f42375c072..e06258847a 100644 --- a/test/spec/ol/tileurlfunction.test.js +++ b/test/spec/ol/tileurlfunction.test.js @@ -1,10 +1,8 @@ - - goog.require('ol.TileUrlFunction'); +goog.require('ol.tilecoord'); goog.require('ol.tilegrid'); goog.require('ol.tilegrid.TileGrid'); - describe('ol.TileUrlFunction', function() { describe('expandUrl', function() { From 93cfc063c3ae9c1313a75c08e272c7281dfad95b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 18 Aug 2017 17:35:59 -0400 Subject: [PATCH 6/6] Correctly create an icon image --- test/spec/ol/style/iconimagecache.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/spec/ol/style/iconimagecache.test.js b/test/spec/ol/style/iconimagecache.test.js index a38fb0df7b..a883f772ca 100644 --- a/test/spec/ol/style/iconimagecache.test.js +++ b/test/spec/ol/style/iconimagecache.test.js @@ -29,7 +29,7 @@ describe('ol.style.IconImageCache', function() { for (i = 0; i < 4; ++i) { src = i + ''; - iconImage = new ol.style.IconImage(src, null); + iconImage = new ol.style.IconImage(null, src); cache.set(src, null, null, iconImage); }