Skip to content

Commit e3d0de7

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
尝试修复iClient9中的UT报错
1 parent c82de3a commit e3d0de7

File tree

3 files changed

+125
-125
lines changed

3 files changed

+125
-125
lines changed

‎karma.conf.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ module.exports = function (config) {
2828
'src/common/SuperMap.js',
2929
'src/common/REST.js',
3030
'src/common/style/CartoCSS.js',
31-
3231
'src/common/**/*.js',
3332

3433
/***Leaflet文件夹下的源码添加至此，暂未添加***/
@@ -76,7 +75,7 @@ module.exports = function (config) {
7675
'test/common/iServer/MapServiceSpec.js',
7776
'test/common/iServer/MathExpressionAnalysisServiceSpec.js',
7877
'test/common/iServer/MeasureServiceSpec.js',
79-
//'test/common/iServer/OverlayAnalystServiceSpec.js', //本地不报错, 测试机上报错, 暂时注释掉
78+
'test/common/iServer/OverlayAnalystServiceSpec.js',
8079
'test/common/iServer/QueryByBoundsServiceSpec.js',
8180
'test/common/iServer/QueryByDistanceServiceSpec.js',
8281
'test/common/iServer/QueryByGeometryServiceSpec.js',
@@ -88,7 +87,7 @@ module.exports = function (config) {
8887
//'test/common/iServer/SetLayersInfoServiceSpec.js', //待开发先进行验证,再进行测试,暂时忽略
8988
'test/common/iServer/SetLayerStatusServiceSpec.js',
9089
'test/common/iServer/StopQueryServiceSpec.js',
91-
//'test/common/iServer/SurfaceAnalystServiceSpec.js', //本地不报错, 测试机上报错, 暂时注释掉//待开发将等值线LinearRing添加到GeoJason后再补充对应测试
90+
'test/common/iServer/SurfaceAnalystServiceSpec.js', //待开发将等值线LinearRing添加到GeoJason后再补充对应测试
9291
'test/common/iServer/TerrainCurvatureCalculationServiceSpec.js',
9392
'test/common/iServer/ThemeServiceSpec.js',
9493
'test/common/iServer/ThiessenAnalystServiceSpec.js',

‎test/common/iServer/OverlayAnalystServiceSpec.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,49 @@
33
var serviceFailedEventArgsSystem = null;
44
var analystEventArgsSystem = null;
55
var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
6-
var options = {
6+
var options = {
77
eventListeners: {
8-
'processFailed':OverlayAnalystServiceFailed,
9-
'processCompleted':OverlayAnalystServiceCompleted
8+
'processFailed': OverlayAnalystServiceFailed,
9+
'processCompleted': OverlayAnalystServiceCompleted
1010
}
1111
};
1212
function initOverlayAnalystService_Register() {
1313
return new SuperMap.REST.OverlayAnalystService(spatialAnalystURL, options);
1414
}
15-
function OverlayAnalystServiceCompleted(eventArgs){
15+
function OverlayAnalystServiceCompleted(eventArgs) {
1616
analystEventArgsSystem = eventArgs;
1717
}
18-
function OverlayAnalystServiceFailed(eventArgs){
18+
function OverlayAnalystServiceFailed(eventArgs) {
1919
serviceFailedEventArgsSystem = eventArgs;
2020
}
2121

2222

23-
describe('testOverlayAnalystService_processAsync',function(){
23+
describe('testOverlayAnalystService_processAsync', function () {
2424
var originalTimeout;
25-
beforeEach(function() {
25+
beforeEach(function () {
2626
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
2727
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
2828
serviceFailedEventArgsSystem = null;
2929
analystEventArgsSystem = null;
3030
});
31-
afterEach(function() {
31+
afterEach(function () {
3232
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3333
});
3434

3535
//不直接返回查询结果
36-
it('AnalyzeByDatasets_NotReturnContent',function(done){
36+
it('AnalyzeByDatasets_NotReturnContent', function (done) {
3737
var overlayServiceByDatasets = initOverlayAnalystService_Register();
3838
expect(overlayServiceByDatasets).not.toBeNull();
3939
expect(overlayServiceByDatasets.url).toEqual(spatialAnalystURL);
4040
var dsOverlayAnalystParameters = new SuperMap.DatasetOverlayAnalystParameters();
4141
dsOverlayAnalystParameters.sourceDataset = "Landuse_R@Jingjin";
4242
dsOverlayAnalystParameters.operateDataset = "Lake_R@Jingjin";
4343
dsOverlayAnalystParameters.operation = SuperMap.OverlayOperationType.UPDATE;
44+
overlayServiceByDatasets.events.on({"processCompleted": OverlayAnalystServiceCompleted});
4445
overlayServiceByDatasets.processAsync(dsOverlayAnalystParameters);
45-
overlayServiceByDatasets.events.on({"processCompleted":OverlayAnalystServiceCompleted});
4646

47-
setTimeout(function(){
48-
try{
47+
setTimeout(function () {
48+
try {
4949
var overlayResult = analystEventArgsSystem.result;
5050
expect(overlayResult).not.toBeNull();
5151
overlayServiceByDatasets.destroy();
@@ -54,44 +54,44 @@ describe('testOverlayAnalystService_processAsync',function(){
5454
expect(overlayServiceByDatasets.events).toBeNull();
5555
dsOverlayAnalystParameters.destroy();
5656
done();
57-
}catch(exception){
58-
expect(false).toBeTruthy();
59-
console.log("FieldStatisticService_" + exception.name + ":" + exception.message);
57+
} catch (exception) {
58+
console.log("OverlayAnalystService_" + exception.name + ":" + exception.message);
6059
overlayServiceByDatasets.destroy();
6160
dsOverlayAnalystParameters.destroy();
61+
expect(false).toBeTruthy();
6262
done();
6363
}
64-
},6000)
64+
}, 20000)
6565
});
6666

67-
it('AnalyzeByDatasets_failed', function (done){
67+
it('AnalyzeByDatasets_failed', function (done) {
6868
var overlayServiceByDatasets = initOverlayAnalystService_Register();
6969
expect(overlayServiceByDatasets).not.toBeNull();
7070
var dsOverlayAnalystParameters = new SuperMap.DatasetOverlayAnalystParameters();
7171
dsOverlayAnalystParameters.sourceDataset = "Landu@Jingjin";
7272
dsOverlayAnalystParameters.operateDataset = "Lake_R@Jingjin";
7373
dsOverlayAnalystParameters.operation = SuperMap.OverlayOperationType.UPDATE;
74+
overlayServiceByDatasets.events.on({"processFailed": OverlayAnalystServiceFailed});
7475
overlayServiceByDatasets.processAsync(dsOverlayAnalystParameters);
75-
overlayServiceByDatasets.events.on({"processFailed":OverlayAnalystServiceFailed});
7676

77-
setTimeout(function(){
78-
try{
77+
setTimeout(function () {
78+
try {
7979
expect(serviceFailedEventArgsSystem.error.errorMsg).not.toBeNull();
8080
expect(serviceFailedEventArgsSystem.error.code).toEqual(400);
8181
overlayServiceByDatasets.destroy();
8282
dsOverlayAnalystParameters.destroy();
8383
done();
84-
}catch(exception){
85-
expect(false).toBeTruthy();
86-
console.log("FieldStatisticService_" + exception.name + ":" + exception.message);
84+
} catch (exception) {
85+
console.log("OverlayAnalystService_" + exception.name + ":" + exception.message);
8786
overlayServiceByDatasets.destroy();
8887
dsOverlayAnalystParameters.destroy();
88+
expect(false).toBeTruthy();
8989
done();
9090
}
91-
},6000)
91+
}, 20000)
9292
});
9393

94-
it('AnalyzeByDatasets_Geometry', function (done){
94+
it('AnalyzeByDatasets_Geometry', function (done) {
9595
var overlayServiceByDatasets = initOverlayAnalystService_Register();
9696
expect(overlayServiceByDatasets).not.toBeNull();
9797
var points = [new SuperMap.Geometry.Point(47.9909960608, 382.4873382105),
@@ -109,23 +109,23 @@ describe('testOverlayAnalystService_processAsync',function(){
109109
geOverlayAnalystParameters.sourceGeometry = sourceGeometry;
110110
geOverlayAnalystParameters.operateGeometry = operateGeometry;
111111
geOverlayAnalystParameters.operation = SuperMap.OverlayOperationType.CLIP;
112+
overlayServiceByDatasets.events.on({"processCompleted": OverlayAnalystServiceCompleted});
112113
overlayServiceByDatasets.processAsync(geOverlayAnalystParameters);
113-
overlayServiceByDatasets.events.on({"processCompleted":OverlayAnalystServiceCompleted});
114114

115-
setTimeout(function(){
116-
try{
115+
setTimeout(function () {
116+
try {
117117
var overlayResult = analystEventArgsSystem.result;
118118
expect(overlayResult).not.toBeNull();
119119
overlayServiceByDatasets.destroy();
120120
geOverlayAnalystParameters.destroy();
121121
done();
122-
}catch(exception){
123-
expect(false).toBeTruthy();
124-
console.log("FieldStatisticService_" + exception.name + ":" + exception.message);
122+
} catch (exception) {
123+
console.log("OverlayAnalystService_" + exception.name + ":" + exception.message);
125124
overlayServiceByDatasets.destroy();
126125
geOverlayAnalystParameters.destroy();
126+
expect(false).toBeTruthy();
127127
done();
128128
}
129-
},6000)
129+
}, 20000)
130130
});
131131
});

0 commit comments

Comments
 (0)