Skip to content

Commit c6215ff

Browse files
committed
优化和密度分析测试案例,将真实请求服务改为mork review by sunxiaoyu
1 parent 0823f10 commit c6215ff

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

test/leaflet/services/DensityAnalysisSpec.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {spatialAnalystService} from '../../../src/leaflet/services/SpatialAnalystService';
22
import {DensityKernelAnalystParameters} from '../../../src/common/iServer/DensityKernelAnalystParameters';
33
import request from 'request';
4+
import {FetchRequest} from "@supermap/iclient-common";
45

56
var spatialAnalystURL = GlobeParameter.spatialAnalystURL_Changchun;
67
var options = {
@@ -35,18 +36,22 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', () => {
3536
deleteExistResultDataset: true
3637
});
3738
var densityAnalystService = spatialAnalystService(spatialAnalystURL, options);
38-
densityAnalystService.densityAnalysis(densityAnalystParameters, (densityServiceResult) => {
39-
serviceResult = densityServiceResult;
39+
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
40+
expect(method).toBe("POST");
41+
expect(testUrl).toBe(spatialAnalystURL + "/datasets/Railway@Changchun/densityanalyst/kernel.json?returnContent=true");
42+
var expectParams = `{'bounds':{'left':3800,'bottom':-3800,'right':8200,'top':-2200,'centerLonLat':null},'fieldName':"SmLength",'resultGridDatasetResolution':null,'searchRadius':50,'targetDatasource':null,'resultGridName':"KernelDensity_leafletTest",'deleteExistResultDataset':true}`;
43+
expect(params).toBe(expectParams);
44+
expect(options).not.toBeNull();
45+
return Promise.resolve(new Response(expectParams));
46+
});
47+
densityAnalystService.densityAnalysis(densityAnalystParameters, (result) => {
48+
serviceResult = result;
4049
});
4150
setTimeout(() => {
4251
try {
43-
expect(densityAnalystService).not.toBeNull();
4452
expect(serviceResult).not.toBeNull();
45-
expect(serviceResult.type).toBe("processCompleted");
46-
var result = serviceResult.result;
47-
expect(result).not.toBeNull();
48-
expect(result.dataset).toEqual(resultDataset + "@Changchun");
49-
expect(result.succeed).toBe(true);
53+
expect(serviceResult.type).toBe('processCompleted');
54+
expect(serviceResult.result.succeed).toBeTruthy();
5055
densityAnalystService.destroy();
5156
done();
5257
} catch (exception) {
@@ -58,10 +63,4 @@ describe('leaflet_SpatialAnalystService_densityAnalysis', () => {
5863
}, 5000);
5964
});
6065

61-
// 删除测试过程中产生的测试数据集
62-
it('delete test resources', (done) => {
63-
var testResult = GlobeParameter.datachangchunURL + resultDataset;
64-
request.delete(testResult);
65-
done();
66-
});
6766
});

0 commit comments

Comments
 (0)