Skip to content

Commit 8862056

Browse files
songyumengsongyumeng
committed
【fix】ut review by luoxiao
1 parent 5dd05ab commit 8862056

14 files changed

+6
-48
lines changed

‎test/common/iServer/FieldStatisticServiceSpec.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('FieldStatisticService', () => {
3232

3333
//存在对应数据源数据集返回查询结果
3434
it('success:processAsync', (done) => {
35-
var fieldStatisticService = new FieldStatisticService(dataServiceURL, options);
35+
var fieldStatisticService;
3636
var fieldStatisticCompleted = (fieldStatisticEventArgsSystem) => {
3737
try {
3838
expect(fieldStatisticEventArgsSystem).not.toBeNull();
@@ -62,7 +62,7 @@ describe('FieldStatisticService', () => {
6262
'processFailed': fieldStatisticFailed
6363
}
6464
};
65-
65+
fieldStatisticService = new FieldStatisticService(dataServiceURL, options);
6666
expect(fieldStatisticService).not.toBeNull();
6767
expect(fieldStatisticService.url).toBe(dataServiceURL);
6868
fieldStatisticService.dataset = "Countries";
@@ -73,13 +73,12 @@ describe('FieldStatisticService', () => {
7373
expect(testUrl).toBe(dataServiceURL + "/datasources/World/datasets/Countries/fields/SmID/AVERAGE");
7474
return Promise.resolve(new Response(`{"result":124,"mode":"AVERAGE"}`));
7575
});
76-
fieldStatisticService.events.on({ 'processCompleted': fieldStatisticCompleted });
7776
fieldStatisticService.processAsync();
7877
});
7978

8079
//错误数据集，查询错误
8180
it('processAsync_datasetsWrong', (done) => {
82-
var fieldStatisticService = new FieldStatisticService(dataServiceURL, options);
81+
var fieldStatisticService;
8382
var fieldStatisticCompleted = (fieldStatisticEventArgsSystem) => {
8483

8584
};
@@ -104,6 +103,7 @@ describe('FieldStatisticService', () => {
104103
'processFailed': fieldStatisticFailed
105104
}
106105
};
106+
fieldStatisticService = new FieldStatisticService(dataServiceURL, options);
107107
fieldStatisticService.dataset = "NoDataset";
108108
fieldStatisticService.datasource = "World";
109109
fieldStatisticService.field = "NotIDThis";
@@ -112,11 +112,10 @@ describe('FieldStatisticService', () => {
112112
expect(testUrl).toBe(dataServiceURL + "/datasources/World/datasets/NoDataset/fields/NotIDThis/AVERAGE");
113113
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":500,"errorMsg":"抛出未被捕获的异常,错误信息是数据集NoDataset在数据源中不存在"}}`));
114114
});
115-
fieldStatisticService.events.on({ 'processFailed': fieldStatisticFailed });
116115
fieldStatisticService.processAsync();
117116
})
118117
it('processAsync_customQueryParam', (done) => {
119-
var fieldStatisticService = new FieldStatisticService(dataServiceURL + '?key=111', options);
118+
var fieldStatisticService;
120119
var fieldStatisticCompleted = (fieldStatisticEventArgsSystem) => {
121120
try {
122121
fieldStatisticService.destroy();
@@ -137,7 +136,7 @@ describe('FieldStatisticService', () => {
137136
'processFailed': fieldStatisticFailed
138137
}
139138
};
140-
139+
fieldStatisticService = new FieldStatisticService(dataServiceURL + '?key=111', options)
141140
expect(fieldStatisticService.url).toBe(dataServiceURL + '?key=111');
142141
fieldStatisticService.dataset = "Countries";
143142
fieldStatisticService.datasource = "World";
@@ -147,7 +146,6 @@ describe('FieldStatisticService', () => {
147146
expect(testUrl).toBe(dataServiceURL + "/datasources/World/datasets/Countries/fields/SmID/AVERAGE?key=111");
148147
return Promise.resolve(new Response(`{"result":124,"mode":"AVERAGE"}`));
149148
});
150-
fieldStatisticService.events.on({ 'processCompleted': fieldStatisticCompleted });
151149
fieldStatisticService.processAsync();
152150
});
153151
});

‎test/common/iServer/GetFeaturesByBoundsServiceSpec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ describe('GetFeaturesByBoundsService', () => {
5454
serviceCompleted,
5555
serviceFailed
5656
);
57-
getFeaturesByBoundsService.events.on({
58-
processFailed: serviceFailed,
59-
processCompleted: serviceCompleted
60-
});
6157
expect(getFeaturesByBoundsService).not.toBeNull();
6258
expect(getFeaturesByBoundsService.CLASS_NAME).toEqual('SuperMap.GetFeaturesByBoundsService');
6359
getFeaturesByBoundsService.destroy();

‎test/common/iServer/MapServiceSpec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ describe('MapService', () => {
120120
)
121121
);
122122
});
123-
getMapService.events.on({ processFailed: GetMapStatusFailed });
124123
getMapService.processAsync();
125124
});
126125

‎test/common/iServer/MathExpressionAnalysisServiceSpec.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ describe('MathExpressionAnalysisService', () => {
8585
return Promise.resolve(new Response(`{"succeed":true,"recordset":null,"message":null,"dataset":"MathExpression_commonTest@Jingjin"}`));
8686
});
8787
mathExpressionAnalysisService.processAsync(mathExpressionAnalysisParameters);
88-
mathExpressionAnalysisService.events.on({"processCompleted": MathExpressionAnalysisServiceCompleted});
8988
});
9089

9190
it('fail:processAsync', (done) => {
@@ -128,7 +127,6 @@ describe('MathExpressionAnalysisService', () => {
128127
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据集XX@Jingjin不存在"}}`));
129128
});
130129
mathExpressionAnalysisService.processAsync(mathExpressionAnalysisParameters);
131-
mathExpressionAnalysisService.events.on({"processFailed": MathExpressionAnalysisServiceFailed});
132130
});
133131
});
134132

‎test/common/iServer/MeasureServiceSpec.js‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ describe('MeasureService', () => {
8686
expect(testUrl).toBe(worldMapURL+"/distance");
8787
return Promise.resolve(new Response(`{"area":-1,"unit":"METER","distance":1565109.0991230179}`));
8888
});
89-
measureService.events.on({'processCompleted': measureCompleted, 'processFailed': measureFailed});
9089
measureService.processAsync(measureParameters);
9190
});
9291

@@ -120,10 +119,6 @@ describe('MeasureService', () => {
120119
var measureService = initMeasureService(worldMapURL,measureFailed,measureCompleted);
121120
var point = new Point(0, 0);
122121
var measureParameters = new MeasureParameters(point);
123-
measureService.events.on({
124-
'processCompleted': measureCompleted,
125-
'processFailed': measureFailed
126-
});
127122
spyOn(FetchRequest, 'commit').and.callFake((method,testUrl) => {
128123
expect(method).toBe("GET");
129124
expect(testUrl).toBe(worldMapURL+"/distance");
@@ -169,10 +164,6 @@ describe('MeasureService', () => {
169164
expect(testUrl).toBe(worldMapURL+"/distance");
170165
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"No enum constant com.supermap.services.components.commontypes.Unit.error"}}`));
171166
});
172-
measureService.events.on({
173-
'processCompleted': measureCompleted,
174-
'processFailed': measureFailed
175-
});
176167
measureService.processAsync(measureParameters);
177168
});
178169

@@ -344,7 +335,6 @@ describe('MeasureService', () => {
344335
expect(testUrl).toBe(mapServiceURL+"World Map_Error/area");
345336
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":404,"errorMsg":"资源不存在"}}`));
346337
});
347-
measureService.events.on({'processCompleted': measureCompleted, 'processFailed': measureFailed});
348338
measureService.processAsync(measureParameters);
349339
});
350340

@@ -393,7 +383,6 @@ describe('MeasureService', () => {
393383
expect(params.distanceMode).toEqual('Geodesic');
394384
return Promise.resolve(new Response(`{"area":-1,"unit":"METER","distance": 3.0616868362}`));
395385
});
396-
measureService.events.on({'processCompleted': measureCompleted, 'processFailed': measureFailed});
397386
measureService.processAsync(measureParameters);
398387
});
399388

@@ -441,7 +430,6 @@ describe('MeasureService', () => {
441430
expect(params.distanceMode).toEqual('Planar');
442431
return Promise.resolve(new Response(`{"area":-1,"unit":"METER","distance": 3.9981624957}`));
443432
});
444-
measureService.events.on({'processCompleted': measureCompleted, 'processFailed': measureFailed});
445433
measureService.processAsync(measureParameters);
446434
});
447435
});

‎test/common/iServer/OverlayAnalystServiceSpec.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ describe('OverlayAnalystService', () => {
8585
expect(paramsObj.operation).toBe("UPDATE");
8686
return Promise.resolve(new Response(overlayEscapedJson));
8787
});
88-
overlayServiceByDatasets.events.on({"processCompleted": OverlayAnalystServiceCompleted});
8988
overlayServiceByDatasets.processAsync(dsOverlayAnalystParameters);
9089
});
9190

@@ -124,7 +123,6 @@ describe('OverlayAnalystService', () => {
124123
expect(paramsObj.operation).toBe("UPDATE");
125124
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据集Landu@Jingjin不存在"}}`));
126125
});
127-
overlayServiceByDatasets.events.on({"processFailed": OverlayAnalystServiceFailed});
128126
overlayServiceByDatasets.processAsync(dsOverlayAnalystParameters);
129127
});
130128

@@ -172,7 +170,6 @@ describe('OverlayAnalystService', () => {
172170
expect(paramsObj.operation).toBe("CLIP");
173171
return Promise.resolve(new Response(`{"image":null,"resultGeometry":{"center":{"x":170.3545301069,"y":395.31795160385},"parts":[2],"style":null,"prjCoordSys":null,"id":0,"type":"LINE","partTopo":null,"points":[{"x":170.3545301069,"y":408.1485649972},{"x":170.3545301069,"y":382.4873382105}]},"succeed":true,"message":null}`));
174172
});
175-
overlayServiceByDatasets.events.on({"processCompleted": OverlayAnalystServiceCompleted});
176173
overlayServiceByDatasets.processAsync(geOverlayAnalystParameters);
177174
});
178175
});

‎test/common/iServer/QueryBySQLServiceSpec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ describe('testQueryBySQLService_processAsync', () => {
169169
expect(options).not.toBeNull();
170170
return Promise.resolve(new Response(JSON.stringify(queryResultJson)));
171171
});
172-
queryBySQLService.events.on({'processCompleted': QueryBySQLCompleted});
173172
queryBySQLService.processAsync(queryBySQLParameters);
174173
});
175174

@@ -281,7 +280,6 @@ describe('testQueryBySQLService_processAsync', () => {
281280
expect(paramsObj.queryParameters.queryOption).toBe("ATTRIBUTEANDGEOMETRY");
282281
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"参数 queryParameters 非法，queryParameters.queryParams 不能为空。"}}`));
283282
});
284-
queryBySQLService.events.on({'processFailed': QueryBySQLFailed});
285283
queryBySQLService.processAsync(queryBySQLParameters);
286284
});
287285

@@ -338,7 +336,6 @@ describe('testQueryBySQLService_processAsync', () => {
338336
expect(paramsObj.queryParameters.queryOption).toBe("ATTRIBUTE");
339337
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"查询目标图层不存在。(notExist)"}}`));
340338
});
341-
queryBySQLService.events.on({'processFailed': QueryBySQLFailed});
342339
queryBySQLService.processAsync(queryBySQLParameters);
343340
});
344341

@@ -450,7 +447,6 @@ describe('testQueryBySQLService_processAsync', () => {
450447
expect(testUrl).toBe(worldMapURL + "/queryResults?key=123&returnContent=true");
451448
return Promise.resolve(new Response(JSON.stringify(queryResultJson)));
452449
});
453-
queryBySQLService.events.on({'processCompleted': QueryBySQLCompleted});
454450
queryBySQLService.processAsync(queryBySQLParameters);
455451
});
456452
});

‎test/common/iServer/SetLayerInfoServiceSpec.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ describe('SetLayerInfoService', () => {
8484
expect(paramsObj[0].subLayers.layers[0].datasetInfo.dataSourceName).toBe("World");
8585
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"f701028a2b7144b19b582f55c1902b18_4b85e5ba2d65456c82e430c7636fba8d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World/tempLayersSet/f701028a2b7144b19b582f55c1902b18_4b85e5ba2d65456c82e430c7636fba8d.json"}`));
8686
});
87-
setLayersInfoService.events.on({"processCompleted": setLayerInfoCompleted});
8887
setLayersInfoService.processAsync(layersInformation);
8988
});
9089

@@ -126,7 +125,6 @@ describe('SetLayerInfoService', () => {
126125
expect(paramsObj.datasetInfo.type).toBe("TEXT");
127126
return Promise.resolve(new Response(`{"succeed":true}`));
128127
});
129-
setLayerInfoService.events.on({"processCompleted": setLayerInfoCompleted});
130128
setLayerInfoService.processAsync(layerInformation);
131129
}
132130
});

‎test/common/iServer/SetLayersInfoServiceSpec.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ describe('SetLayersInfoService', () => {
7878
expect(paramsObj[0].subLayers.layers[0].datasetInfo.dataSourceName).toBe("World");
7979
return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World/tempLayersSet/c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d.json"}`));
8080
});
81-
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
8281
setLayersInfoService.processAsync(layers);
8382
});
8483

@@ -108,7 +107,6 @@ describe('SetLayersInfoService', () => {
108107
});
109108
var layers = layersInfo;
110109
layers.description = "test";
111-
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
112110
var setLayersInfoService = initSetLayersInfoService(url,setLayersFailed,setLayersInfoCompleted);
113111
spyOn(FetchRequest, 'post').and.callFake((testUrl,params) => {
114112
expect(testUrl).toBe(url+"/tempLayersSet");
@@ -118,7 +116,6 @@ describe('SetLayersInfoService', () => {
118116
expect( paramsObj[0].subLayers.layers[0].ugcLayerType).toBe("VECTOR");
119117
return Promise.resolve(new Response(`{"succeed":true}`));
120118
});
121-
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
122119
setLayersInfoService.processAsync(layers);
123120
});
124121

@@ -150,7 +147,6 @@ describe('SetLayersInfoService', () => {
150147
var escapedJson = "{\"succeed\":false,\"error\":{\"code\":500,\"errorMsg\":\"Index:0不在（0，-1）范围之内。\"}}";
151148
return Promise.resolve(new Response(escapedJson));
152149
});
153-
setLayersInfoService.events.on({"processFailed": setLayersFailed});
154150
setLayersInfoService.processAsync(wrongLayerInfo);
155151
});
156152
it('setLayersInfo_customQueryParam', (done) => {
@@ -173,13 +169,11 @@ describe('SetLayersInfoService', () => {
173169
});
174170
var layers = layersInfo;
175171
layers.description = "test";
176-
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
177172
var setLayersInfoService = initSetLayersInfoService(url+'?key=123',setLayersFailed,setLayersInfoCompleted);
178173
spyOn(FetchRequest, 'post').and.callFake((testUrl,params) => {
179174
expect(testUrl).toBe(url+"/tempLayersSet?key=123");
180175
return Promise.resolve(new Response(`{"succeed":true}`));
181176
});
182-
setLayersInfoService.events.on({"processCompleted": setLayersInfoCompleted});
183177
setLayersInfoService.processAsync(layers);
184178
});
185179
});

‎test/common/iServer/TerrainCurvatureCalculationServiceSpec.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ describe('TerrainCurvatureCalculationService', () => {
8585
return Promise.resolve(new Response(`{"averageCurvatureResult":{"succeed":true,"recordset":null,"message":null,"dataset":"TerrainCurvature_commonTest@Jingjin"}}`));
8686
});
8787
terrainCurvatureCalculationService.processAsync(terrainCurvatureCalculationParameters);
88-
terrainCurvatureCalculationService.events.on({"processCompleted": TerrainCurvatureCalculationServiceCompleted});
8988
});
9089

9190
//测试失败事件
@@ -132,7 +131,6 @@ describe('TerrainCurvatureCalculationService', () => {
132131
return Promise.resolve(new Response(`{"succeed":false,"error":{"code":400,"errorMsg":"数据集XX@Jingjin不存在"}}`));
133132
});
134133
terrainCurvatureCalculationService.processAsync(terrainCurvatureCalculationParameters);
135-
terrainCurvatureCalculationService.events.on({'processFailed': TerrainCurvatureCalculationServiceFailed});
136134
});
137135
});
138136

0 commit comments

Comments
 (0)