修改单元测试 leaflet - EditFeatureServiceRegionSpec 中 UpdateFeature 案例的测试参数。

chenmeiyiSupermap · chenmeiyiSupermap · commit 8072e775eb29 · 2017-07-20T16:56:17.000+08:00
diff --git a/test/common/iServer/EditFeaturesServiceSpec.js b/test/common/iServer/EditFeaturesServiceSpec.js
@@ -1,8 +1,6 @@
 ﻿require('../../../src/common/iServer/EditFeaturesService');
 
 var editServiceURL = GlobeParameter.editServiceURL;
-var editServiceURL_POINT = GlobeParameter.editServiceURL_POINT;
-var editServiceURL_LINE = GlobeParameter.editServiceURL_LINE;
 var id1;
 describe('testEditFeaturesService', function () {
     var originalTimeout;
diff --git a/test/leaflet/services/EditFeaturesServiceRegionSpec.js b/test/leaflet/services/EditFeaturesServiceRegionSpec.js
@@ -144,18 +144,21 @@ describe('leaflet_testFeatureService_editFeatures', function () {
                 expect(getFeatureResult.result.succeed).toBeTruthy();
                 originFeature = getFeatureResult.result.features.features[0];
                 getFeaturesByIDsService.destroy();
+                done();
             } else {
+                originFeature = null;
                 console.log("未获取到数据");
                 getFeaturesByIDsService.destroy();
+                done();
             }
-            done();
         }, 4000)
     });
     // 将上面获取的要素update
     it('successEvent:updateFeature', function (done) {
         var updateFeatureResult = null;
-        if (originFeature) {
-            originFeature.properties.LANDTYPE = "用材林" + Math.random() * 100;
+        if (originFeature != null) {
+            var random = parseInt(Math.random()*10000000);
+            originFeature.properties.LANDTYPE = "用材林" + random;
             var updateFeaturesParams = new SuperMap.EditFeaturesParameters({
                 dataSourceName: "Jingjin",
                 dataSetName: "Landuse_R",
@@ -166,23 +169,31 @@ describe('leaflet_testFeatureService_editFeatures', function () {
                 updateFeatureResult = result
             });
             setTimeout(function () {
-                try {
-                    expect(updateFeaturesService).not.toBeNull();
-                    expect(updateFeatureResult).not.toBeNull();
-                    expect(updateFeatureResult.type).toBe("processCompleted");
-                    expect(updateFeatureResult.result.succeed).toBeTruthy();
-                    updateFeaturesService.destroy();
-                    done();
-                } catch (exception) {
-                    expect(false).toBeTruthy();
-                    console.log("'successEvent:updateFeature'案例失败" + exception.name + ":" + exception.message);
-                    updateFeaturesService.destroy();
+                if (updateFeatureResult != null) {
+                    try {
+                        console.log(updateFeatureResult);
+                        expect(updateFeaturesService).not.toBeNull();
+                        expect(updateFeatureResult).not.toBeNull();
+                        expect(updateFeatureResult.type).toBe("processCompleted");
+                        expect(updateFeatureResult.result.succeed).toBeTruthy();
+                        updateFeaturesService.destroy();
+                        done();
+                    } catch (exception) {
+                        expect(false).toBeTruthy();
+                        console.log("'successEvent:updateFeature'案例失败" + exception.name + ":" + exception.message);
+                        updateFeaturesService.destroy();
+                        done();
+                    }
+                }
+                else {
+                    console.log("'updateFeature'在设置的延时时间内未完成要素更新");
                     done();
                 }
-            }, 10000);
+            }, 5000);
         }
         else {
             console.log("'updateFeature'未获取到数据");
+            done();
         }
     });
 });
diff --git a/test/test-main-common.js b/test/test-main-common.js
@@ -10,6 +10,7 @@ require('./common/iServer/BurstPipelineAnalystServiceSpec.js');
 //iclient8注释掉,海图测试LayerServices相关的类，等待服务端支持后添加
 //require('./common/iServer/ChartFeatureInfoSpecsServiceSpec.js');
 //require('./common/iServer/ChartQueryServiceSpec.js');
+
 require('./common/iServer/ComputeWeightMatrixServiceSpec.js');
 
 //require('./common/iServer/DensityAnalystServiceSpec.js');         //iclient8注释掉,fieldName
@@ -23,6 +24,7 @@ require('./common/iServer/EditFeaturesServiceSpec.js');
 //require('./common/iServer/FacilityAnalystTracedown3DServiceSpec.js');
 //require('./common/iServer/FacilityAnalystTraceup3DServiceSpec.js');
 //require('./common/iServer/FacilityAnalystUpstream3DServiceSpec.js');
+
 require('./common/iServer/FieldStatisticServiceSpec.js');
 require('./common/iServer/FindClosestFacilitiesServiceSpec.js');
 require('./common/iServer/FindLocationServiceSpec.js');
