fix UT; review by qiw

Author: hechangqun

test/common/overlay/KnowledgeGraphSpec.js

@@ -404,13 +404,15 @@ describe('KnowledgeGraph', () => {
  graph.showItem();
  graph.hideItem();
  graph.getHeight();
+ graph.updateGraph(data);
  graph.clear();
  graph.destroy();
  } catch {}
  done();
  });
  it('changeSize', (done) => {
  var graph = new KnowledgeGraph({ nodeLabelMaxWidth: 100 });
+ graph.resize(20, 50);
  expect(graph.changeSize(20, 50)).not.toBeNull();
  done();
  });

test/mapboxgl/overlay/FGBLayerSpec.js

@@ -6,7 +6,7 @@ var fgbUrl = 'base/resources/data/capitals_data20.fgb';
 describe('mapboxgl_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('mapboxgl_FGBLayer', () => {
  center: [0, 0],
  zoom: 3
  });
+ map.on('load', function() {
+ done();
+ });
  });
  beforeEach(() => {
  originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -55,24 +58,22 @@ describe('mapboxgl_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('mapboxgl_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/mapboxgl/overlay/GraphicLayerSpec.js

@@ -195,4 +195,34 @@ describe('mapboxgl_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 mapboxgl.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/ThreeLayerSpec.js

@@ -169,4 +169,21 @@ describe('maplibregl_ThreeLayer', () => {
  threeLayer1.render();
  expect(threeLayer1.draw()).not.toBeNull();
  });
+
+ it('toThreeMesh', () => {
+ var coordinates = [
+ [13.413977, 52.532063],
+ [13.414156, 52.532003],
+ [13.414062, 52.531902],
+ [13.413939, 52.531944],
+ [13.41393, 52.531936],
+ [13.413952, 52.531913],
+ [13.41391, 52.531869],
+ [13.41383, 52.531897],
+ [13.413878, 52.531952],
+ [13.413977, 52.532063]
+ ];
+ var shape = threeLayer.toThreeMesh(coordinates, 10, new THREE.Material(), true);
+ expect(shape).not.toBeNull();
+ });
 });

test/test-main-maplibregl.js

@@ -38,6 +38,9 @@ import './maplibregl/services/DatasourceServiceSpec.js';
 import './maplibregl/services/ImageServiceSpec';
 import './maplibregl/services/ImageCollectionServiceSpec';
 import './maplibregl/services/KnowledgeGraphServiceSpec.js';
+import './maplibregl/services/AreaSolarRadiationServiceSpec.js';
+import './maplibregl/services/NetworkAnalyst3DServiceSpec.js';
+import './maplibregl/services/ChartServiceSpec.js';
 // overlay
 import './maplibregl/overlay/GraphMapSpec';
 import './maplibregl/overlay/HeatMapLayerSpec.js';