【fix】fix UT review by luoxiao

songyumeng · songyumeng · commit 2409c48a9124 · 2021-06-10T21:56:29.000+08:00
diff --git a/src/leaflet/control/ChangeTileVersion.js b/src/leaflet/control/ChangeTileVersion.js
@@ -146,7 +146,7 @@ export var ChangeTileVersion = L.Control.extend({
      * @param {number} tileVersions - 待更新的切片版本号。
      */
     update: function (tileVersions) {
-        this.tileVersions = tileVersions;
+        this.tileVersions = tileVersions || [];
         this.updateLength(this.tileVersions.length);
     },
 
diff --git a/src/mapboxgl/mapping/WebMap.js b/src/mapboxgl/mapping/WebMap.js
@@ -1999,7 +1999,7 @@ export class WebMap extends mapboxgl.Evented {
 					allFeatures[i].properties.lat = coordinate[1];
 				}
 			}
-			features.properties['index'] = i + '';
+			feature.properties['index'] = i + '';
 			features.push(feature);
 		}
 		return features;
diff --git a/src/openlayers/control/ChangeTileVersion.js b/src/openlayers/control/ChangeTileVersion.js
@@ -345,7 +345,7 @@ export class ChangeTileVersion extends Control {
      * @param {Object} tileVersions - 待更新的切片版本。
      */
     update(tileVersions) {
-        this.tileVersions = tileVersions;
+        this.tileVersions = tileVersions ||[];
         this.updateLength(this.tileVersions.length);
     }
 
diff --git a/test/common/iServer/TilesetsServiceSpec.js b/test/common/iServer/TilesetsServiceSpec.js
@@ -70,10 +70,10 @@ describe('TilesetsService', () => {
             expect(analyseResult.length).toEqual(1);
             expect(analyseResult[0].name).toBe("smtiles_tileset_1116742863");
             expect(analyseResult[0].metaData.mapName).toBe("长春市区图");
-            expect(analyseResult[0].metaData.resolutions[0]).toEqual(34.80645971);
-            expect(analyseResult[0].metaData.resolutions[1]).toEqual(17.403229855);
-            expect(analyseResult[0].metaData.scaleDenominators[0]).toEqual(131551.9737070866);
-            expect(analyseResult[0].metaData.scaleDenominators[1]).toEqual(65775.9868535433);
+            expect(analyseResult[0].metaData.resolutions[0]).toBeCloseTo(34.80645971, 0.00001);
+            expect(analyseResult[0].metaData.resolutions[1]).toBeCloseTo(17.403229855, 0.00001);
+            expect(analyseResult[0].metaData.scaleDenominators[0]).toBeCloseTo(131551.973707087, 0.00001);
+            expect(analyseResult[0].metaData.scaleDenominators[1]).toBeCloseTo(65775.9868535433, 0.00001);
             expect(analyseResult[0].metaData.tileFormat).toBe("PNG");
             expect(analyseResult[0].metaData.tileType).toBe("Image");
             expect(analyseResult[0].metaData.tileHeight).toEqual(256);
@@ -85,7 +85,7 @@ describe('TilesetsService', () => {
         spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
             expect(method).toBe('GET');
             expect(testUrl).toBe(tileSetsURL + "/tilesets");
-            return Promise.resolve(new Response(tilesetsEscapedJson));
+            return Promise.resolve(new Response(JSON.stringify(tilesetsEscapedJson)));
         });
         tilesetsService.processAsync();
     });
diff --git a/test/leaflet/control/ChangeTileVersionSpec.js b/test/leaflet/control/ChangeTileVersionSpec.js
@@ -1,6 +1,7 @@
 import {changeTileVersion} from '../../../src/leaflet/control/ChangeTileVersion';
 import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
 import {FetchRequest} from '../../../src/common/util/FetchRequest';
+import { mockCreateTile } from '../../tool/mock_leaflet';
 
 var url = GlobeParameter.ChinaProvincesURL;
 describe('leaflet_ChangeTileVersion', () => {
@@ -15,14 +16,15 @@ describe('leaflet_ChangeTileVersion', () => {
         testDiv.style.width = "500px";
         testDiv.style.height = "500px";
         document.body.appendChild(testDiv);
+        mockCreateTile()
         map = L.map('map', {
             crs: L.CRS.EPSG4326,
             center: [33.03, 104.79],
             zoom: 3,
         });
         spyOn(FetchRequest, 'get').and.callFake((testUrl, params) => {
             if(testUrl.indexOf('ChinaProvinces/tilesets')>-1){
-                return Promise.resolve(new Response(tilesetsEscapedJson));
+                return Promise.resolve(new Response(JSON.stringify(tilesetsEscapedJson)));
             }
             return Promise.resolve();
         });
diff --git a/test/mapboxgl/mapping/WebMapSpec.js b/test/mapboxgl/mapping/WebMapSpec.js
@@ -516,7 +516,7 @@ describe('mapboxgl_WebMap', () => {
             return Promise.resolve();
         });
         spyOn(FetchRequest, 'post').and.callFake((url) => {
-            if (url.indexOf('queryResults.json') > -1) {
+            if (url.indexOf('queryResults') > -1) {
                 return Promise.resolve(new Response(supermapRestData));
             }
             return Promise.resolve();
diff --git a/test/resources/tilesets.js b/test/resources/tilesets.js

Original file line number	Diff line number	Diff line change
`@@ -1999,7 +1999,7 @@ export class WebMap extends mapboxgl.Evented {`
`1999`	`1999`	`allFeatures[i].properties.lat = coordinate[1];`
`2000`	`2000`	`}`
`2001`	`2001`	`}`
`2002`		`- features.properties['index'] = i + '';`
	`2002`	`+ feature.properties['index'] = i + '';`
`2003`	`2003`	`features.push(feature);`
`2004`	`2004`	`}`
`2005`	`2005`	`return features;`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ export class ChangeTileVersion extends Control {`
`345`	`345`	`* @param {Object} tileVersions - 待更新的切片版本。`
`346`	`346`	`*/`
`347`	`347`	`update(tileVersions) {`
`348`		`- this.tileVersions = tileVersions;`
	`348`	`+ this.tileVersions = tileVersions \|\|[];`
`349`	`349`	`this.updateLength(this.tileVersions.length);`
`350`	`350`	`}`
`351`	`351`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ describe('mapboxgl_WebMap', () => {`
`516`	`516`	`return Promise.resolve();`
`517`	`517`	`});`
`518`	`518`	`spyOn(FetchRequest, 'post').and.callFake((url) => {`
`519`		`- if (url.indexOf('queryResults.json') > -1) {`
	`519`	`+ if (url.indexOf('queryResults') > -1) {`
`520`	`520`	`return Promise.resolve(new Response(supermapRestData));`
`521`	`521`	`}`
`522`	`522`	`return Promise.resolve();`