修改ut，使用spy的方式 review by songyumeng

Author: chenmeiyiSupermap

test/leaflet/services/AddressMatchServiceSpec.js

@@ -1,6 +1,8 @@
 import {addressMatchService} from '../../../src/leaflet/services/AddressMatchService';
 import {GeoCodingParameter} from '../../../src/common/iServer/GeoCodingParameter';
 import {GeoDecodingParameter} from '../../../src/common/iServer/GeoDecodingParameter';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
+
 
 var addressMatchURL = GlobeParameter.addressMatchURL;
 var options = {
@@ -29,7 +31,15 @@ describe('leaflet_AddressMatchService', () => {
             maxReturn: -1
         });
         var geoCodingService = addressMatchService(addressMatchURL, options);
-        geoCodingService.code(geoCodingParams, (result) => {
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+             expect(testUrl).toBe(addressMatchURL + "/geocoding");
+             expect(params).not.toBeNull();
+             expect(options).not.toBeNull();
+             return Promise.resolve(new Response(codeSuccessEscapedJson));
+         }); 
+        
+         geoCodingService.code(geoCodingParams, (result) => {
             serviceResult = result
         });
         setTimeout(() => {
@@ -69,6 +79,14 @@ describe('leaflet_AddressMatchService', () => {
             geoDecodingRadius: 500
         });
         var GeoDecodingService = addressMatchService(addressMatchURL, options);
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            expect(testUrl).toBe(addressMatchURL + "/geodecoding");
+            expect(params).not.toBeNull();
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(decodeSuccessEscapedJson));
+        });
+
         GeoDecodingService.decode(GeoDecodingParams, (result) => {
             serviceResult = result
         });
@@ -107,6 +125,13 @@ describe('leaflet_AddressMatchService', () => {
             maxReturn: -1
         });
         var geoCodingService = addressMatchService(addressMatchURL, options);
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            expect(testUrl).toBe(addressMatchURL + "/geocoding");
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(codeFailEscapedJson));
+        }); 
+
         geoCodingService.code(geoCodingParams, (result) => {
             serviceResult = result
         });
@@ -141,6 +166,13 @@ describe('leaflet_AddressMatchService', () => {
             geoDecodingRadius: 500
         });
         var geoDecodingService = addressMatchService(addressMatchURL, options);
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            expect(testUrl).toBe(addressMatchURL + "/geodecoding");
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(decodeFailEscapedJson));
+        });
+
         geoDecodingService.decode(GeoDecodingParams, (result) => {
             serviceResult = result
         });

test/leaflet/services/BufferAnalysisSpec.js

@@ -8,6 +8,7 @@ import {DataReturnOption} from '../../../src/common/iServer/DataReturnOption';
 import {BufferEndType} from '../../../src/common/REST';
 import {DataReturnMode} from '../../../src/common/REST';
 import request from 'request';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
 
 var spatialAnalystURL = GlobeParameter.spatialAnalystURL_Changchun;
 var options = {
@@ -73,6 +74,15 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
             })
         });
         var bufferAnalystService = spatialAnalystService(spatialAnalystURL, options);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe("POST");
+            expect(testUrl).toBe(spatialAnalystURL + "/geometry/buffer.json?returnContent=true");
+            var expectParams = "{'analystParameter':{'endType':\"ROUND\",'leftDistance':{'exp':null,'value':250},'rightDistance':{'exp':null,'value':250},'semicircleLineSegment':10,'radiusUnit':\"METER\"},'sourceGeometry':{'id':0,'style':null,'parts':[33],'points':[{'id':\"SuperMap.Geometry_38\",'bounds':null,'SRID':null,'x':2823.94,'y':-4690,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_39\",'bounds':null,'SRID':null,'x':3448.94,'y':-4690.301,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_40\",'bounds':null,'SRID':null,'x':3816.561,'y':-3810.125,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_41\",'bounds':null,'SRID':null,'x':3917.383,'y':-3609.158,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_42\",'bounds':null,'SRID':null,'x':3976.983,'y':-3490.291,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_43\",'bounds':null,'SRID':null,'x':4020.004,'y':-4377.027,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_44\",'bounds':null,'SRID':null,'x':4076.265,'y':-4382.939,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_45\",'bounds':null,'SRID':null,'x':4215.049,'y':-4382.333,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_46\",'bounds':null,'SRID':null,'x':4428.156,'y':-4382.285,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_47\",'bounds':null,'SRID':null,'x':4647.579,'y':-4383.017,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_48\",'bounds':null,'SRID':null,'x':4679.707,'y':-4382.898,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_49\",'bounds':null,'SRID':null,'x':4917.462,'y':-4382.635,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_50\",'bounds':null,'SRID':null,'x':5074.019,'y':-4381.833,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_51\",'bounds':null,'SRID':null,'x':5257.042,'y':-4381.031,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_52\",'bounds':null,'SRID':null,'x':5363.785,'y':-4380.717,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_53\",'bounds':null,'SRID':null,'x':5671.717,'y':-4378.794,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_54\",'bounds':null,'SRID':null,'x':5847.521,'y':-4377.97,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_55\",'bounds':null,'SRID':null,'x':5990.637,'y':-4303.528,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_56\",'bounds':null,'SRID':null,'x':6055.343,'y':-4270.072,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_57\",'bounds':null,'SRID':null,'x':6168.913,'y':-4382.389,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_58\",'bounds':null,'SRID':null,'x':6214.183,'y':-4209.927,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_59\",'bounds':null,'SRID':null,'x':6377.789,'y':-4209.142,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_60\",'bounds':null,'SRID':null,'x':6393.692,'y':-4210.142,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_61\",'bounds':null,'SRID':null,'x':6693.989,'y':-4207.45,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_62\",'bounds':null,'SRID':null,'x':6788.392,'y':-4208.45,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_63\",'bounds':null,'SRID':null,'x':6984.304,'y':-4207.21,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_64\",'bounds':null,'SRID':null,'x':7189.183,'y':-4208.296,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_65\",'bounds':null,'SRID':null,'x':7300.505,'y':-4208.296,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_66\",'bounds':null,'SRID':null,'x':7573.056,'y':-4208.803,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_67\",'bounds':null,'SRID':null,'x':7680.977,'y':-4208.804,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_68\",'bounds':null,'SRID':null,'x':7850.593,'y':-4208.393,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_69\",'bounds':null,'SRID':null,'x':8182.656,'y':-4210.533,'tag':null,'type':\"Point\"},{'id':\"SuperMap.Geometry_70\",'bounds':null,'SRID':null,'x':8554.893,'y':-4261.485,'tag':null,'type':\"Point\"}],'type':\"LINE\",'prjCoordSys':{'epsgCode':null}},'sourceGeometrySRID':null}";
+            expect(params).toBe(expectParams);
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(bufferAnalysisByGeometryLEscapedJson));
+        }); 
+
         bufferAnalystService.bufferAnalysis(geoBufferAnalystParams, (result) => {
             serviceResult = result;
         });
@@ -125,6 +135,16 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
             })
         });
         var bufferAnalystService = spatialAnalystService(spatialAnalystURL);
+
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe("POST");
+            expect(testUrl).toBe(spatialAnalystURL + "/datasets/RoadLine2@Changchun/buffer.json?returnContent=true");
+            var expectParams = "{'bufferAnalystParameter':{'endType':\"ROUND\",'leftDistance':{'value':10},'rightDistance':{'value':10},'semicircleLineSegment':10,'radiusUnit':\"METER\"},'filterQueryParameter':{'attributeFilter':\"NAME='团结路'\",'name':null,'joinItems':null,'linkItems':null,'ids':null,'orderBy':null,'groupBy':null,'fields':null},'dataReturnOption':{'expectCount':2000,'dataset':\"bufferAnalystByDatasets_leafletTest\",'dataReturnMode':\"DATASET_ONLY\",'deleteExistResultDataset':true},'isAttributeRetained':true,'isUnion':false}";
+            expect(params).toBe(expectParams);
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(bufferAnalysisByDatasetLEscapedJson));
+        }); 
+
         bufferAnalystService.bufferAnalysis(dsBufferAnalystParameters, (result) => {
             serviceResult = result;
         });
@@ -137,10 +157,4 @@ describe('leaflet_SpatialAnalystService_bufferAnalysis', () => {
         }, 5000);
     });
 
-    // 删除测试过程中产生的测试数据集
-    it('delete test resources', (done) => {
-        var testResult = GlobeParameter.datachangchunURL + resultDataset;
-        request.delete(testResult);
-        done();
-    });
 });

test/leaflet/services/GridCellInfosServiceSpec.js

@@ -1,5 +1,6 @@
 import {gridCellInfosService} from '../../../src/leaflet/services/GridCellInfosService';
 import {GetGridCellInfosParameters} from '../../../src/common/iServer/GetGridCellInfosParameters';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
 
 var url = GlobeParameter.dataServiceURL;
 describe('leaflet_GridCellInfosService', () => {
@@ -17,13 +18,27 @@ describe('leaflet_GridCellInfosService', () => {
         expect(gridCellInfoService.url).toEqual(url);
     });
 
+    
+
     it('getGridCellInfos', () => {
         var params = new GetGridCellInfosParameters({
             dataSourceName: "World",
             datasetName: "WorldEarth",
             X: 4,
             Y: 20
         });
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe("GET");
+            expect(options).not.toBeNull();
+            if (testUrl.indexOf("WorldEarth.json") > 0) {
+                return Promise.resolve(new Response(getDatasetInfoEcapedJson));
+            } else {
+                if (testUrl.indexOf("imageValue.json") > 0) {
+                    return Promise.resolve(new Response(getGridCellInfosEcapedJson));
+                }
+            };
+            return null;
+        });
         gridCellInfosService(url).getGridCellInfos(params, (serviceResult) => {
             expect(serviceResult).not.toBeNull();
             expect(serviceResult.type).toBe("processCompleted");
@@ -39,6 +54,7 @@ describe('leaflet_GridCellInfosService', () => {
             expect(serviceResult.object.dataSourceName).toBe("World");
             expect(serviceResult.object.datasetName).toBe("WorldEarth");
             expect(serviceResult.object.datasetType).toBe("IMAGE");
+            expect(FetchRequest.commit.calls.count()).toEqual(2);
             params.destroy();
         });
     });

test/leaflet/services/InterpolationAnalysisSpec.js

@@ -2,6 +2,7 @@ import {spatialAnalystService} from '../../../src/leaflet/services/SpatialAnalys
 import {InterpolationKrigingAnalystParameters} from '../../../src/common/iServer/InterpolationKrigingAnalystParameters';
 import {PixelFormat} from '../../../src/common/REST';
 import request from 'request';
+import {FetchRequest} from '../../../src/common/util/FetchRequest';
 
 var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
 var options = {
@@ -53,6 +54,14 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', () => {
             bounds: L.bounds([-2640403.63, 1873792.1], [3247669.39, 5921501.4])
         });
         var interpolationAnalystService = spatialAnalystService(spatialAnalystURL, options);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe("POST");
+            expect(testUrl).toBe(spatialAnalystURL + "/datasets/SamplesP@Interpolation/interpolation/kriging.json?returnContent=true");
+            var expectParams = "{'bounds':{'left':-2640403.63,'bottom':1873792.1,'right':3247669.39,'top':5921501.4,'centerLonLat':null},'searchRadius':\"0\",'zValueFieldName':\"AVG_TMP\",'zValueScale':1,'resolution':null,'filterQueryParameter':{'attributeFilter':\"\"},'outputDatasetName':\"Interpolation_UnvsKriging_lfTest\",'outputDatasourceName':\"Interpolation\",'pixelFormat':\"DOUBLE\",'dataset':\"SamplesP@Interpolation\",'inputPoints':null,'InterpolationAnalystType':\"dataset\",'clipParam':null,'type':\"UniversalKriging\",'angle':0,'nugget':0,'range':0,'sill':0,'variogramMode':\"SPHERICAL\",'searchMode':\"KDTREE_FIXED_COUNT\",'mean':null,'exponent':\"EXP1\",'expectedCount':12,'maxPointCountForInterpolation':200,'maxPointCountInNode':50}";
+            expect(params).toBe(expectParams);
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(interpolationUnvsKrigingEscapedJson));
+        }); 
         interpolationAnalystService.interpolationAnalysis(interpolationAnalystParameters, (result) => {
             serviceResult = result;
             try {
@@ -62,7 +71,7 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', () => {
                 expect(serviceResult.result).not.toBeNull();
                 expect(serviceResult.result.dataset).toContain(resultDataset);
                 expect(serviceResult.result.dataset).toContain("@Interpolation");
-                expect(serviceResult.result.succeed).toBe(true);
+                expect(serviceResult.result.succeed).toBe(true); 
                 interpolationAnalystService.destroy();
             } catch (exception) {
                 console.log("'leaflet_interpolationAnalystService_Kriging_Universal'案例失败" + exception.name + ":" + exception.message);
@@ -71,11 +80,4 @@ describe('leaflet_SpatialAnalystService_interpolationAnalysis', () => {
             }
         });
     });
-
-    // 删除测试过程中产生的测试数据集
-    it('delete test resources', (done) => {
-        var testResult = GlobeParameter.dataspatialAnalystURL + resultDataset;
-        request.delete(testResult);
-        done();
-    });
 });

test/mapboxgl/services/AddressMatchServiceSpec.js

@@ -1,6 +1,7 @@
 import {AddressMatchService} from '../../../src/mapboxgl/services/AddressMatchService';
 import {GeoCodingParameter} from '../../../src/common/iServer/GeoCodingParameter';
 import {GeoDecodingParameter} from '../../../src/common/iServer/GeoDecodingParameter';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
 
 var addressMatchURL = GlobeParameter.addressMatchURL;
 describe('mapboxgl_AddressMatchService', () => {
@@ -26,6 +27,15 @@ describe('mapboxgl_AddressMatchService', () => {
             maxReturn: -1
         });
         var service = new AddressMatchService(addressMatchURL);
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+           // expect(testUrl).toBe(addressMatchURL + "/geocoding.json?address=公司&fromIndex=0&toIndex=10&filters=[\"北京市\",\"海淀区\"]&prjCoordSys={epsgcode:4326}&maxReturn=-1");
+            expect(testUrl).toBe(addressMatchURL + "/geocoding");
+            expect(params).not.toBeNull();
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(codeSuccessEscapedJson));
+        }); 
+
         service.code(geoCodingParams, (result) => {
             serviceResult = result;
         });
@@ -64,6 +74,14 @@ describe('mapboxgl_AddressMatchService', () => {
             geoDecodingRadius: 500
         });
         var service = new AddressMatchService(addressMatchURL);
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            // expect(testUrl).toBe(addressMatchURL + "/geodecoding.json?x=116.31740122415627&y=39.92311315752059&fromIndex=0&toIndex=5&filters=[\"北京市\",\"海淀区\"]&prjCoordSys={epsgcode:4326}&maxReturn=-1&geoDecodingRadius=500");
+            expect(testUrl).toBe(addressMatchURL + "/geodecoding");
+            expect(params).not.toBeNull();
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(decodeSuccessEscapedJson));
+        });
+
         service.decode(geoDecodingParams, (result) => {
             serviceResult = result;
         });
@@ -100,6 +118,12 @@ describe('mapboxgl_AddressMatchService', () => {
             maxReturn: -1
         });
         var service = new AddressMatchService(addressMatchURL);
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            // expect(testUrl).toBe(addressMatchURL + "/geocoding.json?fromIndex=0&toIndex=10&filters=[\"北京市\",\"海淀区\"]&prjCoordSys={epsgcode:4326}&maxReturn=-1");
+            expect(testUrl).toBe(addressMatchURL + "/geocoding");
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(codeFailEscapedJson));
+        }); 
         service.code(geoCodingParams, (result) => {
             serviceResult = result;
         });
@@ -132,6 +156,14 @@ describe('mapboxgl_AddressMatchService', () => {
             geoDecodingRadius: 500
         });
         var service = new AddressMatchService(addressMatchURL);
+
+        spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
+            // expect(testUrl).toBe(addressMatchURL + "/geodecoding.json?fromIndex=0&toIndex=5&filters=[\"北京市\",\"海淀区\"]&prjCoordSys={epsgcode:4326}&maxReturn=-1&geoDecodingRadius=500");
+            expect(testUrl).toBe(addressMatchURL + "/geodecoding");
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(decodeFailEscapedJson));
+        });
+
         service.decode(geoDecodingParams, (result) => {
             serviceResult = result;
         });

test/mapboxgl/services/GridCellInfosServiceSpec.js

@@ -1,5 +1,6 @@
-import {GridCellInfosService} from '../../../src/mapboxgl/services/GridCellInfosService';
-import {GetGridCellInfosParameters} from '../../../src/common/iServer/GetGridCellInfosParameters';
+import { GridCellInfosService } from '../../../src/mapboxgl/services/GridCellInfosService';
+import { GetGridCellInfosParameters } from '../../../src/common/iServer/GetGridCellInfosParameters';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
 
 var url = GlobeParameter.dataServiceURL;
 
@@ -24,6 +25,19 @@ describe('mapboxgl_GridCellInfosService', () => {
             Y: 20
         });
         var service = new GridCellInfosService(url);
+        spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params, options) => {
+            expect(method).toBe("GET");
+            expect(options).not.toBeNull();
+            if (testUrl.indexOf("WorldEarth.json") > 0) {
+                return Promise.resolve(new Response(getDatasetInfoEcapedJson));
+            } else {
+                if (testUrl.indexOf("imageValue.json") > 0) {
+                    return Promise.resolve(new Response(getGridCellInfosEcapedJson));
+                }
+            };
+            return null;
+        });
+
         service.getGridCellInfos(getGridCellInfosParam, (result) => {
             serviceResult = result
         });
@@ -42,6 +56,7 @@ describe('mapboxgl_GridCellInfosService', () => {
                 expect(serviceResult.result.column).toEqual(1046);
                 expect(serviceResult.result.row).toEqual(398);
                 expect(serviceResult.result.value).toEqual(12295026);
+                expect(FetchRequest.commit.calls.count()).toEqual(2);
                 done();
             } catch (e) {
                 console.log("'getGridCellInfos'案例失败" + e.name + ":" + e.message);