【ut】fix ut

Author: xiongjiaojiao

test/mapboxgl/mapping/WebMapSpec.js

@@ -5,7 +5,6 @@ import * as MapManagerUtil from '../../../src/mapboxgl/mapping/webmap/MapManager
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import { ArrayStatistic } from '@supermapgis/iclient-common/util/ArrayStatistic';
 import '../../resources/WebMapV5.js';
-window.jsonsql = { query: () => {} };
 
 describe('mapboxgl_WebMap', () => {
   var originalTimeout, testDiv;
@@ -26,6 +25,7 @@ describe('mapboxgl_WebMap', () => {
     window.document.body.appendChild(testDiv);
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    window.jsonsql = { query: () => {} };
   });
   afterEach(() => {
     if (datavizWebmap && datavizWebmap.map) {
@@ -36,6 +36,7 @@ describe('mapboxgl_WebMap', () => {
     window.document.body.removeChild(testDiv);
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     mapboxgl.CRS = undefined;
+    window.jsonsql = undefined;
   });
   it('initialize_TIANDITU_VEC', (done) => {
     spyOn(FetchRequest, 'get').and.callFake((url) => {

test/maplibregl/mapping/WebMapSpec.js

@@ -5,7 +5,6 @@ import * as MapManagerUtil from '../../../src/maplibregl/mapping/webmap/MapManag
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import { ArrayStatistic } from '@supermapgis/iclient-common/util/ArrayStatistic';
 import '../../resources/WebMapV5.js';
-window.jsonsql = { query: () => {} };
 
 describe('maplibregl_WebMap', () => {
   var originalTimeout, testDiv;
@@ -26,6 +25,7 @@ describe('maplibregl_WebMap', () => {
     window.document.body.appendChild(testDiv);
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    window.jsonsql = { query: () => {} };
   });
   afterEach(() => {
     if (datavizWebmap && datavizWebmap.map) {
@@ -36,6 +36,7 @@ describe('maplibregl_WebMap', () => {
     window.document.body.removeChild(testDiv);
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     maplibregl.CRS = undefined;
+    window.jsonsql = undefined;
   });
   it('initialize_TIANDITU_VEC', (done) => {
     spyOn(FetchRequest, 'get').and.callFake((url) => {

test/maplibregl/mapping/WebMapV2Spec.js

@@ -6,27 +6,6 @@ import { ArrayStatistic } from '@supermapgis/iclient-common/util/ArrayStatistic'
 import { FetchRequest } from '@supermapgis/iclient-common/util/FetchRequest';
 import '../../resources/WebMapV5.js';
 
-window.jsonsql = { query: () => [{}] };
-
-window.canvg = {
-  default: {
-    from: (ctx, url, callback) =>
-      Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
-  }
-};
-
-window.geostats = class {
-  setSerie() {}
-};
-
-window.EchartsLayer = class {
-  constructor() {
-    this.chart = {
-      setOption() {}
-    };
-  }
-};
-
 function DataFlowService(serviceUrl) {
   const dataflowFeature = {
     geometry: {
@@ -327,6 +306,24 @@ describe('maplibregl_WebMapV2', () => {
     window.document.body.appendChild(testDiv);
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    
+    window.jsonsql = { query: () => [{}] };
+    window.canvg = {
+      default: {
+        from: (ctx, url, callback) =>
+          Promise.resolve({ stop: jasmine.createSpy('stop'), start: jasmine.createSpy('start') })
+      }
+    };
+    window.geostats = class {
+      setSerie() {}
+    };
+    window.EchartsLayer = class {
+      constructor() {
+        this.chart = {
+          setOption() {}
+        };
+      }
+    };
   });
   afterEach(() => {
     if (datavizWebmap) {
@@ -340,6 +337,10 @@ describe('maplibregl_WebMapV2', () => {
     window.document.body.removeChild(testDiv);
     jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     maplibregl.CRS = undefined;
+    window.jsonsql = undefined;
+    window.canvg = undefined;
+    window.geostats = undefined;
+    window.EchartsLayer = undefined;
   });
 
   it('test baseLayer layers count maploaded', (done) => {