修改插值分析单元测试中对返回数据集的断言

chenmeiyiSupermap · chenmeiyiSupermap · commit 1e6dc03168ce · 2017-11-06T11:06:14.000+08:00
diff --git a/test/common/iServer/InterpolationAnalystServiceSpec.js b/test/common/iServer/InterpolationAnalystServiceSpec.js
@@ -263,7 +263,8 @@ describe('InterpolationAnalystService', function () {
                 var serviceResult = analystEventArgsSystem.result;
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.succeed).toBeTruthy();
-                expect(serviceResult.dataset).toEqual(resultDataset_RBFByGeo + "@Interpolation");
+                expect(serviceResult.dataset).toContain(resultDataset_RBFByGeo);
+                expect(serviceResult.dataset).toContain("@Interpolation");
                 interpolationAnalystService.destroy();
                 interpolationRBFAnalystParameters.destroy();
                 done();
@@ -311,7 +312,8 @@ describe('InterpolationAnalystService', function () {
                 var serviceResult = analystEventArgsSystem.result;
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.succeed).toBeTruthy();
-                expect(serviceResult.dataset).toEqual(resultDataset_densityByGeo + "@Interpolation");
+                expect(serviceResult.dataset).toContain(resultDataset_densityByGeo);
+                expect(serviceResult.dataset).toContain("@Interpolation");
                 interpolationAnalystService.destroy();
                 interpolationDensityAnalystParameters.destroy();
                 done();
@@ -362,7 +364,8 @@ describe('InterpolationAnalystService', function () {
                 var serviceResult = analystEventArgsSystem.result;
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.succeed).toBeTruthy();
-                expect(serviceResult.dataset).toEqual(resultDataset_IDWByGeo + "@Interpolation");
+                expect(serviceResult.dataset).toContain(resultDataset_IDWByGeo);
+                expect(serviceResult.dataset).toContain("@Interpolation");
                 interpolationAnalystService.destroy();
                 interpolationIDWAnalystParameters.destroy();
                 done();
@@ -417,7 +420,8 @@ describe('InterpolationAnalystService', function () {
                 var serviceResult = analystEventArgsSystem.result;
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.succeed).toBeTruthy();
-                expect(serviceResult.dataset).toEqual(resultDataset_krigingByGeo + "@Interpolation");
+                expect(serviceResult.dataset).toContain(resultDataset_krigingByGeo);
+                expect(serviceResult.dataset).toContain("@Interpolation");
                 interpolationAnalystService.destroy();
                 interpolationKrigingAnalystParameters.destroy();
                 done();
diff --git a/test/leaflet/services/InterpolationAnalysisSpec.js b/test/leaflet/services/InterpolationAnalysisSpec.js
@@ -58,7 +58,8 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.type).toEqual("processCompleted");
                 expect(serviceResult.result).not.toBeNull();
-                expect(serviceResult.result.dataset).toEqual(resultDataset + "@Interpolation");
+                expect(serviceResult.result.dataset).toContain(resultDataset);
+                expect(serviceResult.result.dataset).toContain("@Interpolation");
                 expect(serviceResult.result.succeed).toBe(true);
                 interpolationAnalystService.destroy();
                 done();
@@ -73,7 +74,7 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', function () {
 
     // 删除测试过程中产生的测试数据集
     it('delete test resources', function (done) {
-        var testResult = GlobeParameter.dataspatialAnalystURL+ resultDataset;
+        var testResult = GlobeParameter.dataspatialAnalystURL + resultDataset;
         request.delete(testResult);
         done();
     });
diff --git a/test/mapboxgl/services/InterpolationAnalysisSpec.js b/test/mapboxgl/services/InterpolationAnalysisSpec.js
@@ -46,7 +46,8 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.type).toBe("processCompleted");
                 expect(serviceResult.result.succeed).toEqual(true);
-                expect(serviceResult.result.dataset).toEqual(resultDataset_density + "@Interpolation");
+                expect(serviceResult.result.dataset).toContain(resultDataset_density);
+                expect(serviceResult.result.dataset).toContain("@Interpolation");
                 expect(serviceResult.object.mode).toEqual("Density");
                 done();
             } catch (e) {
@@ -87,7 +88,8 @@ describe('mapboxgl_SpatialAnalystService_interpolationAnalysis', function () {
                 expect(serviceResult).not.toBeNull();
                 expect(serviceResult.type).toBe("processCompleted");
                 expect(serviceResult.result.succeed).toEqual(true);
-                expect(serviceResult.result.dataset).toEqual(resultDataset_IDW_dataset + "@Interpolation");
+                expect(serviceResult.result.dataset).toContain(resultDataset_IDW_dataset);
+                expect(serviceResult.result.dataset).toContain("@Interpolation");
                 expect(serviceResult.object.mode).toEqual("IDW");
                 done();
             } catch (e) {
