Skip to content

Commit 36c8611

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
fix UT.
1 parent a02916f commit 36c8611

File tree

11 files changed

+227
-289
lines changed

11 files changed

+227
-289
lines changed

‎test/classic/overlay/MapVLayerSpec.js‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,6 @@ describe('classic_MapVLayer', function () {
124124
expect(dataset._data.length).toEqual(1000);
125125
});
126126

127-
//删除数据 待开发修改
128-
xit('removeData', function (done) {
129-
var filter = function (data) {
130-
if (mapvLayer.dataSet._data.indexOf(data) === 2) {
131-
return true
132-
}
133-
return false;
134-
}
135-
mapvLayer.removeData(filter);
136-
setTimeout(function () {
137-
expect(mapvLayer.dataSet._data.length).toEqual(999);
138-
done();
139-
}, 5000);
140-
});
141-
142127
it('setData', function () {
143128
var data = [{
144129
geometry: {
@@ -175,6 +160,21 @@ describe('classic_MapVLayer', function () {
175160
expect(mapvLayer.maxHeight).toBeNull();
176161
});
177162

163+
//方法引用错误
164+
xit('removeData', function (done) {
165+
var filter = function (data) {
166+
if (mapvLayer.dataSet._data.indexOf(data) === 2) {
167+
return true
168+
}
169+
return false;
170+
}
171+
mapvLayer.removeData(filter);
172+
setTimeout(function () {
173+
expect(mapvLayer.dataSet._data.length).toEqual(999);
174+
done();
175+
}, 5000);
176+
});
177+
178178
xit('setMap', function () {
179179
mapvLayer.setMap(map);
180180
expect(mapvLayer).not.toBeNull();
@@ -192,7 +192,6 @@ describe('classic_MapVLayer', function () {
192192
expect(mapvLayer.maxExtent.top).toEqual(90);
193193
});
194194

195-
//开发bug，待确认
196195
xit('transferToMapLatLng', function () {
197196
var latlng = new SuperMap.LonLat(104, 34.7);
198197
mapvLayer.transferToMapLatLng(latlng);

‎test/common/iServer/BurstPipelineAnalystServiceSpec.js‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
require('../../../src/common/iServer/BurstPipelineAnalystService');
2+
require('../../../src/common/util/FetchRequest');
23

34
var serviceFailedEventArgsSystem = null,
45
serviceCompletedEventArgsSystem = null;
5-
var url = GlobeParameter.networkAnalystURL;
6+
var url = "http://supermap:8090/iserver/services/transportationanalyst-sample/rest/networkanalyst/RoadNet@Changchun";
67
var options = {
78
eventListeners: {
89
"processCompleted": analyzeCompleted,
@@ -21,6 +22,7 @@ function analyzeCompleted(analyseEventArgs) {
2122

2223
describe('BurstPipelineAnalystService', function () {
2324
var originalTimeout;
25+
var FetchRequest = SuperMap.FetchRequest;
2426
beforeEach(function () {
2527
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
2628
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
@@ -62,53 +64,43 @@ describe('BurstPipelineAnalystService', function () {
6264
expect(burstPipelineAnalystParams.isUncertainDirectionValid).toBeFalsy();
6365
});
6466

65-
//参数不存在
67+
//参数不存在, 直接返回
6668
it('processAsync_noParams', function (done) {
6769
var burstPipelineAnalystService = initBurstPipelineAnalystService();
6870
burstPipelineAnalystService.processAsync();
6971
setTimeout(function () {
70-
try {
71-
expect(serviceFailedEventArgsSystem).toBeNull();
72-
expect(serviceCompletedEventArgsSystem).toBeNull();
73-
burstPipelineAnalystService.destroy();
74-
done();
75-
} catch (exception) {
76-
expect(false).toBeTruthy();
77-
console.log("BurstPipelineAnalystService_" + exception.name + ":" + exception.message);
78-
burstPipelineAnalystService.destroy();
79-
done();
80-
}
81-
}, 4000);
72+
expect(serviceCompletedEventArgsSystem).toBeNull();
73+
expect(serviceFailedEventArgsSystem).toBeNull();
74+
burstPipelineAnalystService.destroy();
75+
done();
76+
}, 1000);
8277
});
8378

8479
//正确返回结果
85-
it('success:processAsync', function (done) {
80+
it('processAsync_success', function (done) {
8681
var burstPipelineAnalystService = initBurstPipelineAnalystService();
8782
var burstPipelineAnalystParams = new SuperMap.BurstPipelineAnalystParameters({
8883
sourceNodeIDs: [1, 2],
8984
edgeID: 3434,
9085
nodeID: null,
9186
isUncertainDirectionValid: true
9287
});
88+
spyOn(FetchRequest, 'commit').and.callFake(function () {
89+
var burstPipelineEscapedJson = "{\"normalNodes\":[],\"edges\":[1,2,3,4,5,6,7,8,9],\"criticalNodes\":[2]}";
90+
return Promise.resolve(new Response(burstPipelineEscapedJson));
91+
});
9392
burstPipelineAnalystService.processAsync(burstPipelineAnalystParams);
9493
setTimeout(function () {
95-
try {
96-
var analystResult = serviceCompletedEventArgsSystem.result;
97-
expect(analystResult).not.toBeNull();
98-
expect(analystResult.succeed).toBeTruthy();
99-
expect(analystResult.criticalNodes.length).toEqual(1);
100-
expect(analystResult.edges.length).toBeGreaterThan(0);
101-
expect(analystResult.normalNodes.length).toEqual(0);
102-
burstPipelineAnalystService.destroy();
103-
burstPipelineAnalystParams.destroy();
104-
done();
105-
} catch (exception) {
106-
expect(false).toBeTruthy();
107-
console.log("BurstPipelineAnalystService_" + exception.name + ":" + exception.message);
108-
burstPipelineAnalystService.destroy();
109-
burstPipelineAnalystParams.destroy();
110-
done();
111-
}
112-
}, 4000)
94+
var analystResult = serviceCompletedEventArgsSystem.result;
95+
expect(analystResult).not.toBeNull();
96+
expect(analystResult.succeed).toBeTruthy();
97+
expect(analystResult.criticalNodes.length).toEqual(1);
98+
expect(analystResult.criticalNodes[0]).toEqual(2);
99+
expect(analystResult.edges.length).toEqual(9);
100+
expect(analystResult.normalNodes.length).toEqual(0);
101+
burstPipelineAnalystService.destroy();
102+
burstPipelineAnalystParams.destroy();
103+
done();
104+
}, 1000)
113105
});
114106
});

‎test/common/iServer/GenerateSpatialDataServiceSpec.js‎

Lines changed: 45 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
require('../../../src/common/iServer/GenerateSpatialDataService');
22
var request = require('request');
3+
require('../../../src/common/util/FetchRequest');
34

45
var completedEventArgsSystem, failedEventArgsSystem;
5-
var url = GlobeParameter.spatialAnalystURL_Changchun;
6+
var url = "http://supermap:8090/iserver/services/spatialanalyst-changchun/restjsr/spatialanalyst";
67
var options = {
78
eventListeners: {
89
processCompleted: generateSpatialDataCompleted,
@@ -20,8 +21,9 @@ function generateSpatialDataFailed(failedEventArgs) {
2021
}
2122

2223

23-
describe('testGenerateSpatialDataService_processAsync', function () {
24+
describe('GenerateSpatialDataService', function () {
2425
var originalTimeout;
26+
var FetchRequest = SuperMap.FetchRequest;
2527
beforeEach(function () {
2628
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
2729
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
@@ -32,9 +34,9 @@ describe('testGenerateSpatialDataService_processAsync', function () {
3234
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3335
});
3436

35-
var resultDataset_Point_DATASET = "GenerateSpatial_Point_DS_Test";
3637
// 点事件表数据集动态分段, DATASET_ONLY
37-
it('PointEventTable_DATASET_ONLY', function (done) {
38+
it('processAsync_PointEventTable_DATASET_ONLY', function (done) {
39+
var resultDataset_Point_DATASET = "GenerateSpatial_Point_DS_Test";
3840
var dataRtnOption = new SuperMap.DataReturnOption({
3941
dataset: resultDataset_Point_DATASET,
4042
deleteExistResultDataset: true,
@@ -53,35 +55,33 @@ describe('testGenerateSpatialDataService_processAsync', function () {
5355
dataReturnOption: dataRtnOption
5456
});
5557
var generateSpatialDataService = initGenerateSpatialDataService();
58+
spyOn(FetchRequest, 'commit').and.callFake(function () {
59+
var escapedJson = "{\"succeed\":true,\"recordset\":null,\"message\":null,\"dataset\":\"GenerateSpatial_Point_DS_Test@Changchun\"}";
60+
return Promise.resolve(new Response(escapedJson));
61+
});
5662
generateSpatialDataService.processAsync(generateSpatialDataParameters);
5763
setTimeout(function () {
58-
try {
59-
expect(generateSpatialDataService).not.toBeNull();
60-
expect(completedEventArgsSystem.type).toBe("processCompleted");
61-
var generateSpatialDataResult = completedEventArgsSystem.result;
62-
expect(generateSpatialDataResult).not.toBeNull();
63-
expect(generateSpatialDataResult.succeed).toBeTruthy();
64-
expect(generateSpatialDataResult.recordset).toBeNull();
65-
expect(generateSpatialDataResult.dataset).toEqual(resultDataset_Point_DATASET + "@Changchun");
66-
generateSpatialDataService.destroy();
67-
expect(generateSpatialDataService.EVENT_TYPES).toBeNull();
68-
expect(generateSpatialDataService.events).toBeNull();
69-
expect(generateSpatialDataService.eventListeners).toBeNull();
70-
generateSpatialDataParameters.destroy();
71-
done();
72-
} catch (exception) {
73-
expect(false).toBeTruthy();
74-
console.log("GenerateSpatialDataService_" + exception.name + ":" + exception.message);
75-
generateSpatialDataService.destroy();
76-
generateSpatialDataParameters.destroy();
77-
done();
78-
}
79-
}, 5000)
64+
expect(generateSpatialDataService).not.toBeNull();
65+
expect(completedEventArgsSystem).not.toBeNull();
66+
expect(failedEventArgsSystem).toBeNull();
67+
expect(completedEventArgsSystem.type).toBe("processCompleted");
68+
var generateSpatialDataResult = completedEventArgsSystem.result;
69+
expect(generateSpatialDataResult).not.toBeNull();
70+
expect(generateSpatialDataResult.succeed).toBeTruthy();
71+
expect(generateSpatialDataResult.recordset).toBeNull();
72+
expect(generateSpatialDataResult.dataset).toBe(resultDataset_Point_DATASET + "@Changchun");
73+
generateSpatialDataService.destroy();
74+
expect(generateSpatialDataService.EVENT_TYPES).toBeNull();
75+
expect(generateSpatialDataService.events).toBeNull();
76+
expect(generateSpatialDataService.eventListeners).toBeNull();
77+
generateSpatialDataParameters.destroy();
78+
done();
79+
}, 1000)
8080
});
8181

82-
var resultDataset_Linear_DATASET = "GenerateSpatial_Linear_DS_Test";
8382
// 线事件表数据集动态分段, DATASET_ONLY
84-
it('LinearEventTable_DATASET_ONLY', function (done) {
83+
it('processAsync_LinearEventTable_DATASET_ONLY', function (done) {
84+
var resultDataset_Linear_DATASET = "GenerateSpatial_Linear_DS_Test";
8585
var generateSpatialDataService = initGenerateSpatialDataService();
8686
var dataRtnOption = new SuperMap.DataReturnOption({
8787
dataset: resultDataset_Linear_DATASET,
@@ -100,30 +100,25 @@ describe('testGenerateSpatialDataService_processAsync', function () {
100100
errorInfoField: "",
101101
dataReturnOption: dataRtnOption
102102
});
103+
spyOn(FetchRequest, 'commit').and.callFake(function () {
104+
var escapedJson = "{\"succeed\":true,\"recordset\":null,\"message\":null,\"dataset\":\"GenerateSpatial_Linear_DS_Test@Changchun\"}";
105+
return Promise.resolve(new Response(escapedJson));
106+
});
103107
generateSpatialDataService.processAsync(generateSpatialDataParameters);
104108
setTimeout(function () {
105-
try {
106-
expect(generateSpatialDataService).not.toBeNull();
107-
expect(completedEventArgsSystem.type).toBe("processCompleted");
108-
var generateSpatialDataResult = completedEventArgsSystem.result;
109-
expect(generateSpatialDataResult).not.toBeNull();
110-
//expect(generateSpatialDataResult.succeed).toBeTruthy();
111-
//expect(generateSpatialDataResult.recordset).toBeNull();
112-
//expect(generateSpatialDataResult.dataset).toEqual(resultDataset_Linear_DATASET + "@Changchun");
113-
generateSpatialDataService.destroy();
114-
expect(generateSpatialDataService.EVENT_TYPES).toBeNull();
115-
expect(generateSpatialDataService.events).toBeNull();
116-
expect(generateSpatialDataService.eventListeners).toBeNull();
117-
generateSpatialDataParameters.destroy();
118-
done();
119-
} catch (exception) {
120-
expect(false).toBeTruthy();
121-
console.log("GenerateSpatialDataService_" + exception.name + ":" + exception.message);
122-
generateSpatialDataService.destroy();
123-
generateSpatialDataParameters.destroy();
124-
done();
125-
}
126-
}, 5000)
109+
expect(generateSpatialDataService).not.toBeNull();
110+
expect(completedEventArgsSystem).not.toBeNull();
111+
expect(failedEventArgsSystem).toBeNull();
112+
expect(completedEventArgsSystem.type).toBe("processCompleted");
113+
var generateSpatialDataResult = completedEventArgsSystem.result;
114+
expect(generateSpatialDataResult).not.toBeNull();
115+
expect(generateSpatialDataResult.succeed).toBeTruthy();
116+
expect(generateSpatialDataResult.recordset).toBeNull();
117+
expect(generateSpatialDataResult.dataset).toEqual(resultDataset_Linear_DATASET + "@Changchun");
118+
generateSpatialDataParameters.destroy();
119+
generateSpatialDataService.destroy();
120+
done();
121+
}, 1000)
127122
});
128123

129124
// 点事件表数据集动态分段,并设置期望返回记录数2。生成的随机名称数据集暂时无法删除, 因此先注释掉
@@ -306,14 +301,5 @@ describe('testGenerateSpatialDataService_processAsync', function () {
306301
// }
307302
// }, 2000)
308303
//});
309-
310-
// 删除测试过程中产生的测试数据集
311-
it('delete test resources', function (done) {
312-
var testResult_Point = GlobeParameter.datachangchunURL + resultDataset_Point_DATASET;
313-
var testResult_Linear = GlobeParameter.datachangchunURL + resultDataset_Linear_DATASET;
314-
request.delete(testResult_Point);
315-
request.delete(testResult_Linear);
316-
done();
317-
});
318304
});
319305

0 commit comments

Comments
 (0)