【fix】优化测试

songyumeng · songyumeng · commit 2b5fc5b0d359 · 2020-08-15T19:15:44.000+08:00
diff --git a/test/common/util/FetchRequestSpec.js b/test/common/util/FetchRequestSpec.js
@@ -12,8 +12,8 @@ describe('FetchRequest', () => {
         var url = 'http://test.supermap.io/examples/leaflet/editor.html#addressMatchService';
         var params;
         var options;
-        spyOn(SuperMap.Util.RequestJSONPPromise, 'issue').and.callThrough();
-        setCORS(defaltCors);
+        spyOn(SuperMap.Util.RequestJSONPPromise, 'issue').and.callFake(() => {});
+        setCORS(false);
         FetchRequest.get(url, params, options);
         expect(SuperMap.Util.RequestJSONPPromise.issue).toHaveBeenCalled();
         var paramsde = {
@@ -30,10 +30,10 @@ describe('FetchRequest', () => {
         expect(SuperMap.Util.RequestJSONPPromise.issue.calls.count()).toBe(3);
 
         SuperMap.Util.RequestJSONPPromise.limitLength = 180;
-        spyOn(FetchRequest, '_fetchJsonp').and.callFake(() => {});
+        
         FetchRequest.put(deleteUri, paramsde, options);
         expect(SuperMap.Util.RequestJSONPPromise.issue.calls.count()).toBe(4);
-        setCORS(true);
+        setCORS(defaltCors);
     });
 
     it('Get_arrayObject', () => {
diff --git a/test/leaflet/components/dataservicequery/DataServiceQueryViewSpec.js b/test/leaflet/components/dataservicequery/DataServiceQueryViewSpec.js
@@ -2,6 +2,7 @@
 import { tiledMapLayer } from '../../../../src/leaflet/mapping/TiledMapLayer';
 import { dataServiceQueryView } from '../../../../src/leaflet/components/dataservicequery/DataServiceQueryView'
 import { FetchRequest } from '../../../../src/common/util/FetchRequest';
+import { mockCreateTile } from '../../tool/mock_leaflet';
 import '@geoman-io/leaflet-geoman-free';
 import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
 var map, url = GlobeParameter.WorldURL, testDiv, dataServiceQuery;
@@ -16,6 +17,7 @@ describe('leaflet_DataServiceQuery_DataServiceQueryView', () => {
         testDiv.style.width = "800px";
         testDiv.style.height = "800px";
         document.body.appendChild(testDiv);
+        mockCreateTile();
         map = L.map('map', {
             preferCanvas: true,
             crs: L.CRS.EPSG4326,
diff --git a/test/leaflet/mapping/ImageMapLayerSpec.js b/test/leaflet/mapping/ImageMapLayerSpec.js
@@ -2,6 +2,7 @@ import {imageMapLayer} from '../../../src/leaflet/mapping/ImageMapLayer';
 import {NDVIParameter} from '../../../src/common/iServer/NDVIParameter';
 import {HillshadeParameter} from '../../../src/common/iServer/HillshadeParameter';
 import {getQueryValue} from '../../tool/utils';
+import {mockInitImage} from '../../tool/mock_leaflet';
 
 var url = GlobeParameter.WorldURL;
 describe('leaflet_ImageMapLayer', () => {
@@ -16,6 +17,7 @@ describe('leaflet_ImageMapLayer', () => {
         testDiv.style.width = "500px";
         testDiv.style.height = "500px";
         document.body.appendChild(testDiv);
+        mockInitImage();
         map = L.map('map', {
             center: [0, 0],
             maxZoom: 18,
diff --git a/test/leaflet/mapping/TiledMapLayerSpec.js b/test/leaflet/mapping/TiledMapLayerSpec.js
@@ -2,6 +2,7 @@ import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
 import {NDVIParameter} from '../../../src/common/iServer/NDVIParameter';
 import {HillshadeParameter} from '../../../src/common/iServer/HillshadeParameter';
 import {getQueryValue} from '../../tool/utils';
+import {mockCreateTile} from '../../tool/mock_leaflet';
 
 var url = GlobeParameter.ChinaURL;
 describe('leaflet_TiledMapLayer', () => {
@@ -15,6 +16,7 @@ describe('leaflet_TiledMapLayer', () => {
         testDiv.style.marginTop = "50px";
         testDiv.style.width = "500px";
         testDiv.style.height = "500px";
+        mockCreateTile();
         document.body.appendChild(testDiv);
         map = L.map('map', {
             center: [0, 0],
diff --git a/test/leaflet/mapping/WebMapSpec.js b/test/leaflet/mapping/WebMapSpec.js
@@ -1,5 +1,6 @@
 import {webMap} from '../../../src/leaflet/mapping/WebMap';
 import {FetchRequest} from '../../../src/common/util/FetchRequest';
+import {mockCreateTile} from '../../tool/mock_leaflet';
 
 describe('leaflet_WebMap', () => {
     var originalTimeout;
@@ -15,6 +16,7 @@ describe('leaflet_WebMap', () => {
         testDiv.style.width = "500px";
         testDiv.style.height = "500px";
         window.document.body.appendChild(testDiv);
+        mockCreateTile();
         originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
         jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
     });
diff --git a/test/tool/mock_leaflet.js b/test/tool/mock_leaflet.js
@@ -0,0 +1,25 @@
+export function mockCreateTile() {
+    spyOn(L.TileLayer.prototype, 'createTile').and.callFake(function (coords, done) {
+        var tile = document.createElement('img');
+
+        L.DomEvent.on(tile, 'load', L.Util.bind(this._tileOnLoad, this, done, tile));
+        L.DomEvent.on(tile, 'error', L.Util.bind(this._tileOnError, this, done, tile));
+
+        if (this.options.crossOrigin || this.options.crossOrigin === '') {
+            tile.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;
+        }
+        tile.alt = '';
+        tile.setAttribute('role', 'presentation');
+        this.getTileUrl(coords);
+        return tile;
+    });
+}
+export function mockInitImage() {
+    spyOn(L.ImageOverlay.prototype, '_initImage').and.callFake(function () {
+        this._image = L.DomUtil.create('img');
+        var me = this;
+        setTimeout(function () {
+            me.fire('load', {});
+        }, 1000);
+    });
+}
