Skip to content

Commit 84a9a14

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
删除插值分析测试中产生的数据集
1 parent ffaad41 commit 84a9a14

File tree

4 files changed

+49
-11
lines changed

4 files changed

+49
-11
lines changed

‎test/leaflet/services/InterpolationAnalysisSpec.js‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
require('../../../src/leaflet/services/spatialAnalystService');
2+
var request = require('request');
3+
24
var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
35
var options = {
46
serverType: 'iServer'
@@ -15,12 +17,13 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
1517
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1618
});
1719

18-
it('interpolationAnalysis', function (done) {
20+
var resultDataset = "Interpolation_UnvsKriging_lfTest";
21+
it('interpolationAnalysis_Kriging_Universal', function (done) {
1922
var interpolationAnalystParameters = new SuperMap.InterpolationKrigingAnalystParameters({
2023
// 用于做插值分析的数据源中数据集的名称
2124
dataset: "SamplesP@Interpolation",
2225
// 插值分析结果数据集的名称
23-
outputDatasetName: "UniversalKriging_leafletTest",
26+
outputDatasetName: resultDataset,
2427
// 插值分析结果数据源的名称
2528
outputDatasourceName: "Interpolation",
2629
// 结果栅格数据集存储的像素格式
@@ -55,16 +58,23 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
5558
expect(serviceResult).not.toBeNull();
5659
expect(serviceResult.type).toEqual("processCompleted");
5760
expect(serviceResult.result).not.toBeNull();
58-
expect(serviceResult.result.dataset).toContain("UniversalKriging_leafletTest");
61+
expect(serviceResult.result.dataset).toEqual(resultDataset + "@Interpolation");
5962
expect(serviceResult.result.succeed).toBe(true);
6063
interpolationAnalystService.destroy();
6164
done();
6265
} catch (exception) {
63-
console.log("'leaflet_interpolationAnalystService'案例失败" + exception.name + ":" + exception.message);
66+
console.log("'leaflet_interpolationAnalystService_Kriging_Universal'案例失败" + exception.name + ":" + exception.message);
6467
interpolationAnalystService.destroy();
6568
expect(false).toBeTruthy();
6669
done();
6770
}
6871
});
6972
});
73+
74+
// 删除测试过程中产生的测试数据集
75+
it('delete test resources', function (done) {
76+
var testResult = GlobeParameter.dataspatialAnalystURL+ resultDataset;
77+
request.delete(testResult);
78+
done();
79+
});
7080
});

‎test/mapboxgl/services/InterpolationAnalysisSpec.js‎

Lines changed: 16 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;
56
var options = {
@@ -17,12 +18,13 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
1718
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1819
});
1920

21+
var resultDataset_density = "Interpolation_density_mapboxglTest";
2022
//插值分析 点密度插值分析
2123
it('interpolationAnalysis_density', function (done) {
2224
var interpolationAnalystParameters = new SuperMap.InterpolationDensityAnalystParameters({
2325
dataset: "SamplesP@Interpolation",
2426
//插值分析结果数据集的名称
25-
outputDatasetName: "Density_Result",
27+
outputDatasetName: resultDataset_density,
2628
//插值分析结果数据源的名称
2729
outputDatasourceName: "Interpolation",
2830
//结果栅格数据集存储的像素格式
@@ -44,7 +46,7 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
4446
expect(serviceResult).not.toBeNull();
4547
expect(serviceResult.type).toBe("processCompleted");
4648
expect(serviceResult.result.succeed).toEqual(true);
47-
expect(serviceResult.result.dataset).toContain("Density_Result");
49+
expect(serviceResult.result.dataset).toEqual(resultDataset_density + "@Interpolation");
4850
expect(serviceResult.object.mode).toEqual("Density");
4951
done();
5052
} catch (e) {
@@ -55,13 +57,14 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
5557
}, 25000);
5658
});
5759

60+
var resultDataset_IDW_dataset = "Interpolation_IDW_dataset_mapboxglTest";
5861
//插值分析 反距离加权插值分析
5962
it('interpolationAnalysis_IDW_dataset', function (done) {
6063
var interpolationAnalystParameters = new SuperMap.InterpolationIDWAnalystParameters({
6164
//用于做插值分析的数据源中数据集的名称
6265
dataset: "SamplesP@Interpolation",
6366
//插值分析结果数据集的名称
64-
outputDatasetName: "IDW_result",
67+
outputDatasetName: resultDataset_IDW_dataset,
6568
//插值分析结果数据源的名称
6669
outputDatasourceName: "Interpolation",
6770
//结果栅格数据集存储的像素格式
@@ -84,7 +87,7 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
8487
expect(serviceResult).not.toBeNull();
8588
expect(serviceResult.type).toBe("processCompleted");
8689
expect(serviceResult.result.succeed).toEqual(true);
87-
expect(serviceResult.result.dataset).toContain("IDW_result");
90+
expect(serviceResult.result.dataset).toEqual(resultDataset_IDW_dataset + "@Interpolation");
8891
expect(serviceResult.object.mode).toEqual("IDW");
8992
done();
9093
} catch (e) {
@@ -94,4 +97,13 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
9497
}
9598
}, 25000);
9699
});
100+
101+
// 删除测试过程中产生的测试数据集
102+
it('delete test resources', function (done) {
103+
var testResult_density = GlobeParameter.dataspatialAnalystURL + resultDataset_density;
104+
var testResult_IDW_dataset = GlobeParameter.dataspatialAnalystURL + resultDataset_IDW_dataset;
105+
request.delete(testResult_density);
106+
request.delete(testResult_IDW_dataset);
107+
done();
108+
});
97109
});

‎test/openlayers/services/InterpolationAnalysisSpec.js‎

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

34
var originalTimeout, serviceResults;
45
var sampleServiceUrl = GlobeParameter.spatialAnalystURL;
@@ -12,12 +13,13 @@ describe('openlayers_SpatialAnalystService_interpolationAnalysis', function () {
1213
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
1314
});
1415

16+
var resultDataset_density = "Interpolation_density_olTest";
1517
//点密度插值分析
1618
it('interpolationAnalysis_density', function (done) {
1719
var interpolationAnalystParameters = new SuperMap.InterpolationDensityAnalystParameters({
1820
dataset: "SamplesP@Interpolation",
1921
//插值分析结果数据集的名称
20-
outputDatasetName: "Density_Result",
22+
outputDatasetName: resultDataset_density,
2123
//插值分析结果数据源的名称
2224
outputDatasourceName: "Interpolation",
2325
//结果栅格数据集存储的像素格式
@@ -39,13 +41,14 @@ describe('openlayers_SpatialAnalystService_interpolationAnalysis', function () {
3941
});
4042
});
4143

44+
var resultDataset_IDW_dataset = "Interpolation_IDW_dataset_olTest";
4245
//反距离加权插值分析
4346
it('interpolationAnalysis_IDW_dataset', function (done) {
4447
var interpolationAnalystParameters = new SuperMap.InterpolationIDWAnalystParameters({
4548
//用于做插值分析的数据源中数据集的名称
4649
dataset: "SamplesP@Interpolation",
4750
//插值分析结果数据集的名称
48-
outputDatasetName: "IDW_result",
51+
outputDatasetName: resultDataset_IDW_dataset,
4952
//插值分析结果数据源的名称
5053
outputDatasourceName: "Interpolation",
5154
//结果栅格数据集存储的像素格式
@@ -68,6 +71,7 @@ describe('openlayers_SpatialAnalystService_interpolationAnalysis', function () {
6871
});
6972
});
7073

74+
var resultDataset_IDW_geometry = "Interpolation_IDW_geometry_olTest";
7175
//离散点插值分析
7276
it('interpolationAnalysis_IDW_geometry', function (done) {
7377
var baseurl = GlobeParameter.mapTemperatureURL + "全国温度变化图";
@@ -104,7 +108,7 @@ describe('openlayers_SpatialAnalystService_interpolationAnalysis', function () {
104108
// 插值分析类型,geometry类型表示对离散点插值分析,默认为“dataset”
105109
InterpolationAnalystType: "geometry",
106110
// 插值分析结果数据集的名称
107-
outputDatasetName: "IDWcretePoints_result",
111+
outputDatasetName: resultDataset_IDW_geometry,
108112
// 插值分析结果数据源的名称
109113
outputDatasourceName: "Interpolation",
110114
// 结果栅格数据集存储的像素格式
@@ -126,4 +130,15 @@ describe('openlayers_SpatialAnalystService_interpolationAnalysis', function () {
126130
});
127131
});
128132
});
133+
134+
// 删除测试过程中产生的测试数据集
135+
it('delete test resources', function (done) {
136+
var testResult_density = GlobeParameter.dataspatialAnalystURL + resultDataset_density;
137+
var testResult_IDW_dataset = GlobeParameter.dataspatialAnalystURL + resultDataset_IDW_dataset;
138+
var testResult_IDW_geometry = GlobeParameter.dataspatialAnalystURL + resultDataset_IDW_geometry;
139+
request.delete(testResult_density);
140+
request.delete(testResult_IDW_dataset);
141+
request.delete(testResult_IDW_geometry);
142+
done();
143+
});
129144
});

‎test/tool/GlobeParameter.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
dataServiceURL: "http://localhost:8090/iserver/services/data-world/rest/data",
1010
datajingjinURL:"http://localhost:8090/iserver/services/data-jingjin/rest/data/datasources/Jingjin/datasets/",
1111
datachangchunURL:"http://localhost:8090/iserver/services/data-changchun/rest/data/datasources/Changchun/datasets/",
12+
dataspatialAnalystURL:"http://localhost:8090/iserver/services/data-spatialAnalyst/rest/data/datasources/Interpolation/datasets/",
1213
editServiceURL: "http://localhost:8090/iserver/services/data-jingjin/rest/data/datasources/Jingjin/datasets/Landuse_R",
1314
editServiceURL_LINE: "http://localhost:8090/iserver/services/data-jingjin/rest/data/datasources/Jingjin/datasets/Geomor_L",
1415
editServiceURL_POINT: "http://localhost:8090/iserver/services/data-jingjin/rest/data/datasources/Jingjin/datasets/Neighbor_P",

0 commit comments

Comments
 (0)