Skip to content

Commit 5b68849

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
规范leaflet下的UT
1 parent 64a00b3 commit 5b68849

39 files changed

+236
-312
lines changed

‎test/leaflet/control/ChangeTileVersionSpec.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require('../../../src/leaflet/control/ChangeTileVersion');
22

33
var url = GlobeParameter.ChinaProvincesURL;
4-
describe('leaflet_ChangeTileVersionTest', function () {
4+
describe('leaflet_ChangeTileVersion', function () {
55
var originalTimeout;
6-
var testDiv, map , changeTileVersion;
6+
var testDiv, map, changeTileVersion;
77
beforeAll(function () {
88
testDiv = document.createElement("div");
99
testDiv.setAttribute("id", "map");
@@ -13,14 +13,12 @@ describe('leaflet_ChangeTileVersionTest', function () {
1313
testDiv.style.width = "500px";
1414
testDiv.style.height = "500px";
1515
document.body.appendChild(testDiv);
16-
1716
map = L.map('map', {
1817
crs: L.CRS.EPSG4326,
1918
center: [33.03, 104.79],
2019
zoom: 3,
2120
});
2221
var baseLayer = L.supermap.tiledMapLayer(url).addTo(map);
23-
2422
changeTileVersion = L.supermap.control.changeTileVersion({
2523
layer: baseLayer,
2624
position: "topleft",
@@ -39,11 +37,10 @@ describe('leaflet_ChangeTileVersionTest', function () {
3937
map.remove();
4038
});
4139

42-
it('constructor test', function () {
40+
it('initialize', function () {
4341
expect(changeTileVersion).not.toBeNull();
4442
expect(changeTileVersion.options.layer).not.toBeNull();
4543
expect(changeTileVersion.slider).not.toBeNull();
46-
4744
changeTileVersion.nextTilesVersion();
4845
expect(changeTileVersion.options.layer.tempIndex).toBe(0);
4946
changeTileVersion.lastTilesVersion();

‎test/leaflet/mapping/ImageMapLayerSpec.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
require('../../../src/leaflet/mapping/ImageMapLayer');
22

33
var url = GlobeParameter.imageURL;
4-
describe('leaflet_ImageLayer', function () {
4+
describe('leaflet_ImageMapLayer', function () {
55
var originalTimeout;
6-
var testDiv, map , imageLayerObject;
6+
var testDiv, map, imageLayerObject;
77
beforeAll(function () {
88
testDiv = document.createElement("div");
99
testDiv.setAttribute("id", "map");
@@ -13,7 +13,6 @@ describe('leaflet_ImageLayer', function () {
1313
testDiv.style.width = "500px";
1414
testDiv.style.height = "500px";
1515
document.body.appendChild(testDiv);
16-
1716
map = L.map('map', {
1817
center: [0, 0],
1918
maxZoom: 18,
@@ -34,9 +33,9 @@ describe('leaflet_ImageLayer', function () {
3433
map.remove();
3534
});
3635

37-
it('constructor test', function () {
36+
it('initialize', function () {
3837
var tempOptions = {
39-
redirect:true,
38+
redirect: true,
4039
prjCoordSys: {"epsgCode": 3857}
4140
};
4241
imageLayerObject = L.supermap.imageMapLayer(url, tempOptions);
@@ -45,18 +44,17 @@ describe('leaflet_ImageLayer', function () {
4544
expect(imageLayerObject.options.prjCoordSys.epsgCode).toBe(3857);
4645
});
4746

48-
it('getTileUrl test', function () {
47+
it('getTileUrl', function () {
4948
var tempOptions = {
50-
redirect:true,
49+
redirect: true,
5150
prjCoordSys: {"epsgCode": 4326}
5251
};
5352
imageLayerObject = L.supermap.imageMapLayer(url, tempOptions).addTo(map);
5453
expect(imageLayerObject).not.toBeNull();
5554
expect(imageLayerObject.options.redirect).toBe(true);
5655
expect(imageLayerObject.options.prjCoordSys.epsgCode).toBe(4326);
57-
5856
var coords = L.point(120.14, 30.24);
5957
var tileUrl = imageLayerObject.getTileUrl(coords);
60-
expect(tileUrl).toBe("http://localhost:8090/iserver/services/map-world/rest/maps/%E4%B8%96%E7%95%8C%E5%9C%B0%E5%9B%BE_Day/image.png?width=256&height=256&redirect=true&transparent=false&cacheEnabled=true&prjCoordSys=%7B%22epsgCode%22:4326%7D&overlapDisplayed=true&viewBounds=%7B%22leftBottom%22%20:%20%7B%22x%22:2387268743.959911,%22y%22:-20037508.34278071%7D,%22rightTop%22%20:%20%7B%22x%22:2407306252.3027,%22y%22:-20037508.34278071%7D%7D");
58+
expect(tileUrl).toBe(url + "/image.png?width=256&height=256&redirect=true&transparent=false&cacheEnabled=true&prjCoordSys=%7B%22epsgCode%22:4326%7D&overlapDisplayed=true&viewBounds=%7B%22leftBottom%22%20:%20%7B%22x%22:2387268743.959911,%22y%22:-20037508.34278071%7D,%22rightTop%22%20:%20%7B%22x%22:2407306252.3027,%22y%22:-20037508.34278071%7D%7D");
6159
});
6260
});

‎test/leaflet/mapping/TiledMapLayerSpec.js‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require('../../../src/leaflet/mapping/TiledMapLayer');
33
var url = GlobeParameter.ChinaURL;
44
describe('leaflet_TiledMapLayer', function () {
55
var originalTimeout;
6-
var testDiv, map , tiledMapLayerObject;
6+
var testDiv, map, tiledMapLayerObject;
77
beforeAll(function () {
88
testDiv = document.createElement("div");
99
testDiv.setAttribute("id", "map");
@@ -13,7 +13,6 @@ describe('leaflet_TiledMapLayer', function () {
1313
testDiv.style.width = "500px";
1414
testDiv.style.height = "500px";
1515
document.body.appendChild(testDiv);
16-
1716
map = L.map('map', {
1817
center: [0, 0],
1918
maxZoom: 18,
@@ -33,35 +32,30 @@ describe('leaflet_TiledMapLayer', function () {
3332
map.remove();
3433
});
3534

36-
it('constructor test', function () {
35+
it('initialize', function () {
3736
expect(tiledMapLayerObject).not.toBeNull();
3837
expect(tiledMapLayerObject.options.prjCoordSys).toBeNull();
3938
});
4039

41-
it("getTileUrl and getScale test", function () {
42-
tiledMapLayerObject = null;
40+
it("getTileUrl, getScale", function () {
4341
var tempOptions = {
44-
prjCoordSys: {"epsgCode":3857},
42+
prjCoordSys: {"epsgCode": 3857}
4543
};
46-
tiledMapLayerObject = L.supermap.tiledMapLayer(url,tempOptions).addTo(map);
47-
44+
var tiledMapLayerObject = L.supermap.tiledMapLayer(url, tempOptions).addTo(map);
4845
expect(tiledMapLayerObject).not.toBeNull();
4946
expect(tiledMapLayerObject.options.prjCoordSys.epsgCode).toBe(3857);
50-
5147
var coords = L.point(1, 4);
5248
var tileUrl = tiledMapLayerObject.getTileUrl(coords);
5349
var tileUrlArray = tileUrl.split('?');
54-
expect(tileUrlArray[0]).toBe('http://localhost:8090/iserver/services/map-china400/rest/maps/China/tileImage.png');
50+
expect(tileUrlArray[0]).toBe(url + '/tileImage.png');
5551
expect(tileUrlArray[1]).toBe('width=256&height=256&redirect=false&transparent=false&cacheEnabled=true&prjCoordSys=%7B%22epsgCode%22:3857%7D&origin=%7B%22x%22:-20037508.342789244,%22y%22:20037508.342789244%7D&overlapDisplayed=false&scale=3.3803271432053105e-9&x=1&y=4');
5652
var scale = tiledMapLayerObject.getScale(1);
5753
expect(scale).toBe(3.3803271432053105e-9);
5854
});
5955

60-
it('changeTilesVersion test', function () {
61-
tiledMapLayerObject = null;
56+
it('changeTilesVersion', function () {
6257
var sourceUrl = "http://117.122.248.69:8090//iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces";
63-
tiledMapLayerObject = L.supermap.tiledMapLayer(sourceUrl);
64-
58+
var tiledMapLayerObject = L.supermap.tiledMapLayer(sourceUrl);
6559
tiledMapLayerObject.nextTilesVersion();
6660
expect(tiledMapLayerObject.tempIndex).toBe(0);
6761
tiledMapLayerObject.lastTilesVersion();

‎test/leaflet/mapping/WebMapSpec.js‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require('../../../src/leaflet/mapping/WebMap');
22

3-
describe('leaflet_WebMapTest', function() {
3+
describe('leaflet_WebMap', function () {
44
var originalTimeout;
55
var testDiv;
66
beforeEach(function () {
@@ -20,51 +20,48 @@ describe('leaflet_WebMapTest', function() {
2020
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
2121
});
2222

23-
it('TIANDITU add FEATURE_LAYER test', function (done) {
24-
var tianDiTuWebMap = L.supermap.webmap(44, {server: "support.supermap.com.cn:8092"});
23+
it('TIANDITU add FEATURE_LAYER', function (done) {
24+
var tianDiTuWebMap = L.supermap.webmap(44, {server: "support.supermap.com.cn:8092"});
2525
setTimeout(function () {
2626
try {
2727
expect(tianDiTuWebMap).not.toBeNull();
2828
expect(tianDiTuWebMap.id).toBe(44);
2929
tianDiTuWebMap.remove();
3030
done();
31-
}catch(exception) {
31+
} catch (exception) {
3232
console.log("'TIANDITU'案例失败：" + exception.name + ":" + exception.message);
3333
expect(false).toBeTruthy();
3434
}
35-
36-
},5000);
35+
}, 5000);
3736
});
3837

39-
it('BAIDU test', function (done) {
40-
var BaiDuWebMap = L.supermap.webmap(53, {server: "support.supermap.com.cn:8092"});
38+
it('BAIDU', function (done) {
39+
var BaiDuWebMap = L.supermap.webmap(53, {server: "support.supermap.com.cn:8092"});
4140
setTimeout(function () {
4241
try {
4342
expect(BaiDuWebMap).not.toBeNull();
4443
expect(BaiDuWebMap.id).toBe(53);
4544
BaiDuWebMap.remove();
4645
done();
47-
}catch(exception) {
46+
} catch (exception) {
4847
console.log("'BAIDU'案例失败：" + exception.name + ":" + exception.message);
4948
expect(false).toBeTruthy();
5049
}
51-
52-
},5000);
50+
}, 5000);
5351
});
5452

55-
it('CLOUD test', function (done) {
56-
var CloudWebMap = L.supermap.webmap(439);
53+
it('CLOUD', function (done) {
54+
var CloudWebMap = L.supermap.webmap(439);
5755
setTimeout(function () {
5856
try {
5957
expect(CloudWebMap).not.toBeNull();
6058
expect(CloudWebMap.id).toBe(439);
6159
CloudWebMap.remove();
6260
done()
63-
}catch(exception) {
61+
} catch (exception) {
6462
console.log("'CLOUD'案例失败：" + exception.name + ":" + exception.message);
6563
expect(false).toBeTruthy();
6664
}
67-
68-
},5000);
65+
}, 5000);
6966
});
7067
});

‎test/leaflet/overlay/EchartsLayerSpec.js‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require('../../../src/leaflet/overlay/EChartsLayer');
22

33
var url = GlobeParameter.imageURL;
4-
describe('leaflet_EChartsLayerTest', function () {
4+
describe('leaflet_EChartsLayer', function () {
55
var originalTimeout;
66
var testDiv, map;
77
beforeAll(function () {
@@ -33,7 +33,7 @@ describe('leaflet_EChartsLayerTest', function () {
3333
map.remove();
3434
});
3535

36-
it('echartsLayer constructor test', function () {
36+
it('initialize', function () {
3737
var echartsLayer;
3838
var geoCoordMap = {
3939
'上海': [121.4648, 31.2891],
@@ -151,7 +151,6 @@ describe('leaflet_EChartsLayerTest', function () {
151151
'青岛': [120.4651, 36.3373],
152152
'韶关': [113.7964, 24.7028]
153153
};
154-
155154
var BJData = [
156155
[{name: '北京'}, {name: '上海', value: 95}],
157156
[{name: '北京'}, {name: '广州', value: 90}],
@@ -164,7 +163,6 @@ describe('leaflet_EChartsLayerTest', function () {
164163
[{name: '北京'}, {name: '重庆', value: 20}],
165164
[{name: '北京'}, {name: '常州', value: 10}]
166165
];
167-
168166
var SHData = [
169167
[{name: '上海'}, {name: '包头', value: 95}],
170168
[{name: '上海'}, {name: '昆明', value: 90}],
@@ -177,7 +175,6 @@ describe('leaflet_EChartsLayerTest', function () {
177175
[{name: '上海'}, {name: '丹东', value: 20}],
178176
[{name: '上海'}, {name: '大连', value: 10}]
179177
];
180-
181178
var GZData = [
182179
[{name: '广州'}, {name: '福州', value: 95}],
183180
[{name: '广州'}, {name: '太原', value: 90}],
@@ -190,9 +187,7 @@ describe('leaflet_EChartsLayerTest', function () {
190187
[{name: '广州'}, {name: '北海', value: 20}],
191188
[{name: '广州'}, {name: '海口', value: 10}]
192189
];
193-
194190
var planePath = 'path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z';
195-
196191
var convertData = function (data) {
197192
var res = [];
198193
for (var i = 0; i < data.length; i++) {
@@ -209,7 +204,6 @@ describe('leaflet_EChartsLayerTest', function () {
209204
}
210205
return res;
211206
};
212-
213207
var color = ['#a6c84c', '#ffa022', '#46bee9'];
214208
var series = [];
215209
[['北京', BJData], ['上海', SHData], ['广州', GZData]].forEach(function (item, i) {
@@ -289,8 +283,7 @@ describe('leaflet_EChartsLayerTest', function () {
289283
})
290284
});
291285
});
292-
293-
option = {
286+
var option = {
294287
title: {
295288
text: '模拟迁徙',
296289
subtext: '数据纯属虚构',
@@ -310,11 +303,9 @@ describe('leaflet_EChartsLayerTest', function () {
310303
selectedMode: 'multiple',
311304
backgroundColor: 'rgba(128, 128, 128, 0.5)'
312305
},
313-
314306
series: series
315307
};
316308
echartsLayer = L.supermap.echartsLayer(option).addTo(map);
317-
318309
expect(echartsLayer).not.toBeNull();
319310
expect(echartsLayer._echartsOptions.series.length).toBe(9);
320311
expect(echartsLayer._echartsOptions.series[0].name).toBe("北京 Top10");

‎test/leaflet/overlay/GraphThemeLayerSpec.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('leaflet_testGraphThemeLayer', function () {
3737
map.remove();
3838
});
3939

40-
it('construtor and destroy', function () {
40+
it('initialize, destroy', function () {
4141
var barThemeLayer = L.supermap.graphThemeLayer("BarThemeLayer", "Bar", {isOverLay: false}).addTo(map);
4242
barThemeLayer.themeFields = ["CON2009", "CON2010", "CON2011", "CON2012", "CON2013"];
4343
barThemeLayer.chartsSetting = {
@@ -174,7 +174,6 @@ describe('leaflet_testGraphThemeLayer', function () {
174174
graphThemeLayer.clear();
175175
});
176176

177-
178177
// 此方法为iclient8的私有方法,不支持leaflet对象,此处测试传入iclient对象的情况
179178
it('isPointInPoly', function () {
180179
var graphThemeLayer = L.supermap.graphThemeLayer("BarThemeLayer", "Bar", options).addTo(map);

0 commit comments

Comments
 (0)