fix 补充新代码UT覆盖; review by qiw

Author: hechangqun

src/maplibregl/overlay/ThreeLayer.js

@@ -192,7 +192,7 @@ export class ThreeLayer extends maplibregl.Evented {
  * @returns {(Array.<Array.<number>>)} 新的坐标数组。
  */
  removeDuplicatedCoordinates(coordinates) {
- this.renderer.removeDuplicatedCoordinates(coordinates);
+ return this.renderer.removeDuplicatedCoordinates(coordinates);
  }
 
  /**

test/common/overlay/KnowledgeGraphSpec.js

@@ -87,6 +87,7 @@ describe('KnowledgeGraph', () => {
  graph.setData(data);
  expect(graph).not.toBeNull();
  expect(graph.data).not.toBeNull();
+ expect(graph.getGraph()).not.toBeNull();
  done();
  });
 
@@ -218,144 +219,8 @@ describe('KnowledgeGraph', () => {
  expect(graph.data).not.toBeNull();
  done();
  });
- it('expand collpase hidden Nodes', (done) => {
- var graph = new KnowledgeGraph();
- graph.setData(data);
- graph.handleNodeStatus({});
- graph.handleNodeStatus({ expand: [], collpase: [2], hidden: [] });
- console.log(graph.graphRender.collpasedData['2']);
- graph.handleNodeStatus({ expand: [2], hidden: [] });
- graph.handleNodeStatus({ expand: [2], collpase: [2, 5], hidden: [6] });
- done();
- });
-
- it('collpaseNode', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }],
- edges: [{ source: '2', target: '1' }]
- };
- graph.setData(data);
- graph.collapseNode('1');
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children).toBeUndefined();
- console.log('collpaseNodes4', graph.graphRender.collpasedData);
- graph.expandNode('1');
- done();
- });
- it('collpaseNode1', (done) => {
- var graph = new KnowledgeGraph();
- const data = { nodes: [{ id: '1' }, { id: '2' }], edges: [{ source: '1', target: '2' }] };
- graph.setData(data);
- graph.collapseNode('1');
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children).toBeUndefined();
- done();
- });
- it('collpaseNode2', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }],
- edges: [
- { source: '1', target: '2' },
- { source: '3', target: '2' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- expect(graph.graphRender.collpasedData['1'].length).toBe(0);
- done();
- });
- it('collpaseNode3', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }],
- edges: [
- { source: '1', target: '2' },
- { source: '2', target: '3' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- console.log('collpaseNodes3', graph.graphRender.collpasedData);
- expect(graph.graphRender.collpasedData['1'].length).toBe(0);
- graph.expandNode('1');
- done();
- });
- xit('collpaseNode5', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }],
- edges: [
- { source: '2', target: '1' },
- { source: '2', target: '3' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- console.log('collpaseNodes5', graph.graphRender.collpasedData);
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children.length).toBe(1);
- graph.expandNode('1');
- done();
- });
- xit('collpaseNode6', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }],
- edges: [
- { source: '2', target: '1' },
- { source: '3', target: '2' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- console.log('collpaseNodes6', graph.graphRender.collpasedData, graph.graphRender.collpasedData['1'][0].children);
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children.length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children[0].children).toBeUndefined();
- graph.expandNode('1');
- done();
- });
- xit('collpaseNode7', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }],
- edges: [
- { source: '2', target: '1' },
- { source: '3', target: '2' },
- { source: '3', target: '4' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- console.log('collpaseNodes7', graph.graphRender.collpasedData);
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children).toBeUndefined();
- graph.expandNode('1');
- done();
- });
- xit('collpaseNode8', (done) => {
- var graph = new KnowledgeGraph();
- const data = {
- nodes: [{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }],
- edges: [
- { source: '2', target: '1' },
- { source: '3', target: '2' },
- { source: '4', target: '3' }
- ]
- };
- graph.setData(data);
- graph.collapseNode('1');
- console.log('collpaseNodes8', graph.graphRender.collpasedData);
- expect(graph.graphRender.collpasedData['1'].length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children.length).toBe(1);
- expect(graph.graphRender.collpasedData['1'][0].children).toBeUndefined();
- graph.expandNode('1');
- done();
- });
  it('graph_functions', (done) => {
- var graph = new KnowledgeGraph({ zoom: 7 });
+ var graph = new KnowledgeGraph();
  graph.setData(data);
  expect(graph.getContainer()).not.toBeNull();
  expect(graph.getCanvas()).not.toBeNull();
@@ -366,47 +231,56 @@ describe('KnowledgeGraph', () => {
  expect(graph.getEdgesByNode(node)).not.toBeNull();
  expect(graph.getInEdges(node)).not.toBeNull();
  expect(graph.getOutEdges(node)).not.toBeNull();
- graph.hide(node);
- graph.show(node);
- expect(graph.isVisible(node)).toBe(true);
- expect(graph.getModel(node)).not.toBeNull();
  const edge = graph.find('edge', (res) => res);
  expect(graph.getSourceByEdge(edge)).not.toBeNull();
  expect(graph.getTargetByEdge(edge)).not.toBeNull();
+
  expect(node).not.toBeNull();
  expect(graph.find('node', (res) => res)).not.toBeNull();
  expect(graph.findAll('node', (res) => res)).not.toBeNull();
  expect(graph.findAll('node', (res) => res)).not.toBeNull();
  expect(graph.toDataURL('image')).not.toBeNull();
- expect(graph.getZoom()).toBe(7);
- graph.zoom(5);
- // expect(graph.getZoom()).toBe(5);
- graph.zoomTo(6);
- // expect(graph.getZoom()).toBe(6);
- expect(graph.getGraphCenterPoint()).not.toBeNull();
- graph.setMinZoom(2);
- expect(graph.getMinZoom()).toBe(2);
- graph.setMaxZoom(3);
- expect(graph.getMaxZoom()).toBe(3);
- expect(graph.getWidth()).toBe(450);
  try {
  graph.addItem('node', { id: 'test' });
  graph.removeItem('node', 'test');
  graph.updateItem('1', { id: '1' });
  graph.refreshItem('1');
  graph.refreshPositions();
- graph.on('beforerender', () => {});
- graph.off('beforerender', () => {});
- graph.fitView();
- graph.fitCenter();
- graph.expandNode();
- graph.collapseNode();
- graph.showItem();
- graph.hideItem();
- graph.getHeight();
  graph.clear();
  graph.destroy();
+ graph.on('beforerender', () => {});
+ graph.off('beforerender', () => {});
  } catch {}
  done();
  });
+ it('changeSize', (done) => {
+ var graph = new KnowledgeGraph({ nodeLabelMaxWidth: 100 });
+ expect(graph.changeSize(20,50)).not.toBeNull();
+ done();
+ });
+ it('changeVisibility', (done) => {
+ var graph = new KnowledgeGraph({ nodeLabelMaxWidth: 100 });
+ const item = {
+ changeVisibility: (params) => {
+ expect(params).toBeTrue();
+ done();
+ }
+ }
+ graph.changeVisibility(item, true);
+ });
+ it('nodeLabelOpenEllipsis', (done) => {
+ var graph = new KnowledgeGraph({ nodeLabelMaxWidth: 100 });
+ var result = graph.nodeLabelOpenEllipsis(2);
+ expect(result.length).toBe(0);
+ result = graph.nodeLabelOpenEllipsis(0, ['node']);
+ expect(result.length).toBe(1);
+ result = graph.nodeLabelOpenEllipsis(2, [{
+ labelCfg: {
+ fontSize: 12
+ },
+ label: 'label'
+ }]);
+ expect(result.length).toBe(1);
+ done();
+ });
 });

test/maplibregl/overlay/DeckglLayerSpec.js

@@ -259,4 +259,10 @@ describe('maplibregl_DeckglLayer', () => {
  }, 0)
 
  });
+
+ it('onRemove', (done) => {
+ deckglLayer.onRemove();
+ expect(deckglLayer.data.length).toEqual(0);
+ done();
+ });
 });

test/maplibregl/overlay/FGBLayerSpec.js

@@ -6,7 +6,7 @@ var fgbUrl = 'base/resources/data/capitals_data20.fgb';
 describe('maplibregl_FGBLayer', () => {
  var originalTimeout;
  var testDiv, map;
- beforeAll(() => {
+ beforeAll((done) => {
  testDiv = window.document.createElement('div');
  testDiv.setAttribute('id', 'map');
  testDiv.style.styleFloat = 'left';
@@ -39,6 +39,9 @@ describe('maplibregl_FGBLayer', () => {
  center: [0, 0],
  zoom: 3
  });
+ map.on('load', function() {
+ done();
+ });
  });
  beforeEach(() => {
  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -55,24 +58,22 @@ describe('maplibregl_FGBLayer', () => {
  });
 
  it('load bbox', (done) => {
- map.on('load', () => {
- var count = 0;
- var fgblayer = new FGBLayer({
- url: fgbUrl,
- featureLoader: function (feature) {
- expect(['圣多美', '蒙罗维亚'].includes(feature.properties['CAPITAL'])).toBeTrue();
- count++;
- if (count === 2) {
- done();
- }
- return feature;
+ var count = 0;
+ var fgblayer = new FGBLayer({
+ url: fgbUrl,
+ featureLoader: function (feature) {
+ expect(['圣多美', '蒙罗维亚'].includes(feature.properties['CAPITAL'])).toBeTrue();
+ count++;
+ if (count === 2) {
+ done();
  }
- });
- fgblayer.onAdd(map);
- expect(fgblayer.strategy).toBe('bbox');
- expect(fgblayer).not.toBeNull();
- expect(fgblayer.url).toBe(fgbUrl);
- })
+ return feature;
+ }
+ });
+ fgblayer.onAdd(map);
+ expect(fgblayer.strategy).toBe('bbox');
+ expect(fgblayer).not.toBeNull();
+ expect(fgblayer.url).toBe(fgbUrl);
  });
 
  it('load all', (done) => {
@@ -106,4 +107,25 @@ describe('maplibregl_FGBLayer', () => {
  expect(fgblayer).not.toBeNull();
  expect(fgblayer.url).toBe(fgbUrl);
  });
+
+ it('render moveLayer onRemove setVisibility', (done) => {
+ var fgblayer = new FGBLayer({
+ id: 'FGBLayer_1',
+ url: fgbUrl,
+ extent: [0, 0, 21, 21],
+ featureLoader: function (feature) {
+ expect(feature.properties['CAPITAL']).toBe('圣多美');
+ done();
+ return feature;
+ }
+ });
+ fgblayer.onAdd(map);
+ fgblayer.render();
+ fgblayer.moveLayer('FGBLayer_1', 'simple-tiles');
+ fgblayer.setVisibility(false);
+ expect(fgblayer.map.getLayer(fgblayer.id).getLayoutProperty('visibility')).toBe('none');
+ fgblayer.onRemove();
+ expect(fgblayer).not.toBeNull();
+ });
+
 });

test/maplibregl/overlay/GraphicLayerSpec.js

@@ -195,4 +195,35 @@ describe('maplibregl_GraphicLayer', () => {
  done();
  }, 0);
  });
+
+ it("addTo moveTo onRemove render", (done) => {
+ let graphics = [];
+ for (let i = 0; i < coors.length; i++) {
+ let lngLat = {
+ lng: parseFloat(coors[i][0]),
+ lat: parseFloat(coors[i][1])
+ };
+ graphics.push(new Graphic(lngLat));
+ graphics[i].setId(i);
+ graphics[i].setAttributes({ name: "graphic_" + i });
+ }
+ let graphicLayer1 = new GraphicLayer("graphicLayer1", {
+ graphics: graphics
+ });
+ let map = new maplibregl.Map({
+ container: 'map',
+ style: 'mapbox://styles/mapbox/streets-v9',
+ center: [13.413952, 52.531913],
+ zoom: 16.000000000000004,
+ pitch: 33.2
+ });
+ map.on('load', () => {
+ graphicLayer1.addTo(map);
+ graphicLayer1.render();
+ graphicLayer1.moveTo('test', true);
+ graphicLayer1.onRemove();
+ expect(graphicLayer1.renderer.graphics.length).toEqual(0);
+ done();
+ });
+ });
 });

test/maplibregl/overlay/HeatMapLayerSpec.js

@@ -1,4 +1,6 @@
 import { HeatMapLayer } from '../../../src/maplibregl/overlay/HeatMapLayer';
+import {Bounds} from '../../../src/common/commontypes/Bounds';
+import {LonLat} from '../../../src/common/commontypes/LonLat';
 import maplibregl from 'maplibre-gl';
 import { truncate } from '@turf/turf';
 
@@ -270,4 +272,13 @@ describe('maplibregl_HeatMapLayer', () => {
  done();
  }, 0);
  });
+ it('getPixelXY', () => {
+ let pixelXY = heatLayer.getPixelXY(new LonLat(109, 32));
+ expect(pixelXY).not.toBeNull();
+ });
+ it('updateHeatPoints', () => {
+ let bounds = new Bounds([-180, -90, 180, 90]);
+ heatLayer.updateHeatPoints(bounds);
+ expect(heatLayer.renderer.useRadius).toBe(45);
+ });
 });