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

Merge pull request #5429 from probins/testenums

Browse Source 
Remove enums from tests
This commit is contained in:
Andreas Hocevar
2016-07-15 09:12:58 +02:00
committed by GitHub
parent 878ca6471d 06fd92353b
commit 34d5cc228e
41 changed files with 379 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/spec/ol/source/imagewmssource.test.js
View File

@@ -93,7 +93,7 @@ describe('ol.source.ImageWMS', function() {
});
it('sets MAP_RESOLUTION when the server is MapServer', function() {
options.serverType = ol.source.wms.ServerType.MAPSERVER;
options.serverType = 'mapserver';
var source = new ol.source.ImageWMS(options);
pixelRatio = 2;
var image = source.getImage(extent, resolution, pixelRatio, projection);
@@ -103,7 +103,7 @@ describe('ol.source.ImageWMS', function() {
});
it('sets FORMAT_OPTIONS when the server is GeoServer', function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.ImageWMS(options);
pixelRatio = 2;
var image = source.getImage(extent, resolution, pixelRatio, projection);
@@ -113,7 +113,7 @@ describe('ol.source.ImageWMS', function() {
});
it('extends FORMAT_OPTIONS if it is already present', function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.ImageWMS(options);
options.params.FORMAT_OPTIONS = 'param1:value1';
pixelRatio = 2;
@@ -125,7 +125,7 @@ describe('ol.source.ImageWMS', function() {
it('rounds FORMAT_OPTIONS to an integer when the server is GeoServer',
function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.ImageWMS(options);
pixelRatio = 1.325;
var image =
@@ -136,7 +136,7 @@ describe('ol.source.ImageWMS', function() {
});
it('sets DPI when the server is QGIS', function() {
options.serverType = ol.source.wms.ServerType.QGIS;
options.serverType = 'qgis';
var source = new ol.source.ImageWMS(options);
pixelRatio = 2;
var image = source.getImage(extent, resolution, pixelRatio, projection);
@@ -247,4 +247,3 @@ describe('ol.source.ImageWMS', function() {
goog.require('ol.source.ImageWMS');
goog.require('ol.proj');
goog.require('ol.source.wms.ServerType');

9
test/spec/ol/source/tileimagesource.test.js
View File

@@ -59,7 +59,7 @@ describe('ol.source.TileImage', function() {
source.getKey = function() {
return 'key0';
};
tile.state = ol.TileState.LOADED;
tile.state = 2; // LOADED
var returnedTile = source.getTileInternal(
0, 0, -1, 1, ol.proj.get('EPSG:3857'));
expect(returnedTile).not.to.be(tile);
@@ -75,7 +75,7 @@ describe('ol.source.TileImage', function() {
return dynamicParamsKey;
};
dynamicParamsKey = 'key0';
tile.state = ol.TileState.LOADED;
tile.state = 2; // LOADED
returnedTile = source.getTileInternal(
0, 0, -1, 1, ol.proj.get('EPSG:3857'));
dynamicParamsKey = 'key1';
@@ -125,7 +125,7 @@ describe('ol.source.TileImage', function() {
expect(tile).to.be.a(ol.reproj.Tile);
ol.events.listen(tile, 'change', function() {
if (tile.getState() == ol.TileState.LOADED) {
if (tile.getState() == 2) { // LOADED
done();
}
});
@@ -144,7 +144,7 @@ describe('ol.source.TileImage', function() {
expect(tile).to.be.a(ol.reproj.Tile);
ol.events.listen(tile, 'change', function() {
if (tile.getState() == ol.TileState.LOADED) {
if (tile.getState() == 2) { // LOADED
done();
}
});
@@ -155,7 +155,6 @@ describe('ol.source.TileImage', function() {
goog.require('ol.ImageTile');
goog.require('ol.Tile');
goog.require('ol.TileState');
goog.require('ol.TileUrlFunction');
goog.require('ol.events');
goog.require('ol.proj');

7
test/spec/ol/source/tilejsonsource.test.js
View File

@@ -32,7 +32,7 @@ describe('ol.source.TileJSON', function() {
describe('#getState', function() {
it('returns ol.source.State.ERROR on HTTP 404', function() {
it('returns error on HTTP 404', function() {
var source = new ol.source.TileJSON({
url: 'invalid.jsonp'
});
@@ -42,7 +42,7 @@ describe('ol.source.TileJSON', function() {
});
});
it('returns ol.source.State.ERROR on CORS issues', function() {
it('returns error on CORS issues', function() {
var source = new ol.source.TileJSON({
url: 'http://example.com'
});
@@ -52,7 +52,7 @@ describe('ol.source.TileJSON', function() {
});
});
it('returns ol.source.State.ERROR on JSON parsing issues', function() {
it('returns error on JSON parsing issues', function() {
var source = new ol.source.TileJSON({
url: '/'
});
@@ -122,7 +122,6 @@ describe('ol.source.TileJSON', function() {
});
goog.require('ol.events');
goog.require('ol.source.State');
goog.require('ol.source.Source');
goog.require('ol.source.TileJSON');
goog.require('ol.Observable');

47
test/spec/ol/source/tilesource.test.js
View File

@@ -87,10 +87,10 @@ describe('ol.source.Tile', function() {
it('calls callback for each loaded tile', function() {
var source = new ol.test.source.TileMock({
'1/0/0': ol.TileState.LOADED,
'1/0/1': ol.TileState.LOADED,
'1/1/0': ol.TileState.LOADING,
'1/1/1': ol.TileState.LOADED
'1/0/0': 2, // LOADED
'1/0/1': 2, // LOADED
'1/1/0': 1, // LOADING,
'1/1/1': 2 // LOADED
});
var zoom = 1;
@@ -103,10 +103,10 @@ 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.TileMock({
'1/0/0': ol.TileState.LOADED,
'1/0/1': ol.TileState.LOADED,
'1/1/0': ol.TileState.LOADED,
'1/1/1': ol.TileState.LOADED
'1/0/0': 2, // LOADED,
'1/0/1': 2, // LOADED,
'1/1/0': 2, // LOADED,
'1/1/1': 2 // LOADED
});
var zoom = 1;
@@ -123,10 +123,10 @@ 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.TileMock({
'1/0/0': ol.TileState.LOADED,
'1/0/1': ol.TileState.LOADED,
'1/1/0': ol.TileState.LOADING,
'1/1/1': ol.TileState.LOADED
'1/0/0': 2, // LOADED,
'1/0/1': 2, // LOADED,
'1/1/0': 1, // LOADING,
'1/1/1': 2 // LOADED
});
var zoom = 1;
@@ -143,10 +143,10 @@ 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.TileMock({
'1/0/0': ol.TileState.LOADED,
'1/0/1': ol.TileState.LOADED,
'1/1/0': ol.TileState.LOADED,
'1/1/1': ol.TileState.LOADED
'1/0/0': 2, // LOADED,
'1/0/1': 2, // LOADED,
'1/1/0': 2, // LOADED,
'1/1/1': 2 // LOADED
});
var zoom = 1;
@@ -215,7 +215,7 @@ describe('ol.source.Tile', function() {
it('checks clearing of internal state', function() {
// create a source with one loaded tile
var source = new ol.test.source.TileMock({
'1/0/0': ol.TileState.LOADED
'1/0/0': 2 // LOADED
});
// check the loaded tile is there
var tile = source.getTile(1, 0, 0);
@@ -269,7 +269,7 @@ ol.test.source.TileMock.prototype.getTile = function(z, x, y) {
if (this.tileCache.containsKey(key)) {
return /** @type {!ol.Tile} */ (this.tileCache.get(key));
} else {
var tile = new ol.Tile(key, ol.TileState.IDLE);
var tile = new ol.Tile(key, 0); // IDLE
this.tileCache.set(key, tile);
return tile;
}
@@ -289,25 +289,25 @@ describe('ol.test.source.TileMock', function() {
describe('#getTile()', function() {
it('returns a tile with state based on constructor arg', function() {
var source = new ol.test.source.TileMock({
'0/0/0': ol.TileState.LOADED,
'1/0/0': ol.TileState.LOADED
'0/0/0': 2, // LOADED,
'1/0/0': 2 // LOADED
});
var tile;
// check a loaded tile
tile = source.getTile(0, 0, 0);
expect(tile).to.be.a(ol.Tile);
expect(tile.state).to.be(ol.TileState.LOADED);
expect(tile.state).to.be(2); // LOADED
// check a tile that is not loaded
tile = source.getTile(1, 0, -1);
expect(tile).to.be.a(ol.Tile);
expect(tile.state).to.be(ol.TileState.IDLE);
expect(tile.state).to.be(0); // IDLE
// check another loaded tile
tile = source.getTile(1, 0, 0);
expect(tile).to.be.a(ol.Tile);
expect(tile.state).to.be(ol.TileState.LOADED);
expect(tile.state).to.be(2); // LOADED
});
});
@@ -316,7 +316,6 @@ describe('ol.test.source.TileMock', function() {
goog.require('ol.Tile');
goog.require('ol.TileRange');
goog.require('ol.TileState');
goog.require('ol.proj');
goog.require('ol.proj.Projection');
goog.require('ol.source.Source');

16
test/spec/ol/source/tileutfgridsource.test.js
View File

@@ -57,11 +57,11 @@ describe('ol.source.TileUTFGrid', function() {
var source = new ol.source.TileUTFGrid({
url: url
});
expect(source.getState()).to.be(ol.source.State.LOADING);
expect(source.getState()).to.be('loading');
expect(source.tileGrid).to.be(null);
source.on('change', function(event) {
if (source.getState() === ol.source.State.READY) {
if (source.getState() === 'ready') {
expect(source.tileGrid).to.be.an(ol.tilegrid.TileGrid);
done();
}
@@ -74,11 +74,11 @@ describe('ol.source.TileUTFGrid', function() {
var source = new ol.source.TileUTFGrid({
url: 'Bogus UTFGrid URL'
});
expect(source.getState()).to.be(ol.source.State.LOADING);
expect(source.getState()).to.be('loading');
expect(source.tileGrid).to.be(null);
source.on('change', function(event) {
if (source.getState() === ol.source.State.ERROR) {
if (source.getState() === 'error') {
expect(source.tileGrid).to.be(null);
done();
}
@@ -178,13 +178,13 @@ describe('ol.source.TileUTFGrid', function() {
it('sets correct state', function() {
var source = getTileUTFGrid();
expect(source.getState()).to.be(ol.source.State.LOADING);
expect(source.getState()).to.be('loading');
// call the handleTileJSONResponse method with our
// locally available tileJson (from `before`)
source.handleTileJSONResponse(tileJson);
expect(source.getState()).to.be(ol.source.State.READY);
expect(source.getState()).to.be('ready');
});
});
@@ -232,7 +232,7 @@ describe('ol.source.TileUTFGrid', function() {
var tileUrl = this.tileUrlFunction_(urlTileCoord, pixelRatio, projection);
var tile = new ol.source.TileUTFGridTile_(
tileCoord,
tileUrl !== undefined ? ol.TileState.IDLE : ol.TileState.EMPTY,
tileUrl !== undefined ? 0 : 4, // IDLE : EMPTY
tileUrl !== undefined ? tileUrl : '',
this.tileGrid.getTileCoordExtent(tileCoord),
true); // always preemptive, so loading doesn't happen automatically
@@ -288,8 +288,6 @@ describe('ol.source.TileUTFGrid', function() {
goog.require('ol.net');
goog.require('ol.proj');
goog.require('ol.source.State');
goog.require('ol.source.Tile');
goog.require('ol.source.TileUTFGrid');
goog.require('ol.tilegrid.TileGrid');
goog.require('ol.TileState');

7
test/spec/ol/source/tilewmssource.test.js
View File

@@ -118,7 +118,7 @@ describe('ol.source.TileWMS', function() {
});
it('sets FORMAT_OPTIONS when the server is GeoServer', function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.TileWMS(options);
var tile = source.getTile(3, 2, -3, 2, ol.proj.get('CRS:84'));
var uri = new URL(tile.src_);
@@ -127,7 +127,7 @@ describe('ol.source.TileWMS', function() {
});
it('extends FORMAT_OPTIONS if it is already present', function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.TileWMS(options);
options.params.FORMAT_OPTIONS = 'param1:value1';
var tile = source.getTile(3, 2, -3, 2, ol.proj.get('CRS:84'));
@@ -138,7 +138,7 @@ describe('ol.source.TileWMS', function() {
it('rounds FORMAT_OPTIONS to an integer when the server is GeoServer',
function() {
options.serverType = ol.source.wms.ServerType.GEOSERVER;
options.serverType = 'geoserver';
var source = new ol.source.TileWMS(options);
var tile = source.getTile(3, 2, -3, 1.325, ol.proj.get('CRS:84'));
var uri = new URL(tile.src_);
@@ -270,6 +270,5 @@ describe('ol.source.TileWMS', function() {
goog.require('ol.ImageTile');
goog.require('ol.source.TileWMS');
goog.require('ol.source.wms.ServerType');
goog.require('ol.proj');
goog.require('ol.tilegrid.TileGrid');

5
test/spec/ol/source/zoomifysource.test.js
View File

@@ -217,12 +217,12 @@ describe('ol.source.Zoomify', function() {
var tile = source.getTile(0, 0, -1, 1, proj);
ol.events.listen(tile, 'change', function() {
if (tile.getState() == ol.TileState.LOADED) {
if (tile.getState() == 2) { // LOADED
var img = tile.getImage(context);
expect(img).to.be.a(HTMLCanvasElement);
var tile2 = source.getTile(0, 0, -1, 1, proj);
expect(tile2.getState()).to.be(ol.TileState.LOADED);
expect(tile2.getState()).to.be(2); // LOADED
var img2 = tile2.getImage(context);
expect(img).to.be(img2);
done();
@@ -262,5 +262,4 @@ goog.require('ol.dom');
goog.require('ol.events');
goog.require('ol.proj.Projection');
goog.require('ol.source.Zoomify');
goog.require('ol.TileState');
goog.require('ol.tilegrid.TileGrid');