fix UT

chenmeiyiSupermap · chenmeiyiSupermap · commit 09ad0f270198 · 2017-11-15T09:19:35.000+08:00
diff --git a/test/leaflet/services/GridCellInfosServiceSpec.js b/test/leaflet/services/GridCellInfosServiceSpec.js
@@ -33,11 +33,11 @@ describe('leaflet_GridCellInfosService', function () {
             expect(serviceResult.result.row).not.toBeUndefined();
             expect(serviceResult.result.value).not.toBeUndefined();
             expect(serviceResult.object.options.method).toBe("GET");
-            expect(serviceResult.object.options.X).toEqual(4);
-            expect(serviceResult.object.options.Y).toEqual(20);
-            expect(serviceResult.object.options.dataSourceName).toBe("World");
-            expect(serviceResult.object.options.datasetName).toBe("WorldEarth");
-            expect(serviceResult.object.options.datasetType).toBe("IMAGE");
+            expect(serviceResult.object.X).toEqual(4);
+            expect(serviceResult.object.Y).toEqual(20);
+            expect(serviceResult.object.dataSourceName).toBe("World");
+            expect(serviceResult.object.datasetName).toBe("WorldEarth");
+            expect(serviceResult.object.datasetType).toBe("IMAGE");
             params.destroy();
         });
     });
diff --git a/test/leaflet/services/InterpolationAnalysisSpec.js b/test/leaflet/services/InterpolationAnalysisSpec.js
@@ -18,7 +18,7 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
     });
 
     var resultDataset = "Interpolation_UnvsKriging_lfTest";
-    it('interpolationAnalysis_Kriging_Universal', function (done) {
+    it('interpolationAnalysis_Kriging_Universal', function () {
         var interpolationAnalystParameters = new SuperMap.InterpolationKrigingAnalystParameters({
             // 用于做插值分析的数据源中数据集的名称
             dataset: "SamplesP@Interpolation",
@@ -53,8 +53,6 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
         var interpolationAnalystService = L.supermap.spatialAnalystService(spatialAnalystURL, options);
         interpolationAnalystService.interpolationAnalysis(interpolationAnalystParameters, function (result) {
             serviceResult = result;
-        });
-        setTimeout(function () {
             try {
                 expect(interpolationAnalystService).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -64,14 +62,12 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
                 expect(serviceResult.result.dataset).toContain("@Interpolation");
                 expect(serviceResult.result.succeed).toBe(true);
                 interpolationAnalystService.destroy();
-                done();
             } catch (exception) {
                 console.log("'leaflet_interpolationAnalystService_Kriging_Universal'案例失败" + exception.name + ":" + exception.message);
                 interpolationAnalystService.destroy();
                 expect(false).toBeTruthy();
-                done();
             }
-        }, 10000);
+        });
     });
 
     // 删除测试过程中产生的测试数据集
