Skip to content

Commit 26fdee8

Browse files
jiangyan1018jiangyan1018
committed
补充UT。review by chenmy
1 parent 6c91a5e commit 26fdee8

15 files changed

+1801
-102
lines changed

‎test/common/iServer/BufferAnalystServiceSpec.js‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ var url = GlobeParameter.spatialAnalystURL;
77
var options = {
88
eventListeners: {"processCompleted": analyzeCompleted, 'processFailed': analyzeFailed}
99
};
10+
1011
function initBufferAnalystService() {
1112
return new SuperMap.BufferAnalystService(url, options);
1213
}
14+
1315
function analyzeFailed(serviceFailedEventArgs) {
1416
serviceFailedEventArgsSystem = serviceFailedEventArgs;
1517
}
18+
1619
function analyzeCompleted(analyseEventArgs) {
1720
analystEventArgsSystem = analyseEventArgs;
1821
}
1922

20-
describe('testBufferAnalystService', function () {
23+
describe('BufferAnalystService', function () {
2124
var originalTimeout;
2225
beforeEach(function () {
2326
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -63,10 +66,9 @@ describe('testBufferAnalystService', function () {
6366
dsBufferAnalystParameters.destroy();
6467
done();
6568
}
66-
}, 4000)
69+
}, 5000)
6770
});
6871

69-
7072
it('success:BufferAnalystService_byGeometry', function (done) {
7173
var bfServiceByGeometry = initBufferAnalystService();
7274
expect(bfServiceByGeometry).not.toBeNull();
@@ -76,16 +78,9 @@ describe('testBufferAnalystService', function () {
7678
bufferSetting.endType = SuperMap.BufferEndType.ROUND;
7779
bufferSetting.leftDistance.value = 300;
7880
bufferSetting.semicircleLineSegment = 5;
79-
var resultSetting = new SuperMap.DataReturnOption({
80-
expectCount: 2000,
81-
dataset: "bufferAnalystByGM_commonTest",
82-
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
83-
deleteExistResultDataset: false
84-
});
8581
var geometryBufferAnalystParameters = new SuperMap.GeometryBufferAnalystParameters();
8682
geometryBufferAnalystParameters.sourceGeometry = sourceGeometry;
8783
geometryBufferAnalystParameters.bufferSetting = bufferSetting;
88-
geometryBufferAnalystParameters.resultSetting = resultSetting;
8984
bfServiceByGeometry.processAsync(geometryBufferAnalystParameters);
9085
setTimeout(function () {
9186
try {
@@ -118,16 +113,9 @@ describe('testBufferAnalystService', function () {
118113
bufferSetting.endType = SuperMap.BufferEndType.ROUND;
119114
bufferSetting.leftDistance.value = -1;
120115
bufferSetting.semicircleLineSegment = 5;
121-
var resultSetting = new SuperMap.DataReturnOption({
122-
expectCount: 2000,
123-
dataset: null,
124-
dataReturnMode: SuperMap.DataReturnMode.DATASET_ONLY,
125-
deleteExistResultDataset: true
126-
});
127116
var geometryBufferAnalystParameters = new SuperMap.GeometryBufferAnalystParameters();
128117
geometryBufferAnalystParameters.sourceGeometry = sourceGeometry;
129118
geometryBufferAnalystParameters.bufferSetting = bufferSetting;
130-
geometryBufferAnalystParameters.resultSetting = resultSetting;
131119
bfServiceByGeometry.processAsync(geometryBufferAnalystParameters);
132120
setTimeout(function () {
133121
try {

‎test/common/iServer/SetLayerInfoServiceSpec.js‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
require('../../../src/common/iServer/SetLayerInfoService');
2+
require('../../resrces/LayersInfo');
3+
4+
var setLayerFailedEventArgsSystem = null;
5+
var setLayerEventArgsSystem = null;
6+
var id;
7+
var url = GlobeParameter.WorldURL;
8+
var options = {
9+
eventListeners: {
10+
"processCompleted": setLayerInfoCompleted,
11+
'processFailed': setLayerFailed
12+
}
13+
};
14+
15+
function initSetLayerInfoService(url) {
16+
return new SuperMap.SetLayerInfoService(url, options);
17+
}
18+
19+
function setLayerInfoCompleted(result) {
20+
setLayerEventArgsSystem = result;
21+
}
22+
23+
function setLayerFailed(result) {
24+
setLayerFailedEventArgsSystem = result;
25+
}
26+
27+
describe('SetLayerInfoService', function () {
28+
var originalTimeout;
29+
beforeEach(function () {
30+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
31+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
32+
setLayerEventArgsSystem = null;
33+
setLayerFailedEventArgsSystem = null;
34+
});
35+
afterEach(function () {
36+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
37+
});
38+
39+
//新建临时图层
40+
it('setNewTempLayer', function (done) {
41+
var layersInformation = layersInfo;
42+
var setLayersInfoService = new SuperMap.SetLayersInfoService(url, {
43+
eventListeners: {
44+
"processCompleted": setLayerInfoCompleted,
45+
'processFailed': setLayerFailed
46+
},
47+
isTempLayers: false
48+
});
49+
expect(setLayersInfoService).not.toBeNull();
50+
expect(setLayersInfoService.url).toEqual(url);
51+
setLayersInfoService.processAsync(layersInformation);
52+
setLayersInfoService.events.on({"processCompleted": setLayerInfoCompleted});
53+
setTimeout(function () {
54+
try {
55+
expect(setLayerEventArgsSystem.type).toEqual("processCompleted");
56+
var serviceResult = setLayerEventArgsSystem.result;
57+
expect(serviceResult).not.toBeNull();
58+
expect(serviceResult.succeed).toBeTruthy();
59+
expect(serviceResult.postResultType).toEqual("CreateChild");
60+
expect(serviceResult.newResourceLocation).not.toBeNull();
61+
expect(serviceResult.newResourceID).not.toBeNull();
62+
id = serviceResult.newResourceID;
63+
setLayersInfoService.destroy();
64+
done();
65+
} catch (e) {
66+
expect(false).toBeTruthy();
67+
console.log("setNewTempLayer 新建临时图层失败" + e.name + ":" + e.message);
68+
setLayersInfoService.destroy();
69+
done();
70+
}
71+
}, 5000)
72+
});
73+
74+
//使用的临时图层id，为上一个it新建的图层
75+
it('setLayerInfo', function (done) {
76+
if (id == null) {
77+
console.log("没有得到临时图层ID");
78+
} else {
79+
var layerInformation = layerInfo;
80+
layerInformation.description = "this is a test";
81+
var url1 = url + "/tempLayersSet/" + id + "/continent_T@World.1@@World";
82+
var setLayerInfoService = initSetLayerInfoService(url1);
83+
expect(setLayerInfoService).not.toBeNull();
84+
expect(setLayerInfoService.url).toEqual(url1);
85+
setLayerInfoService.processAsync(layerInformation);
86+
setLayerInfoService.events.on({"processCompleted": setLayerInfoCompleted});
87+
setTimeout(function () {
88+
try {
89+
expect(setLayerEventArgsSystem.type).toEqual("processCompleted");
90+
var serviceResult = setLayerEventArgsSystem.result;
91+
expect(serviceResult).not.toBeNull();
92+
expect(serviceResult.succeed).toBeTruthy();
93+
setLayerInfoService.destroy();
94+
done();
95+
} catch (e) {
96+
expect(false).toBeTruthy();
97+
console.log("setLayerInfo" + e.name + ":" + e.message);
98+
setLayerInfoService.destroy();
99+
done();
100+
}
101+
}, 4000)
102+
}
103+
});
104+
});

‎test/common/iServer/SetLayersInfoServiceSpec.js‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
require('../../../src/common/iServer/SetLayersInfoService');
2+
require('../../resrces/LayersInfo');
3+
4+
var setLayersFailedEventArgsSystem = null;
5+
var setLayersEventArgsSystem = null;
6+
var id;
7+
var url = GlobeParameter.WorldURL;
8+
var options = {
9+
eventListeners: {
10+
"processCompleted": setLayersInfoCompleted,
11+
'processFailed': setLayersFailed
12+
},
13+
isTempLayers: false
14+
};
15+
16+
function initSetLayersInfoService() {
17+
return new SuperMap.SetLayersInfoService(url, options);
18+
}
19+
20+
function setLayersInfoCompleted(setLayersInfoArgs) {
21+
setLayersEventArgsSystem = setLayersInfoArgs;
22+
}
23+
24+
function setLayersFailed(serviceFailedEventArgs) {
25+
setLayersFailedEventArgsSystem = serviceFailedEventArgs;
26+
}
27+
28+
describe('SetLayersInfoService', function () {
29+
var originalTimeout;
30+
beforeEach(function () {
31+
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
32+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
33+
serviceFailedEventArgsSystem = null;
34+
setEventArgsSystem = null;
35+
});
36+
afterEach(function () {
37+
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
38+
});
39+
40+
//新建临时图层
41+
it('setNewTempLayer', function (done) {
42+
var layers = layersInfo;
43+
var setLayersInfoService = initSetLayersInfoService();
44+
expect(setLayersInfoService).not.toBeNull();
45+
expect(setLayersInfoService.url).toEqual(url);
46+
setLayersInfoService.processAsync(layers);
47+
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
48+
setTimeout(function () {
49+
try {
50+
expect(setLayersEventArgsSystem.type).toEqual("processCompleted");
51+
var serviceResult = setLayersEventArgsSystem.result;
52+
expect(serviceResult).not.toBeNull();
53+
expect(serviceResult.succeed).toBeTruthy();
54+
expect(serviceResult.postResultType).toEqual("CreateChild");
55+
expect(serviceResult.newResourceLocation).not.toBeNull();
56+
expect(serviceResult.newResourceID).not.toBeNull();
57+
id = serviceResult.newResourceID;
58+
setLayersInfoService.destroy();
59+
done();
60+
} catch (e) {
61+
expect(false).toBeTruthy();
62+
console.log("setNewTemLayer" + e.name + ":" + e.message);
63+
setLayersInfoService.destroy();
64+
done();
65+
}
66+
}, 5000)
67+
});
68+
69+
//修改临时图层的信息 isTempLayers=true
70+
it('setLayersInfo_isTempLayer', function (done) {
71+
var setLayersInfoService = new SuperMap.SetLayersInfoService(url, {
72+
eventListeners: {
73+
"processCompleted": setLayersInfoCompleted,
74+
'processFailed': setLayersFailed
75+
},
76+
isTempLayers: true,
77+
resourceID: id,
78+
});
79+
expect(setLayersInfoService).not.toBeNull();
80+
expect(setLayersInfoService.url).toEqual(url);
81+
var layers = layersInfo;
82+
layers.description = "test";
83+
setLayersInfoService.processAsync(layers);
84+
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
85+
setTimeout(function () {
86+
try {
87+
expect(setLayersEventArgsSystem.type).toEqual("processCompleted");
88+
var serviceResult = setLayersEventArgsSystem.result;
89+
expect(serviceResult).not.toBeNull();
90+
expect(serviceResult.succeed).toBeTruthy();
91+
setLayersInfoService.destroy();
92+
done();
93+
} catch (e) {
94+
expect(false).toBeTruthy();
95+
console.log("setLayersInfo_isTempLayer" + e.name + ":" + e.message);
96+
setLayersInfoService.destroy();
97+
done();
98+
}
99+
}, 4000)
100+
});
101+
102+
//失败事件
103+
it('failedEvent', function (done) {
104+
var layer = layerInfo;
105+
var setLayersInfoService = initSetLayersInfoService();
106+
expect(setLayersInfoService).not.toBeNull();
107+
expect(setLayersInfoService.url).toEqual(url);
108+
setLayersInfoService.processAsync(layer);
109+
setLayersInfoService.events.on({"processFailed": setLayersFailed});
110+
setTimeout(function () {
111+
try {
112+
var serviceResult = setLayersFailedEventArgsSystem;
113+
expect(serviceResult.type).toEqual("processFailed");
114+
expect(serviceResult.error.code).not.toBeNull();
115+
expect(serviceResult.error.errorMsg).not.toBeNull();
116+
setLayersInfoService.destroy();
117+
done();
118+
} catch (e) {
119+
expect(false).toBeTruthy();
120+
console.log("setNewTemLayer" + e.name + ":" + e.message);
121+
setLayersInfoService.destroy();
122+
done();
123+
}
124+
}, 5000)
125+
});
126+
});

0 commit comments

Comments
 (0)