Skip to content

Commit 3e4c6b6

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
删除空间分析服务测试中产生的数据集
1 parent b18c13f commit 3e4c6b6

14 files changed

+142
-42
lines changed

‎test/common/iServer/BufferAnalystServiceSpec.js‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ var url = GlobeParameter.spatialAnalystURL;
77
var options = {
88
eventListeners: {"processCompleted": analyzeCompleted, 'processFailed': analyzeFailed}
99
};
10-
1110
function initBufferAnalystService() {
1211
return new SuperMap.BufferAnalystService(url, options);
1312
}
14-
1513
function analyzeFailed(serviceFailedEventArgs) {
1614
serviceFailedEventArgsSystem = serviceFailedEventArgs;
1715
}
18-
1916
function analyzeCompleted(analyseEventArgs) {
2017
analystEventArgsSystem = analyseEventArgs;
2118
}
@@ -32,12 +29,13 @@ describe('BufferAnalystService', function () {
3229
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3330
});
3431

32+
var resultDataset = "BufferAnalystByDS_commonTest";
3533
//测试成功事件
3634
it('success:BufferAnalystService_byDatasets', function (done) {
3735
var bfServiceByDatasets = initBufferAnalystService();
3836
var resultSetting = new SuperMap.DataReturnOption({
3937
expectCount: 2000,
40-
dataset: "bufferAnalystByDS_commonTest",
38+
dataset: resultDataset,
4139
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
4240
deleteExistResultDataset: true
4341
});
@@ -142,10 +140,8 @@ describe('BufferAnalystService', function () {
142140

143141
// 删除测试过程中产生的测试数据集
144142
it('delete test resources', function (done) {
145-
var bufferbyDSResult = GlobeParameter.datajingjinURL + "bufferAnalystByDS_commonTest";
146-
request.delete(bufferbyDSResult, function (response) {
147-
console.log(response);
148-
});
143+
var testResult = GlobeParameter.datajingjinURL + resultDataset;
144+
request.delete(testResult);
149145
done();
150146
});
151147
});

‎test/common/iServer/MathExpressionAnalysisServiceSpec.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ describe('MathExpressionAnalysisService', function () {
3030
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3131
});
3232

33+
var resultDataset = "MathExpression_commonTest";
3334
//通过的情况
3435
it('pass:processAsync', function (done) {
3536
var mathExpressionAnalysisService = initMathExpressionAnalysisService();
@@ -39,7 +40,7 @@ describe('MathExpressionAnalysisService', function () {
3940
dataset: "JingjinTerrain@Jingjin",
4041
expression: "[Jingjin.JingjinTerrain] + 600",
4142
targetDatasource: "Jingjin",
42-
resultGridName: "MathExpressionAnalysis_commonTest",
43+
resultGridName: resultDataset,
4344
deleteExistResultDataset: true
4445
});
4546
mathExpressionAnalysisService.processAsync(mathExpressionAnalysisParameters);
@@ -72,7 +73,7 @@ describe('MathExpressionAnalysisService', function () {
7273
dataset: "XX@Jingjin",
7374
expression: "[Jingjin.JingjinTerrain] + 600",
7475
targetDatasource: "XX",
75-
resultGridName: "MathExpressionAnalysisFail_commonTest",
76+
resultGridName: "MathExpressionFail_commonTest",
7677
deleteExistResultDataset: true
7778
});
7879
mathExpressionAnalysisService.processAsync(mathExpressionAnalysisParameters);
@@ -97,10 +98,8 @@ describe('MathExpressionAnalysisService', function () {
9798

9899
// 删除测试过程中产生的测试数据集
99100
it('delete test resources', function (done) {
100-
var mathExpressionResult = GlobeParameter.datajingjinURL + "MathExpressionAnalysis_commonTest";
101-
request.delete(mathExpressionResult, function (response) {
102-
console.log(response);
103-
});
101+
var testResult = GlobeParameter.datajingjinURL + resultDataset;
102+
request.delete(testResult);
104103
done();
105104
});
106105
});

‎test/common/iServer/TerrainCurvatureCalculationServiceSpec.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
require('../../../src/common/iServer/TerrainCurvatureCalculationService');
2+
var request = require('request');
23

34
var serviceFailedEventArgsSystem = null;
45
var analystEventArgsSystem = null;
5-
66
var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
77
var options = {
88
eventListeners: {
@@ -30,6 +30,7 @@ describe('TerrainCurvatureCalculationService', function () {
3030
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3131
});
3232

33+
var resultDataset = "TerrainCurvature_commonTest";
3334
//成功事件
3435
it('success:processAsync', function (done) {
3536
var terrainCurvatureCalculationService = initTerrainCurvatureCalculationService();
@@ -38,18 +39,17 @@ describe('TerrainCurvatureCalculationService', function () {
3839
var terrainCurvatureCalculationParameters = new SuperMap.TerrainCurvatureCalculationParameters({
3940
dataset: "JingjinTerrain@Jingjin",
4041
zFactor: 1.0,
41-
averageCurvatureName: "TerrainCurvature_commonTest",
42+
averageCurvatureName: resultDataset,
4243
deleteExistResultDataset: true
4344
});
4445
terrainCurvatureCalculationService.processAsync(terrainCurvatureCalculationParameters);
4546
terrainCurvatureCalculationService.events.on({"processCompleted": TerrainCurvatureCalculationServiceCompleted});
46-
4747
setTimeout(function () {
4848
try {
4949
var terrainCurvatureCalculationResult = analystEventArgsSystem.result;
5050
expect(terrainCurvatureCalculationResult).not.toBeNull();
5151
expect(terrainCurvatureCalculationResult.succeed).toBeTruthy();
52-
expect(terrainCurvatureCalculationResult.averageCurvatureResult.dataset).toBe("TerrainCurvature_commonTest@Jingjin");
52+
expect(terrainCurvatureCalculationResult.averageCurvatureResult.dataset).toBe(resultDataset + "@Jingjin");
5353
terrainCurvatureCalculationService.destroy();
5454
expect(terrainCurvatureCalculationService.events).toBeNull();
5555
expect(terrainCurvatureCalculationService.eventListeners).toBeNull();
@@ -66,7 +66,7 @@ describe('TerrainCurvatureCalculationService', function () {
6666
});
6767

6868
//测试失败事件
69-
xit('fail:processAsync', function (done) {
69+
it('fail:processAsync', function (done) {
7070
var terrainCurvatureCalculationService = initTerrainCurvatureCalculationService();
7171
var terrainCurvatureCalculationParameters = new SuperMap.TerrainCurvatureCalculationParameters({
7272
dataset: "XX@Jingjin",
@@ -76,7 +76,6 @@ describe('TerrainCurvatureCalculationService', function () {
7676
});
7777
terrainCurvatureCalculationService.processAsync(terrainCurvatureCalculationParameters);
7878
terrainCurvatureCalculationService.events.on({'processFailed': TerrainCurvatureCalculationServiceFailed});
79-
8079
setTimeout(function () {
8180
try {
8281
expect(serviceFailedEventArgsSystem).not.toBeNull();
@@ -98,6 +97,13 @@ describe('TerrainCurvatureCalculationService', function () {
9897
}
9998
}, 10000);
10099
});
100+
101+
// 删除测试过程中产生的测试数据集
102+
it('delete test resources', function (done) {
103+
var testResult = GlobeParameter.datajingjinURL + resultDataset;
104+
request.delete(testResult);
105+
done();
106+
});
101107
});
102108

103109

‎test/leaflet/services/DensityAnalysisSpec.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require('../../../src/leaflet/services/spatialAnalystService');
2+
var request = require('request');
23

34
var spatialAnalystURL = GlobeParameter.spatialAnalystURL_Changchun;
45
var options = {
@@ -17,6 +18,7 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', function () {
1718
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1819
});
1920

21+
var resultDataset = "KernelDensity_leafletTest";
2022
//点密度分析
2123
it('densityAnalysis', function (done) {
2224
var densityAnalystParameters = new SuperMap.DensityKernelAnalystParameters({
@@ -28,7 +30,7 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', function () {
2830
fieldName: "SmLength",
2931
searchRadius: 50, //Railway@Changchun的单位是米
3032
// 结果数据集名称
31-
resultGridName: "KernelDensity_leafletTest",
33+
resultGridName: resultDataset,
3234
deleteExistResultDataset: true
3335
});
3436
var densityAnalystService = L.supermap.spatialAnalystService(spatialAnalystURL, options);
@@ -42,7 +44,7 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', function () {
4244
expect(serviceResult.type).toBe("processCompleted");
4345
var result = serviceResult.result;
4446
expect(result).not.toBeNull();
45-
expect(result.dataset).toEqual("KernelDensity_leafletTest@Changchun");
47+
expect(result.dataset).toEqual(resultDataset + "@Changchun");
4648
expect(result.succeed).toBe(true);
4749
densityAnalystService.destroy();
4850
done();
@@ -54,4 +56,11 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', function () {
5456
}
5557
}, 5000);
5658
});
59+
60+
// 删除测试过程中产生的测试数据集
61+
it('delete test resources', function (done) {
62+
var testResult = GlobeParameter.datachangchunURL + resultDataset;
63+
request.delete(testResult);
64+
done();
65+
});
5766
});

‎test/leaflet/services/GenerateSpatialDataSpec.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require('../../../src/leaflet/services/spatialAnalystService');
2+
var request = require('request');
23

34
var spatialAnalystURL = GlobeParameter.spatialAnalystURL_Changchun;
45
var options = {
@@ -16,6 +17,7 @@ describe('leaflet_SpatialAnalystService_generateSpatialData', function () {
1617
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1718
});
1819

20+
var resultDataset = "GenerateSpatialData_leafletTest";
1921
it('generateSpatialData', function (done) {
2022
var generateSpatialDataParameters = new SuperMap.GenerateSpatialDataParameters({
2123
routeTable: "RouteDT_road@Changchun",
@@ -29,7 +31,7 @@ describe('leaflet_SpatialAnalystService_generateSpatialData', function () {
2931
errorInfoField: "",
3032
dataReturnOption: new SuperMap.DataReturnOption({
3133
expectCount: 1000,
32-
dataset: "generateSpatialData_leafletTest",
34+
dataset: resultDataset,
3335
deleteExistResultDataset: true,
3436
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY
3537
})
@@ -47,7 +49,7 @@ describe('leaflet_SpatialAnalystService_generateSpatialData', function () {
4749
expect(serviceResult.type).toEqual("processCompleted");
4850
expect(serviceResult.result).not.toBeNull();
4951
expect(serviceResult.result.succeed).toBe(true);
50-
expect(serviceResult.result.dataset).toEqual("generateSpatialData_leafletTest@Changchun");
52+
expect(serviceResult.result.dataset).toEqual(resultDataset + "@Changchun");
5153
generateSpatialDataService.destroy();
5254
done();
5355
} catch (exception) {
@@ -58,4 +60,11 @@ describe('leaflet_SpatialAnalystService_generateSpatialData', function () {
5860
}
5961
}, 5000);
6062
});
63+
64+
// 删除测试过程中产生的测试数据集
65+
it('delete test resources', function (done) {
66+
var testResult = GlobeParameter.datachangchunURL + resultDataset;
67+
request.delete(testResult);
68+
done();
69+
});
6170
});

‎test/leaflet/services/TerrainCurvatureCalculateSpec.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require('../../../src/leaflet/services/SpatialAnalystService');
2+
var request = require('request');
23

34
var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
45
var options = {
@@ -16,11 +17,12 @@ describe('leaflet_SpatialAnalystService_terrainCurvatureCalculate', function ()
1617
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1718
});
1819

20+
var resultDataset = "TerrainCurvature_leafletTest";
1921
it('terrainCurvatureCalculate', function (done) {
2022
var terrainCurvatureCalculationParameters = new SuperMap.TerrainCurvatureCalculationParameters({
2123
dataset: "JingjinTerrain@Jingjin",
2224
zFactor: 1.0,
23-
averageCurvatureName: "terrainCurvature_leafletTest",
25+
averageCurvatureName: resultDataset,
2426
deleteExistResultDataset: true
2527
});
2628
var terrainCurvatureCalculationService = L.supermap.spatialAnalystService(spatialAnalystURL, options);
@@ -33,7 +35,7 @@ describe('leaflet_SpatialAnalystService_terrainCurvatureCalculate', function ()
3335
expect(serviceResult.type).toEqual("processCompleted");
3436
expect(serviceResult.result).not.toBeNull();
3537
expect(serviceResult.result.succeed).toBe(true);
36-
expect(serviceResult.result.averageCurvatureResult.dataset).toEqual("terrainCurvature_leafletTest@Jingjin");
38+
expect(serviceResult.result.averageCurvatureResult.dataset).toEqual(resultDataset + "@Jingjin");
3739
expect(serviceResult.result.averageCurvatureResult.succeed).toBe(true);
3840
terrainCurvatureCalculationService.destroy();
3941
done();
@@ -45,4 +47,11 @@ describe('leaflet_SpatialAnalystService_terrainCurvatureCalculate', function ()
4547
}
4648
});
4749
});
50+
51+
// 删除测试过程中产生的测试数据集
52+
it('delete test resources', function (done) {
53+
var testResult = GlobeParameter.datajingjinURL + resultDataset;
54+
request.delete(testResult);
55+
done();
56+
});
4857
});

‎test/mapboxgl/services/DensityAnalysisSpec.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require('../../../src/mapboxgl/services/SpatialAnalystService');
22
var mapboxgl = require('mapbox-gl');
3+
var request = require('request');
34

45
var url = GlobeParameter.spatialAnalystURL_Changchun;
56
var options = {
@@ -17,13 +18,14 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
1718
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1819
});
1920

21+
var resultDataset = "KernelDensity_mapboxglTest";
2022
//点密度分析, 删除重复的数据集
2123
it('densityAnalysis_deleteExistResultDataset:true', function (done) {
2224
var densityKernelAnalystParameters = new SuperMap.DensityKernelAnalystParameters({
2325
dataset: "Railway@Changchun",
2426
//用于进行核密度分析的测量值的字段名称
2527
fieldName: "SmLength",
26-
resultGridName: "KernelDensity_Result",
28+
resultGridName: resultDataset,
2729
//删除重复的数据集
2830
deleteExistResultDataset: true
2931
});
@@ -37,7 +39,7 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
3739
expect(serviceResult).not.toBeNull();
3840
expect(serviceResult.type).toBe("processCompleted");
3941
expect(serviceResult.result.succeed).toBe(true);
40-
expect(serviceResult.result.dataset).toEqual("KernelDensity_Result@Changchun");
42+
expect(serviceResult.result.dataset).toEqual(resultDataset + "@Changchun");
4143
done();
4244
} catch (e) {
4345
console.log("'densityAnalysis_deleteExistResultDataset:true'案例失败" + e.name + ":" + e.message);
@@ -53,7 +55,7 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
5355
dataset: "Railway@Changchun",
5456
//用于进行核密度分析的测量值的字段名称
5557
fieldName: "SmLength",
56-
resultGridName: "KernelDensity_Result",
58+
resultGridName: resultDataset,
5759
//不删除重复的数据集
5860
deleteExistResultDataset: false
5961
});
@@ -67,7 +69,7 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
6769
expect(serviceResult).not.toBeNull();
6870
expect(serviceResult.type).toBe("processFailed");
6971
expect(serviceResult.error.code).toEqual(400);
70-
expect(serviceResult.error.errorMsg).toEqual("数据集KernelDensity_Result@Changchun已存在。");
72+
expect(serviceResult.error.errorMsg).toEqual("数据集" + resultDataset + "@Changchun已存在。");
7173
done();
7274
} catch (e) {
7375
console.log("'densityAnalysis_deleteExistResultDataset_false_test'案例失败" + e.name + ":" + e.message);
@@ -76,4 +78,11 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', function () {
7678
}
7779
}, 5000);
7880
});
81+
82+
// 删除测试过程中产生的测试数据集
83+
it('delete test resources', function (done) {
84+
var testResult = GlobeParameter.datachangchunURL + resultDataset;
85+
request.delete(testResult);
86+
done();
87+
});
7988
});

‎test/mapboxgl/services/GenerateSpatialDataSpec.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
require('../../../src/mapboxgl/services/SpatialAnalystService');
22
var mapboxgl = require('mapbox-gl');
3+
var request = require('request');
34

45
var url = GlobeParameter.spatialAnalystURL_Changchun;
56
var options = {
@@ -17,6 +18,7 @@ describe('mapboxgl_SpatialAnalystService_generateSpatialData', function () {
1718
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1819
});
1920

21+
var resultDataset = "GenerateSpatialData_mapboxglTest";
2022
//动态分段分析
2123
it('generateSpatialData', function (done) {
2224
var generateSpatialDataParameters = new SuperMap.GenerateSpatialDataParameters({
@@ -32,7 +34,7 @@ describe('mapboxgl_SpatialAnalystService_generateSpatialData', function () {
3234
errorInfoField: "",
3335
dataReturnOption: new SuperMap.DataReturnOption({
3436
expectCount: 1000,
35-
dataset: "generateSpatialData@Changchun",
37+
dataset: resultDataset,
3638
deleteExistResultDataset: true,
3739
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY
3840
})
@@ -46,7 +48,7 @@ describe('mapboxgl_SpatialAnalystService_generateSpatialData', function () {
4648
expect(service).not.toBeNull();
4749
expect(serviceResult).not.toBeNull();
4850
expect(serviceResult.type).toBe("processCompleted");
49-
expect(serviceResult.result.dataset).toEqual("generateSpatialData@Changchun");
51+
expect(serviceResult.result.dataset).toEqual(resultDataset + "@Changchun");
5052
done();
5153
} catch (e) {
5254
console.log("'generateSpatialData'案例失败" + e.name + ":" + e.message);
@@ -55,4 +57,11 @@ describe('mapboxgl_SpatialAnalystService_generateSpatialData', function () {
5557
}
5658
}, 5000);
5759
});
60+
61+
// 删除测试过程中产生的测试数据集
62+
it('delete test resources', function (done) {
63+
var testResult = GlobeParameter.datachangchunURL + resultDataset;
64+
request.delete(testResult);
65+
done();
66+
});
5867
});

0 commit comments

Comments
 (0)