【update】 更新部分测试 review by songym

liqian7 · liqian7 · commit cd30394b724d · 2019-09-06T16:16:13.000+08:00
diff --git a/test/common/iServer/QueryByDistanceServiceSpec.js b/test/common/iServer/QueryByDistanceServiceSpec.js
@@ -27,6 +27,21 @@ describe('QueryByBoundsService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var queryByDistanceService = new QueryByDistanceService(GlobeParameter.mapServiceURL + "World Map", { headers: myHeaders });
+        expect(queryByDistanceService).not.toBeNull();
+        expect(queryByDistanceService.headers).not.toBeNull();
+        queryByDistanceService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var queryByDistanceService = new QueryByDistanceService(GlobeParameter.mapServiceURL + "World Map", { crossOrigin: false });
+        expect(queryByDistanceService).not.toBeNull();
+        expect(queryByDistanceService.crossOrigin).toBeFalsy();
+        queryByDistanceService.destroy();
+    });
+
     it('constructor, destroy', () => {
         var worldMapURL = GlobeParameter.mapServiceURL + "World Map";
         var QueryByDistanceFailed = (serviceFailedEventArgs) => {
diff --git a/test/common/iServer/QueryByGeometryServiceSpec.js b/test/common/iServer/QueryByGeometryServiceSpec.js
@@ -30,6 +30,21 @@ describe('QueryByGeometryService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var queryByGeometryService = new QueryByGeometryService(GlobeParameter.mapServiceURL + "World Map", { headers: myHeaders });
+        expect(queryByGeometryService).not.toBeNull();
+        expect(queryByGeometryService.headers).not.toBeNull();
+        queryByGeometryService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var queryByGeometryService = new QueryByGeometryService(GlobeParameter.mapServiceURL + "World Map", { crossOrigin: false });
+        expect(queryByGeometryService).not.toBeNull();
+        expect(queryByGeometryService.crossOrigin).toBeFalsy();
+        queryByGeometryService.destroy();
+    });
+
     it('constructor, destroy', () => {
         var worldMapURL = GlobeParameter.mapServiceURL + "World Map";
         var QueryByGeometryServiceFailed = (serviceFailedEventArgs) => {
diff --git a/test/common/iServer/QueryBySQLServiceSpec.js b/test/common/iServer/QueryBySQLServiceSpec.js
@@ -23,6 +23,21 @@ describe('testQueryBySQLService_processAsync', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var queryBySQLService = new QueryBySQLService(GlobeParameter.mapServiceURL + "World Map", { headers: myHeaders });
+        expect(queryBySQLService).not.toBeNull();
+        expect(queryBySQLService.headers).not.toBeNull();
+        queryBySQLService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var queryBySQLService = new QueryBySQLService(GlobeParameter.mapServiceURL + "World Map", { crossOrigin: false });
+        expect(queryBySQLService).not.toBeNull();
+        expect(queryBySQLService.crossOrigin).toBeFalsy();
+        queryBySQLService.destroy();
+    });
+
     it('constructor, destroy', () => {
         var worldMapURL = GlobeParameter.mapServiceURL + "World Map";
         var queryBySQLService = initQueryBySQLService(worldMapURL);
diff --git a/test/common/iServer/QueryServiceSpec.js b/test/common/iServer/QueryServiceSpec.js
@@ -10,4 +10,20 @@ describe('QueryService', () => {
         expect(queryServices).not.toBeNull();
         expect(queryServices.url).toEqual(url + "/queryResults.json?");
     });
+
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var queryService = new QueryService(url, { headers: myHeaders });
+        expect(queryService).not.toBeNull();
+        expect(queryService.headers).not.toBeNull();
+        queryService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var queryService = new QueryService(url, { crossOrigin: false });
+        expect(queryService).not.toBeNull();
+        expect(queryService.crossOrigin).toBeFalsy();
+        queryService.destroy();
+    });
+
 });
diff --git a/test/common/iServer/RouteCalculateMeasureServiceSpec.js b/test/common/iServer/RouteCalculateMeasureServiceSpec.js
@@ -26,6 +26,21 @@ describe('RouteCalculateMeasureService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var routeCalculateMeasureService = new RouteCalculateMeasureService(GlobeParameter.spatialAnalystURL, { headers: myHeaders });
+        expect(routeCalculateMeasureService).not.toBeNull();
+        expect(routeCalculateMeasureService.headers).not.toBeNull();
+        routeCalculateMeasureService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var routeCalculateMeasureService = new RouteCalculateMeasureService(GlobeParameter.spatialAnalystURL, { crossOrigin: false });
+        expect(routeCalculateMeasureService).not.toBeNull();
+        expect(routeCalculateMeasureService.crossOrigin).toBeFalsy();
+        routeCalculateMeasureService.destroy();
+    });
+
     it('processAsync', (done) => {
         var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
         var routeCalculateMeasureEventArgsSystem = null, serviceFailedEventArgsSystem = null;
diff --git a/test/common/iServer/RouteLocatorServiceSpec.js b/test/common/iServer/RouteLocatorServiceSpec.js
@@ -26,6 +26,21 @@ describe('RouteLocatorService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var routeLocatorService = new RouteLocatorService(GlobeParameter.spatialAnalystURL, { headers: myHeaders });
+        expect(routeLocatorService).not.toBeNull();
+        expect(routeLocatorService.headers).not.toBeNull();
+        routeLocatorService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var routeLocatorService = new RouteLocatorService(GlobeParameter.spatialAnalystURL, { crossOrigin: false });
+        expect(routeLocatorService).not.toBeNull();
+        expect(routeLocatorService.crossOrigin).toBeFalsy();
+        routeLocatorService.destroy();
+    });
+
     it('processAsync_RouteLocatorPoint', (done) => {
         var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
         var routeLocatorCompleted = (routeLocatorEventArgs) => {
diff --git a/test/common/iServer/SetLayerInfoServiceSpec.js b/test/common/iServer/SetLayerInfoServiceSpec.js
@@ -26,6 +26,21 @@ describe('SetLayerInfoService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var setLayerInfoService = new SetLayerInfoService(url, { headers: myHeaders });
+        expect(setLayerInfoService).not.toBeNull();
+        expect(setLayerInfoService.headers).not.toBeNull();
+        setLayerInfoService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var setLayerInfoService = new SetLayerInfoService(url, { crossOrigin: false });
+        expect(setLayerInfoService).not.toBeNull();
+        expect(setLayerInfoService.crossOrigin).toBeFalsy();
+        setLayerInfoService.destroy();
+    });
+
     //新建临时图层
     it('setNewTempLayer', (done) => {
         var layersInformation = layersInfo;
diff --git a/test/common/iServer/SetLayerStatusServiceSpec.js b/test/common/iServer/SetLayerStatusServiceSpec.js
@@ -26,6 +26,21 @@ describe('SetLayerStatusService_processAsync', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var setLayerStatusService = new SetLayerStatusService(GlobeParameter.WorldURL, { headers: myHeaders });
+        expect(setLayerStatusService).not.toBeNull();
+        expect(setLayerStatusService.headers).not.toBeNull();
+        setLayerStatusService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var setLayerStatusService = new SetLayerStatusService(GlobeParameter.WorldURL, { crossOrigin: false });
+        expect(setLayerStatusService).not.toBeNull();
+        expect(setLayerStatusService.crossOrigin).toBeFalsy();
+        setLayerStatusService.destroy();
+    });
+
     it('constructor, destroy', () => {
         var url = GlobeParameter.WorldURL;
         var setLayersStatusEvtArgs = null, setLayersStatusFaildEvtArgs = null;
diff --git a/test/common/iServer/SetLayersInfoServiceSpec.js b/test/common/iServer/SetLayersInfoServiceSpec.js
@@ -26,6 +26,21 @@ describe('SetLayersInfoService', () => {
         setLayersEventArgsSystem = null;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var setLayersInfoService = new SetLayersInfoService("http://supermap:8090/iserver/services/map-world/rest/maps/World", { headers: myHeaders });
+        expect(setLayersInfoService).not.toBeNull();
+        expect(setLayersInfoService.headers).not.toBeNull();
+        setLayersInfoService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var setLayersInfoService = new SetLayersInfoService("http://supermap:8090/iserver/services/map-world/rest/maps/World", { crossOrigin: false });
+        expect(setLayersInfoService).not.toBeNull();
+        expect(setLayersInfoService.crossOrigin).toBeFalsy();
+        setLayersInfoService.destroy();
+    });
+
     //新建临时图层
     it('setNewTempLayer', (done) => {
         var setLayersFailedEventArgsSystem = null, setLayersEventArgsSystem = null;
diff --git a/test/common/iServer/StopQueryServiceSpec.js b/test/common/iServer/StopQueryServiceSpec.js
@@ -24,6 +24,21 @@ describe('StopQueryService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var stopQueryService = new StopQueryService(GlobeParameter.trafficTransferURL, { headers: myHeaders });
+        expect(stopQueryService).not.toBeNull();
+        expect(stopQueryService.headers).not.toBeNull();
+        stopQueryService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var stopQueryService = new StopQueryService(GlobeParameter.trafficTransferURL, { crossOrigin: false });
+        expect(stopQueryService).not.toBeNull();
+        expect(stopQueryService.crossOrigin).toBeFalsy();
+        stopQueryService.destroy();
+    });
+
     it('processAsync_noParams', () => {
         var trafficTransferURL = GlobeParameter.trafficTransferURL;
         var flag=false;
diff --git a/test/common/iServer/SurfaceAnalystServiceSpec.js b/test/common/iServer/SurfaceAnalystServiceSpec.js
@@ -53,6 +53,21 @@ describe('SurfaceAnalystService', () => {
         serviceFailedEventArgsSystem = null;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var surfaceAnalystService = new SurfaceAnalystService("http://supermap:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst", { headers: myHeaders });
+        expect(surfaceAnalystService).not.toBeNull();
+        expect(surfaceAnalystService.headers).not.toBeNull();
+        surfaceAnalystService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var surfaceAnalystService = new SurfaceAnalystService("http://supermap:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst", { crossOrigin: false });
+        expect(surfaceAnalystService).not.toBeNull();
+        expect(surfaceAnalystService.crossOrigin).toBeFalsy();
+        surfaceAnalystService.destroy();
+    });
+
     //点数据集提取等值线
     it('Dataset_ISOLINE', (done) => {
         var spatialAnalystURL = "http://supermap:8090/iserver/services/spatialanalyst-sample/restjsr/spatialanalyst";
diff --git a/test/common/iServer/TerrainCurvatureCalculationServiceSpec.js b/test/common/iServer/TerrainCurvatureCalculationServiceSpec.js
@@ -24,6 +24,22 @@ describe('TerrainCurvatureCalculationService', () => {
     });
 
     var resultDataset = "TerrainCurvature_commonTest";
+
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var terrainCurvatureCalculationService = new TerrainCurvatureCalculationService(GlobeParameter.spatialAnalystURL, { headers: myHeaders });
+        expect(terrainCurvatureCalculationService).not.toBeNull();
+        expect(terrainCurvatureCalculationService.headers).not.toBeNull();
+        terrainCurvatureCalculationService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var terrainCurvatureCalculationService = new TerrainCurvatureCalculationService(GlobeParameter.spatialAnalystURL, { crossOrigin: false });
+        expect(terrainCurvatureCalculationService).not.toBeNull();
+        expect(terrainCurvatureCalculationService.crossOrigin).toBeFalsy();
+        terrainCurvatureCalculationService.destroy();
+    });
+
     //成功事件
     it('success:processAsync', (done) => {
         var spatialAnalystURL = GlobeParameter.spatialAnalystURL;
diff --git a/test/common/iServer/ThemeServiceSpec.js b/test/common/iServer/ThemeServiceSpec.js
@@ -65,6 +65,21 @@ describe('ThemeService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var themeService = new ThemeService(themeURL, { headers: myHeaders });
+        expect(themeService).not.toBeNull();
+        expect(themeService.headers).not.toBeNull();
+        themeService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var themeService = new ThemeService(themeURL, { crossOrigin: false });
+        expect(themeService).not.toBeNull();
+        expect(themeService.crossOrigin).toBeFalsy();
+        themeService.destroy();
+    });
+
     it('processAsync_Range', (done) => {
         var themeService = initThemeService();
         var themeRange = new ThemeRange({
diff --git a/test/common/iServer/ThiessenAnalystServiceSpec.js b/test/common/iServer/ThiessenAnalystServiceSpec.js
@@ -26,6 +26,21 @@ describe('ThiessenAnalystService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var thiessenAnalystService = new ThiessenAnalystService(GlobeParameter.spatialAnalystURL_Changchun, { headers: myHeaders });
+        expect(thiessenAnalystService).not.toBeNull();
+        expect(thiessenAnalystService.headers).not.toBeNull();
+        thiessenAnalystService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var thiessenAnalystService = new ThiessenAnalystService(GlobeParameter.spatialAnalystURL_Changchun, { crossOrigin: false });
+        expect(thiessenAnalystService).not.toBeNull();
+        expect(thiessenAnalystService.crossOrigin).toBeFalsy();
+        thiessenAnalystService.destroy();
+    });
+
     //成功事件 AnalyzeByDatasets
     it('processAsync_byDatasets', (done) => {
         var spatialAnalystURL_Changchun = GlobeParameter.spatialAnalystURL_Changchun;
diff --git a/test/common/iServer/TilesetsServiceSpec.js b/test/common/iServer/TilesetsServiceSpec.js
@@ -22,6 +22,21 @@ describe('TilesetsService', () => {
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
 
+    it('headers', () => {
+        let myHeaders = new Headers();
+        var tilesetsService = new TilesetsService("http://supermap:8090/iserver/services/map-changchun/rest/maps/长春市区图", { headers: myHeaders });
+        expect(tilesetsService).not.toBeNull();
+        expect(tilesetsService.headers).not.toBeNull();
+        tilesetsService.destroy();
+    });
+    
+    it('crossOrigin', () => {
+        var tilesetsService = new TilesetsService("http://supermap:8090/iserver/services/map-changchun/rest/maps/长春市区图", { crossOrigin: false });
+        expect(tilesetsService).not.toBeNull();
+        expect(tilesetsService.crossOrigin).toBeFalsy();
+        tilesetsService.destroy();
+    });
+
     it('constructor, destroy', () => {
         var tileSetsURL = "http://supermap:8090/iserver/services/map-changchun/rest/maps/长春市区图";
         var analyzeFailed = (serviceFailedEventArgs) => {
diff --git a/test/common/iServer/TransferLineSpec.js b/test/common/iServer/TransferLineSpec.js
@@ -19,4 +19,67 @@ describe('TransferLine', () => {
         expect(result2.lineName).toEqual('testLine');
         transferLine.destroy();
     });
+
+    it('lineID', ()=>{
+        var transferLine = new TransferLine({lineID: 1});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.lineID).toEqual(1);
+        transferLine.destroy();
+    })
+
+    it('lineName', ()=>{
+        var transferLine = new TransferLine({lineName: 'testLine'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.lineName).toEqual('testLine');
+        transferLine.destroy();
+    })
+
+    it('lineAliasName', ()=>{
+        var transferLine = new TransferLine({lineAliasName: 'testLineAliasName'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.lineAliasName).toEqual('testLineAliasName');
+        transferLine.destroy();
+    })
+
+    it('startStopIndex', ()=>{
+        var transferLine = new TransferLine({startStopIndex: 1});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.startStopIndex).toEqual(1);
+        transferLine.destroy();
+    })
+
+    it('startStopName', ()=>{
+        var transferLine = new TransferLine({startStopName: 'testStartStopName'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.startStopName).toEqual('testStartStopName');
+        transferLine.destroy();
+    })
+
+    it('startStopAliasName', ()=>{
+        var transferLine = new TransferLine({startStopAliasName: 'testStartStopAliasName'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.startStopAliasName).toEqual('testStartStopAliasName');
+        transferLine.destroy();
+    })
+
+    it('endStopIndex', ()=>{
+        var transferLine = new TransferLine({endStopIndex: 2});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.endStopIndex).toEqual(2);
+        transferLine.destroy();
+    })
+
+    it('endStopName', ()=>{
+        var transferLine = new TransferLine({endStopName: 'testEndStopName'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.endStopName).toEqual('testEndStopName');
+        transferLine.destroy();
+    })
+
+    it('endStopAliasName', ()=>{
+        var transferLine = new TransferLine({endStopAliasName: 'testEndStopAliasName'});
+        expect(transferLine).not.toBeNull();
+        expect(transferLine.endStopAliasName).toEqual('testEndStopAliasName');
+        transferLine.destroy();
+    })
 });
diff --git a/test/common/iServer/TransferPathServiceSpec.js b/test/common/iServer/TransferPathServiceSpec.js
diff --git a/test/common/iServer/TransferSolutionServiceSpec.js b/test/common/iServer/TransferSolutionServiceSpec.js
diff --git a/test/common/iServer/UpdateEdgeWeightServiceSpec.js b/test/common/iServer/UpdateEdgeWeightServiceSpec.js
diff --git a/test/common/iServer/UpdateTurnNodeWeightServiceSpec.js b/test/common/iServer/UpdateTurnNodeWeightServiceSpec.js
diff --git a/test/leaflet/services/QueryBySQLSpec.js b/test/leaflet/services/QueryBySQLSpec.js
diff --git a/test/leaflet/services/ThemeServiceSpec.js b/test/leaflet/services/ThemeServiceSpec.js
diff --git a/test/leaflet/services/ThiessenAnalysisSpec.js b/test/leaflet/services/ThiessenAnalysisSpec.js
diff --git a/test/leaflet/services/TrafficTransferAnalystServiceSpec.js b/test/leaflet/services/TrafficTransferAnalystServiceSpec.js
