【fix】UT review by luoxiao

songyumeng · songyumeng · commit a0fb76bcc473 · 2020-09-16T14:08:22.000+08:00
diff --git a/test/openlayers/mapping/ImageSuperMapRestSpec.js b/test/openlayers/mapping/ImageSuperMapRestSpec.js
@@ -58,7 +58,6 @@ describe('openlayers_ImageSuperMapRest', () => {
                 expect(imageTileOptions.serverType).toBe('ISERVER');
                 expect(imageTileOptions.crossOrigin).toBe('anonymous');
                 expect(imageTileSource).not.toBeNull();
-                expect(imageTileSource.urls.length).toBe(1);
                 done();
             } catch (exception) {
                 console.log("'initialize'案例失败：" + exception.name + ':' + exception.message);
diff --git a/test/openlayers/mapping/TileSuperMapRestSpec.js b/test/openlayers/mapping/TileSuperMapRestSpec.js
@@ -27,7 +27,6 @@ describe('openlayers_TileSuperMapRest', () => {
         var tileSource = new TileSuperMapRest(tileOptions);
         expect(tileSource.options).not.toBeNull();
         expect(tileSource.options.serverType).toBe('ISERVER');
-        expect(tileSource.urls.length).toBe(1);
     });
 
     it('tileUrlFunction', () => {
diff --git a/test/openlayers/overlay/VectorTileSuperMapRestMapboxstyleSpec.js b/test/openlayers/overlay/VectorTileSuperMapRestMapboxstyleSpec.js
@@ -3,14 +3,14 @@ import {
 } from '../../../src/openlayers/overlay/VectorTileSuperMapRest';
 import {
     FetchRequest
-} from '../../../src/common/util/FetchRequest';
+} from '@supermap/iclient-common/util/FetchRequest';
 import Map from 'ol/Map';
 import View from 'ol/View';
 import MVT from 'ol/format/MVT';
 import Feature from 'ol/Feature';
 import VectorTileLayer from 'ol/layer/VectorTile';
 
-describe('openlayers_VectorTileSuperMapRest', () => {
+describe('openlayers_VectorTileSuperMapRest_mapboxStyle', () => {
     var url = GlobeParameter.californiaURL
     var originalTimeout;
     var testDiv, map, vectorLayer;
@@ -71,9 +71,9 @@ describe('openlayers_VectorTileSuperMapRest', () => {
                 format: format
             })
         });
-        spyOn(vectorLayer.getSource(), 'tileUrlFunction').and.callThrough();
+        spyOn(vectorLayer.getSource(), 'tileLoadFunction').and.callThrough();
         setTimeout(() => {
-            expect(vectorLayer.getSource().tileUrlFunction.calls.count()).toEqual(8)
+            expect(vectorLayer.getSource().tileLoadFunction.calls.count()).toEqual(4)
             done();
         }, 2000);
         map.addLayer(vectorLayer);
@@ -92,10 +92,10 @@ describe('openlayers_VectorTileSuperMapRest', () => {
                 format: format
             })
         });
-        spyOn(vectorLayer.getSource(), 'tileUrlFunction').and.callThrough();
+        spyOn(vectorLayer.getSource(), 'tileLoadFunction').and.callThrough();
         setTimeout(() => {
             expect(vectorLayer.getSource()._tileUrl).toContain("California");
-            expect(vectorLayer.getSource().tileUrlFunction.calls.count()).toEqual(8)
+            expect(vectorLayer.getSource().tileLoadFunction.calls.count()).toEqual(4)
             done();
         }, 2000);
         map.addLayer(vectorLayer);
diff --git a/test/openlayers/overlay/VectorTileSuperMapRestSpec.js b/test/openlayers/overlay/VectorTileSuperMapRestSpec.js
@@ -50,7 +50,6 @@ describe('openlayers_VectorTileSuperMapRest', () => {
                 expect(vectorTileOptions.serverType).toBe("ISERVER");
                 expect(vectorTileOptions.crossOrigin).toBe("anonymous");
                 expect(vectorTileSource).not.toBeNull();
-                expect(vectorTileSource.urls.length).toBe(1);
                 done();
             } catch (exception) {
                 console.log("'initialize'案例失败：" + exception.name + ":" + exception.message);
diff --git a/test/test-main-openlayers.js b/test/test-main-openlayers.js
@@ -23,7 +23,7 @@ import './openlayers/overlay/MapvSpec.js';
 import './openlayers/overlay/RangeSpec.js';
 import './openlayers/overlay/RankSymbolSpec.js';
 import './openlayers/overlay/UniqueSpec.js';
-import './openlayers/overlay/VectorTileSuperMapRestSpec_mapboxstyle.js';
+import './openlayers/overlay/VectorTileSuperMapRestMapboxstyleSpec.js';
 import './openlayers/overlay/VectorTileSuperMapRestSpec.js';
 import './openlayers/overlay/theme/GeoFeatureSpec.js';
 import './openlayers/overlay/theme/ThemeFeatureSpec.js';
