[fix]UT

Author: luoxiao-supermap

test/leaflet/overlay/GraphMapSpec.js

@@ -81,4 +81,37 @@ describe('GraphMap leaflet', () => {
       }
     });
   });
+  it('no graph highlight clearHighlight', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((testUrl) => {
+      if (testUrl.includes('/query.json')) {
+        return Promise.resolve(new Response(queryData));
+      }
+      if (testUrl === knowledgegraphURL + '/graphmaps/xxx图谱.json') {
+        expect(testUrl).toBe(knowledgegraphURL + '/graphmaps/xxx图谱.json');
+        return Promise.resolve(new Response(graphmapData));
+      }
+      if (testUrl.includes('/shortestPath.json')) {
+        expect(testUrl).toBe(knowledgegraphURL + '/shortestPath.json?startID=38756&endID=38757');
+        return Promise.resolve(new Response(findShortestPathData));
+      }
+    });
+    var graphMap = new GraphMap(knowledgegraphmapURL, { config: { center: [0, 0] } });
+    graphMap.createGraphMap = () => {};
+
+    graphMap.on('loaded', () => {
+      try {
+        expect(graphMap).not.toBeNull();
+        graphMap.graph = null;
+        const res = graphMap.highlight();
+        const res1 = graphMap.clearHighlight();
+        expect(res).toBeUndefined();
+        expect(res1).toBeUndefined();
+        done();
+      } catch (exception) {
+        console.log("'no graph highlight clearHighlight'案例失败：" + exception.name + ':' + exception.message);
+        expect(false).toBeTruthy();
+        done();
+      }
+    });
+  });
 });

test/mapboxgl/overlay/GraphMapSpec.js

@@ -82,4 +82,34 @@ describe('GraphMap mapboxgl', () => {
       }
     });
   });
+  it('no graph highlight clearHighlight', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((testUrl) => {
+      if (testUrl.includes('/query.json')) {
+        return Promise.resolve(new Response(queryData));
+      }
+      if (testUrl === knowledgegraphURL + '/graphmaps/xxx图谱.json') {
+        expect(testUrl).toBe(knowledgegraphURL + '/graphmaps/xxx图谱.json');
+        return Promise.resolve(new Response(graphmapData));
+      }
+      if (testUrl.includes('/shortestPath.json')) {
+        expect(testUrl).toBe(knowledgegraphURL + '/shortestPath.json?startID=38756&endID=38757');
+        return Promise.resolve(new Response(findShortestPathData));
+      }
+    });
+    var graphMap = new GraphMap(knowledgegraphmapURL, { config: { center: [0, 0] } });
+    graphMap.createGraphMap = () => {};
+    try {
+      expect(graphMap).not.toBeNull();
+      graphMap.graph = null;
+      const res = graphMap.highlight();
+      const res1 = graphMap.clearHighlight();
+      expect(res).toBeUndefined();
+      expect(res1).toBeUndefined();
+      done();
+    } catch (exception) {
+      console.log("'no graph highlight clearHighlight'案例失败：" + exception.name + ':' + exception.message);
+      expect(false).toBeTruthy();
+      done();
+    }
+  });
 });

test/mapboxgl/overlay/L7LayerSpec.js

@@ -8,7 +8,7 @@ var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
 
 describe('mapboxgl L7Layer', () => {
   var originalTimeout;
-  var testDiv, map, getL7Scene, setLayoutProperty;
+  var testDiv, map, getL7Scene, setLayoutProperty, removeLayer;
   var data = [
     {
       id: '5011000000404',
@@ -22,17 +22,16 @@ describe('mapboxgl L7Layer', () => {
   beforeAll((done) => {
     getL7Scene = mapboxgl.Map.prototype.getL7Scene;
     setLayoutProperty = mapboxgl.Map.prototype.setLayoutProperty;
+    removeLayer = mapboxgl.Map.prototype.removeLayer;
     mbglmap.prototype.getL7Scene = getL7Scene;
     mbglmap.prototype.setLayoutProperty = setLayoutProperty;
+
     spyOn(mapboxgl, 'Map').and.callFake(mbglmap);
 
     spyOn(L7, 'PointLayer').and.callFake(mockL7.PointLayer);
     spyOn(L7, 'GeometryLayer').and.callFake(mockL7.GeometryLayer);
     spyOn(L7, 'Scene').and.callFake(mockL7.Scene);
     spyOn(L7, 'Mapbox').and.callFake(mockL7.Mapbox);
-    // Scene = mockL7.Scene;
-    // Mapbox = mockL7.Mapbox;
-    // mapboxgl.Map.prototype.getCRS = () => ({ fromWGS84: (val) => val, getExtent: () => [] });
     testDiv = window.document.createElement('div');
     testDiv.setAttribute('id', 'map');
     testDiv.style.styleFloat = 'left';
@@ -65,6 +64,8 @@ describe('mapboxgl L7Layer', () => {
       center: [112, 37.94],
       zoom: 13
     });
+    map.removeLayer = removeLayer;
+    map.style.removeLayer = () => {};
     map.on('load', function () {
       done();
     });
@@ -86,6 +87,7 @@ describe('mapboxgl L7Layer', () => {
   it('getL7Scene', (done) => {
     map.getL7Scene().then((scene) => {
       expect(scene).not.toBeNull();
+      map.$l7scene = null;
       done();
     });
   });
@@ -108,6 +110,7 @@ describe('mapboxgl L7Layer', () => {
       .color('#4cfd47');
     map.getL7Scene().then((scene) => {
       expect(scene).not.toBeNull();
+      map.$l7scene = null;
       done();
     });
   });
@@ -271,7 +274,6 @@ describe('mapboxgl L7Layer', () => {
     expect(map.style.setLayoutProperty).toHaveBeenCalled();
     expect(layer.animateStatus).toBeFalsy();
 
-
     map.setLayoutProperty(layer.id, 'visibility', 'visible');
     expect(l7Layer.show).toHaveBeenCalled();
     expect(map.style.setLayoutProperty).toHaveBeenCalled();

test/maplibregl/core/UtilSpec.js

@@ -0,0 +1,42 @@
+import { Util } from '../../../src/maplibregl/core/Util';
+
+describe('Util', () => {
+  it('isString', () => {
+    expect(Util.isString('m')).toBeTruthy();
+    expect(Util.isString(5)).toBeFalsy();
+  });
+  it('toSuperMapPoint', () => {
+    expect(Util.toSuperMapPoint([110, 10]).x).toBe(110);
+    expect(Util.toSuperMapPoint({ lng: 110, lat: 10 }).x).toBe(110);
+    expect(Util.toSuperMapPoint({ geometry: { coordinates: [110, 10] } }).x).toBe(110);
+  });
+  it('toGeoJSON', () => {
+    expect(Util.toGeoJSON([{ type: 'Feature', properties: {} }]).type).toBe('FeatureCollection');
+  });
+  it('toProcessingParam', () => {
+    expect(Util.toProcessingParam([[110, 10]]).type).toBe('REGION');
+  });
+  it('isNumber', () => {
+    expect(Util.isNumber(5)).toBeTruthy();
+    expect(Util.isNumber(isNaN)).toBeFalsy();
+    expect(Util.isNumber('d')).toBeFalsy();
+    expect(Util.isNumber('5')).toBeTruthy();
+    expect(Util.isNumber('5f')).toBeFalsy();
+    expect(Util.isNumber('')).toBeFalsy();
+  });
+  it('newGuid', () => {
+    expect(Util.newGuid().length).toBe(31);
+    expect(Util.newGuid(6).length).toBe(5);
+  });
+  it('hexToRgba', () => {
+    expect(Util.hexToRgba('#fff', 1)).toBe('rgba(255,255,255,1)');
+    expect(Util.hexToRgba('#ffffff', 1)).toBe('rgba(255,255,255,1)');
+  });
+  it('isMatchAdministrativeName', () => {
+    expect(Util.isMatchAdministrativeName('张家界', '张家界市')).toBeTruthy();
+    expect(Util.isMatchAdministrativeName('张家口', '张家界市')).toBeFalsy();
+    expect(Util.isMatchAdministrativeName('张家口', '张家口市')).toBeTruthy();
+    expect(Util.isMatchAdministrativeName('北京', '北京市')).toBeTruthy();
+    expect(Util.isMatchAdministrativeName('北京', null)).toBeFalsy();
+  });
+});

test/maplibregl/overlay/GraphMapSpec.js

@@ -81,4 +81,37 @@ describe('GraphMap maplibregl', () => {
       }
     });
   });
+  it('no graph highlight clearHighlight', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((testUrl) => {
+      if (testUrl.includes('/query.json')) {
+        return Promise.resolve(new Response(queryData));
+      }
+      if (testUrl === knowledgegraphURL + '/graphmaps/xxx图谱.json') {
+        expect(testUrl).toBe(knowledgegraphURL + '/graphmaps/xxx图谱.json');
+        return Promise.resolve(new Response(graphmapData));
+      }
+      if (testUrl.includes('/shortestPath.json')) {
+        expect(testUrl).toBe(knowledgegraphURL + '/shortestPath.json?startID=38756&endID=38757');
+        return Promise.resolve(new Response(findShortestPathData));
+      }
+    });
+    var graphMap = new GraphMap(knowledgegraphmapURL, { config: { center: [0, 0] } });
+    graphMap.createGraphMap = () => {};
+
+    graphMap.on('loaded', () => {
+      try {
+        expect(graphMap).not.toBeNull();
+        graphMap.graph = null;
+        const res = graphMap.highlight();
+        const res1 = graphMap.clearHighlight();
+        expect(res).toBeUndefined();
+        expect(res1).toBeUndefined();
+        done();
+      } catch (exception) {
+        console.log("'no graph highlight clearHighlight'案例失败：" + exception.name + ':' + exception.message);
+        expect(false).toBeTruthy();
+        done();
+      }
+    });
+  });
 });

test/maplibregl/overlay/L7LayerSpec.js

@@ -8,7 +8,7 @@ var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
 
 describe('maplibregl L7Layer', () => {
   var originalTimeout;
-  var testDiv, map, getL7Scene, setLayoutProperty;
+  var testDiv, map, getL7Scene, setLayoutProperty,removeLayer;
   var data = [
     {
       id: '5011000000404',
@@ -22,7 +22,9 @@ describe('maplibregl L7Layer', () => {
   beforeAll((done) => {
     getL7Scene = maplibregl.Map.prototype.getL7Scene;
     setLayoutProperty = maplibregl.Map.prototype.setLayoutProperty;
+    removeLayer = maplibregl.Map.prototype.removeLayer;
     mbglmap.prototype.getL7Scene = getL7Scene;
+
     spyOn(maplibregl, 'Map').and.callFake(mbglmap);
 
     spyOn(L7, 'PointLayer').and.callFake(mockL7.PointLayer);
@@ -62,6 +64,8 @@ describe('maplibregl L7Layer', () => {
       center: [112, 37.94],
       zoom: 13
     });
+    map.removeLayer = removeLayer;
+    map.style.removeLayer = () => {};
     map.on('load', function () {
       done();
     });
@@ -82,6 +86,7 @@ describe('maplibregl L7Layer', () => {
   it('getL7Scene', (done) => {
     map.getL7Scene().then((scene) => {
       expect(scene).not.toBeNull();
+      map.$l7scene = null;
       done();
     });
   });
@@ -103,6 +108,7 @@ describe('maplibregl L7Layer', () => {
       .color('#4cfd47');
     map.getL7Scene().then((scene) => {
       expect(scene).not.toBeNull();
+      map.$l7scene = null;
       done();
     });
   });

test/openlayers/overlay/GraphMapSpec.js

@@ -81,4 +81,37 @@ describe('GraphMap openlayers', () => {
       }
     });
   });
+  it('no graph highlight clearHighlight', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((testUrl) => {
+      if (testUrl.includes('/query.json')) {
+        return Promise.resolve(new Response(queryData));
+      }
+      if (testUrl === knowledgegraphURL + '/graphmaps/xxx图谱.json') {
+        expect(testUrl).toBe(knowledgegraphURL + '/graphmaps/xxx图谱.json');
+        return Promise.resolve(new Response(graphmapData));
+      }
+      if (testUrl.includes('/shortestPath.json')) {
+        expect(testUrl).toBe(knowledgegraphURL + '/shortestPath.json?startID=38756&endID=38757');
+        return Promise.resolve(new Response(findShortestPathData));
+      }
+    });
+    var graphMap = new GraphMap(knowledgegraphmapURL, { config: { center: [0, 0] } });
+    graphMap.createGraphMap = () => {};
+
+    graphMap.on('loaded', () => {
+      try {
+        expect(graphMap).not.toBeNull();
+        graphMap.graph = null;
+        const res = graphMap.highlight();
+        const res1 = graphMap.clearHighlight();
+        expect(res).toBeUndefined();
+        expect(res1).toBeUndefined();
+        done();
+      } catch (exception) {
+        console.log("'no graph highlight clearHighlight'案例失败：" + exception.name + ':' + exception.message);
+        expect(false).toBeTruthy();
+        done();
+      }
+    });
+  });
 });

test/test-main-maplibregl.js

@@ -1,5 +1,6 @@
 
 import './maplibregl/core/MapExtendSpec.js';
+import './maplibregl/core/UtilSpec.js';
 
 /*maplibregl -- services*/
 import './maplibregl/services/AddressMatchServiceSpec.js';

test/tool/mock_l7.js

@@ -1,23 +1,42 @@
-const Scene = () => {
-  return {
-    removeAllLayer: () => {},
-    layerService: {
+class Scene {
+  constructor() {
+    this.layerService = {
       renderLayer: () => {},
       stopAnimate: () => true,
       startAnimate: () => true
-    },
-    getLayer: () => true,
-    addLayer: () => true,
-    removeLayer: () => true,
-    on: (type, callback) => {
-      callback();
-    },
-    addMarkerLayer: () => true,
-    removeMarkerLayer: () => true,
-    addImage: () => true,
-    hasImage: () => false
-  };
-};
+    };
+    this.callbacks = {}
+  }
+  removeAllLayer() {}
+  getLayer() {
+    return true;
+  }
+  addLayer() {
+    return true;
+  }
+  removeLayer() {
+    return true;
+  }
+  on(type, callback) {
+    this.callbacks[type] = callback;
+    callback()
+  }
+  emit(type) {
+    this.callbacks[type]();
+  }
+  addMarkerLayer() {
+    return true;
+  }
+  removeMarkerLayer() {
+    return true;
+  }
+  addImage() {
+    return true;
+  }
+  hasImage() {
+    return false;
+  }
+}
 const Mapbox = ({ mapInstance }) => {
   return mapInstance;
 };
@@ -27,6 +46,9 @@ const Maplibre = ({ mapInstance }) => {
 class Layer {
   constructor() {
     this.animateStatus = false;
+    this.layerModel = {
+      spriteAnimate: false
+    };
   }
   source() {
     return this;
@@ -50,7 +72,13 @@ class Layer {
   filter() {
     return this;
   }
-  shape() {
+  shape(type) {
+    this.shape = type;
+    if (this.shape === 'sprite') {
+      this.layerModel = {
+        spriteAnimate: true
+      };
+    }
     return this;
   }
   active() {