Skip to content

Commit ca27681

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
规范mapboGL下的UT。
1 parent 3c78aa2 commit ca27681

33 files changed

+123
-2214
lines changed

‎test/mapboxgl/overlay/GraphThemeLayerSpec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var mapboxgl = require('mapbox-gl');
44
window.mapboxgl = mapboxgl;
55

66
var url = GlobeParameter.China4326URL;
7-
describe('mapboxgl_testGraphThemeLayer', function () {
7+
describe('mapboxgl_GraphThemeLayer', function () {
88
var originalTimeout;
99
var testDiv, map;
1010
beforeAll(function () {
@@ -51,7 +51,7 @@ describe('mapboxgl_testGraphThemeLayer', function () {
5151
map.remove();
5252
});
5353

54-
it('construtor', function () {
54+
it('initialize', function () {
5555
var graphThemeLayer = new mapboxgl.supermap.GraphThemeLayer("GraphThemeLayer", "Bar",
5656
{
5757
map: map,
@@ -208,7 +208,7 @@ describe('mapboxgl_testGraphThemeLayer', function () {
208208
graphThemeLayer.clear();
209209
});
210210

211-
// 此方法为iclient8的私有方法,不支持leaflet对象,此处测试传入iclient对象的情况
211+
// 此方法为iclient8的私有方法,不支持mapboxgl对象,此处测试传入iclient对象的情况
212212
it('isQuadrilateralOverLap, isPointInPoly', function () {
213213
var graphThemeLayer = new mapboxgl.supermap.GraphThemeLayer("GraphThemeLayer", "Bar",
214214
{
@@ -237,7 +237,7 @@ describe('mapboxgl_testGraphThemeLayer', function () {
237237
var graphThemeLayer = new mapboxgl.supermap.GraphThemeLayer("GraphThemeLayer", "Bar", {
238238
map: map,
239239
isOverLay: false,
240-
overlayWeightField:"pop_1991",
240+
overlayWeightField: "pop_1991",
241241
themeFields: ["CON2009", "CON2010", "CON2011", "CON2012", "CON2013"],
242242
chartsSetting: {
243243
width: 240,

‎test/mapboxgl/overlay/MapvLayerSpec.js‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
require('../../../src/mapboxgl/overlay/MapvLayer');
12
var mapboxgl = require('mapbox-gl');
23
var mapv = require('mapv');
34
window.mapv = mapv;
45
window.mapboxgl = mapboxgl;
5-
require('../../../src/mapboxgl/overlay/MapvLayer');
66

77
var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
88
describe('mapboxgl_MapVLayer', function () {
@@ -17,7 +17,6 @@ describe('mapboxgl_MapVLayer', function () {
1717
testDiv.style.width = "500px";
1818
testDiv.style.height = "500px";
1919
window.document.body.appendChild(testDiv);
20-
2120
map = new mapboxgl.Map({
2221
container: 'map',
2322
style: {
@@ -40,7 +39,6 @@ describe('mapboxgl_MapVLayer', function () {
4039
center: [112, 37.94],
4140
zoom: 3
4241
});
43-
4442
map.on('load', function () {
4543
var randomCount = 1000;
4644
var data = [];
@@ -78,45 +76,41 @@ describe('mapboxgl_MapVLayer', function () {
7876
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
7977
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
8078
});
81-
8279
afterEach(function () {
8380
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
8481
});
85-
8682
afterAll(function () {
8783
document.body.removeChild(testDiv);
8884
mapv = null;
8985
});
9086

91-
it('constructor test', function (done) {
87+
it('initialize', function (done) {
9288
setTimeout(function () {
9389
expect(mapvLayer).not.toBeNull();
9490
expect(mapvLayer.canvas).not.toBeNull();
9591
expect(mapvLayer.map).not.toBeNull();
9692
expect(mapvLayer.mapContainer).not.toBeNull();
97-
9893
//判断是否返回期望的maplayer
9994
expect(mapvLayer.renderer).not.toBeNull();
10095
expect(mapvLayer.renderer.context).toBe("2d");
10196
done();
10297
}, 6000);
10398
});
10499

105-
it('getTopLeft test', function () {
100+
it('getTopLeft', function () {
106101
var topLeft = mapvLayer.getTopLeft();
107102
expect(topLeft).not.toBeNull();
108103
});
109104

110-
it('show test', function () {
105+
it('show', function () {
111106
var thisMapvlayer = mapvLayer.show();
112107
expect(thisMapvlayer).not.toBeNull();
113108
expect(thisMapvlayer.renderer.canvasLayer.canvas.style.display).toBe('block');
114109
});
115110

116-
it('hide test', function () {
111+
it('hide', function () {
117112
var thisMapvlayer = mapvLayer.hide();
118113
expect(thisMapvlayer).not.toBeNull();
119114
expect(thisMapvlayer.renderer.canvasLayer.canvas.style.display).toBe('none');
120115
});
121-
122116
});

‎test/mapboxgl/overlay/RangeTheme3DLayerSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var mapboxgl = require('mapbox-gl');
33

44
var dataUrl = GlobeParameter.editServiceURL_leaflet;
55
var themeField = "POP_DENSITY99";
6-
describe('mapboxgl_testRangeTheme3DLayer', function () {
6+
describe('mapboxgl_RangeTheme3DLayer', function () {
77
var originalTimeout;
88
var testDiv, map;
99
beforeAll(function () {
@@ -50,7 +50,7 @@ describe('mapboxgl_testRangeTheme3DLayer', function () {
5050
map.remove();
5151
});
5252

53-
it('constructor', function (done) {
53+
it('initialize', function (done) {
5454
var themeLayer;
5555
map.on('load', function () {
5656
var getFeatureBySQLParams = new SuperMap.GetFeaturesBySQLParameters({

‎test/mapboxgl/overlay/RangeThemeLayerSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ window.mapboxgl = mapboxgl;
44

55
var baseUrl = GlobeParameter.jingjinMapURL + "/maps/京津地区地图",
66
dataUrl = GlobeParameter.editServiceURL_leaflet;
7-
describe('mapboxgl_testRangeThemeLayer', function () {
7+
describe('mapboxgl_RangeThemeLayer', function () {
88
var originalTimeout;
99
var testDiv, map;
1010
beforeAll(function () {
@@ -51,7 +51,7 @@ describe('mapboxgl_testRangeThemeLayer', function () {
5151
map.remove();
5252
});
5353

54-
it('constructor, addFeatures, getShapesByFeatureID, getCacheCount, setMaxCacheCount, removeFeatures', function (done) {
54+
it('initialize, addFeatures, getShapesByFeatureID, getCacheCount, setMaxCacheCount, removeFeatures', function (done) {
5555
var themeLayer, result;
5656
var getFeatureBySQLParams = new SuperMap.GetFeaturesBySQLParameters({
5757
queryParameter: new SuperMap.FilterParameter({

‎test/mapboxgl/overlay/UniqueTheme3DLayerSpec.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var mapboxgl = require('mapbox-gl');
33

44
var dataUrl = GlobeParameter.editServiceURL_leaflet;
55
var themeField = "LANDTYPE";
6-
describe('mapboxgl_testUniqueTheme3DLayer', function () {
6+
describe('mapboxgl_UniqueTheme3DLayer', function () {
77
var originalTimeout;
88
var testDiv, map;
99
beforeAll(function () {
@@ -50,7 +50,7 @@ describe('mapboxgl_testUniqueTheme3DLayer', function () {
5050
map.remove();
5151
});
5252

53-
it('constructor', function (done) {
53+
it('initialize', function (done) {
5454
var themeLayer;
5555
map.on('load', function () {
5656
var getFeatureBySQLParams = new SuperMap.GetFeaturesBySQLParameters({
@@ -61,7 +61,6 @@ describe('mapboxgl_testUniqueTheme3DLayer', function () {
6161
toIndex: 500,
6262
datasetNames: ["Jingjin:Landuse_R"]
6363
});
64-
6564
var queryFeatures = new SuperMap.GetFeaturesBySQLService(dataUrl, {
6665
eventListeners: {
6766
processCompleted: function (serviceResult) {
@@ -80,7 +79,6 @@ describe('mapboxgl_testUniqueTheme3DLayer', function () {
8079
["湖泊水库", "#8EE5EE"], ["经济林", "#548B54"], ["沙漠", "#DEB887"], ["水浇地", "#E0FFFF"],
8180
["水田", "#388E8E"], ["用材林", "#556B2F"], ["沼泽", "#2F4F4F"]
8281
],
83-
8482
// 显示图例
8583
showLegend: true,
8684
legendTitle: "土地利用类型"

‎test/mapboxgl/overlay/UniqueThemeLayerSpec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ window.mapboxgl = mapboxgl;
44

55
var baseUrl = GlobeParameter.jingjinMapURL + "/maps/京津地区地图",
66
dataUrl = GlobeParameter.editServiceURL_leaflet;
7-
describe('mapboxgl_testUniqueThemeLayer', function () {
7+
describe('mapboxgl_UniqueThemeLayer', function () {
88
var originalTimeout;
99
var testDiv, map;
1010
beforeAll(function () {
@@ -51,7 +51,7 @@ describe('mapboxgl_testUniqueThemeLayer', function () {
5151
map.remove();
5252
});
5353

54-
it('constructor, addFeatures, getShapesByFeatureID, getCacheCount, setMaxCacheCount, removeFeatures', function (done) {
54+
it('initialize, addFeatures, getShapesByFeatureID, getCacheCount, setMaxCacheCount, removeFeatures', function (done) {
5555
var themeLayer, result;
5656
var getFeatureBySQLParams = new SuperMap.GetFeaturesBySQLParameters({
5757
queryParameter: new SuperMap.FilterParameter({

‎test/mapboxgl/services/BufferAnalysisSpec.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ describe('mapboxgl_SpatialAnalystService_bufferAnalysis', function () {
1616
afterEach(function () {
1717
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1818
});
19+
1920
//缓冲区数据集分析 isAttributeRetained 默认为 true
20-
it('bufferAnalysis_isAttributeRetained_true_test', function (done) {
21+
it('bufferAnalysis_isAttributeRetained:true', function (done) {
2122
var bufferAnalystParameters = new SuperMap.DatasetBufferAnalystParameters({
2223
dataset: "Road_L@Jingjin",
2324
//设置数据集中几何对象的过滤条件。只有满足此条件的几何对象才参与缓冲区分析
@@ -57,15 +58,15 @@ describe('mapboxgl_SpatialAnalystService_bufferAnalysis', function () {
5758
expect(result.recordset.fields.length).toEqual(result.recordset.fieldCaptions.length);
5859
done();
5960
} catch (e) {
60-
console.log("'bufferAnalysis_isAttributeRetained_true_test'案例失败" + e.name + ":" + e.message);
61+
console.log("'bufferAnalysis_isAttributeRetained:true'案例失败" + e.name + ":" + e.message);
6162
expect(false).toBeTruthy();
6263
done();
6364
}
6465
}, 7000);
6566
});
6667

6768
//缓冲区数据集分析 isAttributeRetained 为 false
68-
it('bufferAnalysis_isAttributeRetained_false_test', function (done) {
69+
it('bufferAnalysis_isAttributeRetained:false', function (done) {
6970
var bufferAnalystParameters = new SuperMap.DatasetBufferAnalystParameters({
7071
dataset: "Road_L@Jingjin",
7172
//设置数据集中几何对象的过滤条件。只有满足此条件的几何对象才参与缓冲区分析
@@ -109,15 +110,15 @@ describe('mapboxgl_SpatialAnalystService_bufferAnalysis', function () {
109110
expect(result.recordset.fields.length).toEqual(result.recordset.fieldCaptions.length);
110111
done();
111112
} catch (e) {
112-
console.log("'bufferAnalysis_isAttributeRetained_false_test'案例失败" + e.name + ":" + e.message);
113+
console.log("'bufferAnalysis_isAttributeRetained:false'案例失败" + e.name + ":" + e.message);
113114
expect(false).toBeTruthy();
114115
done();
115116
}
116117
}, 5000);
117118
});
118119

119120
//缓冲区分析 几何对象缓冲区分析
120-
it('bufferAnalysis_geometry_test', function (done) {
121+
it('bufferAnalysis_byGeometry', function (done) {
121122
var pointList = [
122123
[116.1916654036, 39.8888542507],
123124
[116.2031567225, 39.8888542507],
@@ -168,7 +169,7 @@ describe('mapboxgl_SpatialAnalystService_bufferAnalysis', function () {
168169
}
169170
done();
170171
} catch (e) {
171-
console.log("'bufferAnalysis_geometry_test'案例失败" + e.name + ":" + e.message);
172+
console.log("'bufferAnalysis_byGeometry'案例失败" + e.name + ":" + e.message);
172173
expect(false).toBeTruthy();
173174
done();
174175
}

‎test/mapboxgl/services/DensityAnalysisSpec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
1717
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1818
});
1919

20-
//点密度分析,删除重复的数据集
21-
it('densityAnalysis_deleteExistResultDataset_true_test', function (done) {
20+
//点密度分析, 删除重复的数据集
21+
it('densityAnalysis_deleteExistResultDataset:true', function (done) {
2222
var densityKernelAnalystParameters = new SuperMap.DensityKernelAnalystParameters({
2323
dataset: "Railway@Changchun",
2424
//用于进行核密度分析的测量值的字段名称
@@ -40,15 +40,15 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
4040
expect(serviceResult.result.dataset).toEqual("KernelDensity_Result@Changchun");
4141
done();
4242
} catch (e) {
43-
console.log("'densityAnalysis_deleteExistResultDataset_true_test'案例失败" + e.name + ":" + e.message);
43+
console.log("'densityAnalysis_deleteExistResultDataset:true'案例失败" + e.name + ":" + e.message);
4444
expect(false).toBeTruthy();
4545
done();
4646
}
4747
}, 8000);
4848
});
4949

50-
//点密度分析,不删除重复的数据集（默认），此时创建一个重复的数据集，分析失败
51-
it('densityAnalysis_deleteExistResultDataset_false_test', function (done) {
50+
//点密度分析, 不删除重复的数据集(默认), 本测试的resultGridName需要是一个已经存在的数据集
51+
it('densityAnalysis_deleteExistResultDataset:false', function (done) {
5252
var densityKernelAnalystParameters = new SuperMap.DensityKernelAnalystParameters({
5353
dataset: "Railway@Changchun",
5454
//用于进行核密度分析的测量值的字段名称

‎test/mapboxgl/services/EditFeaturesSpec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var mapboxgl = require('mapbox-gl');
33

44
var url = GlobeParameter.dataServiceURL;
55
var id;
6-
var originFeature = null;
76
describe('mapboxgl_FeatureService_editFeatures', function () {
87
var serviceResult;
98
var originalTimeout;
@@ -15,8 +14,9 @@ describe('mapboxgl_FeatureService_editFeatures', function () {
1514
afterEach(function () {
1615
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1716
});
18-
//地物编辑服务 添加地物
19-
it('editFeatures_addFeature_test', function (done) {
17+
18+
//添加要素
19+
it('add', function (done) {
2020
var pointFeature = {
2121
"type": "Feature",
2222
"geometry": {
@@ -34,7 +34,7 @@ describe('mapboxgl_FeatureService_editFeatures', function () {
3434
dataSourceName: "World",
3535
dataSetName: "Capitals",
3636
editType: "add",
37-
returnContent: true,
37+
returnContent: true
3838
});
3939
var service = new mapboxgl.supermap.FeatureService(url);
4040
service.editFeatures(addFeatureParams, function (result) {
@@ -54,20 +54,20 @@ describe('mapboxgl_FeatureService_editFeatures', function () {
5454
expect(serviceResult.object.options.data).toContain("'y':15");
5555
done();
5656
} catch (e) {
57-
console.log("'editFeatures_addFeature_test'案例失败" + e.name + ":" + e.message);
57+
console.log("'editFeatures_addFeature'案例失败" + e.name + ":" + e.message);
5858
expect(false).toBeTruthy();
5959
done();
6060
}
6161
}, 5000)
6262
});
6363

64-
//地物编辑服务 删除地物
65-
it('editFeatures_deleteFeature_test', function (done) {
64+
//删除要素
65+
it('delete', function (done) {
6666
var deleteFeatureParams = new SuperMap.EditFeaturesParameters({
6767
dataSourceName: "World",
6868
dataSetName: "Capitals",
6969
IDs: [id],
70-
editType: "delete",
70+
editType: "delete"
7171
});
7272
var service = new mapboxgl.supermap.FeatureService(url);
7373
service.editFeatures(deleteFeatureParams, function (result) {
@@ -84,7 +84,7 @@ describe('mapboxgl_FeatureService_editFeatures', function () {
8484
expect(serviceResult.object.options.data).toContain(id);
8585
done();
8686
} catch (e) {
87-
console.log("'editFeatures_deleteFeature_test'案例失败" + e.name + ":" + e.message);
87+
console.log("'editFeatures_deleteFeature'案例失败" + e.name + ":" + e.message);
8888
expect(false).toBeTruthy();
8989
done();
9090
}

0 commit comments

Comments
 (0)