打开ignore的测试案例，review by songym。ChangeTileVersionSpec本地可以跑过，先打开

zhushusun · zhushusun · commit 62d4d06db276 · 2019-01-16T17:42:13.000+08:00
diff --git a/test/leaflet/control/ChangeTileVersionSpec.js b/test/leaflet/control/ChangeTileVersionSpec.js
@@ -95,7 +95,7 @@ describe('leaflet_ChangeTileVersion', () => {
         expect(tileVersion.tileVersions.length).toEqual(2);
     });
 
-    xit('tilesVersion', () => {
+    it('tilesVersion', () => {
         tileVersion.tilesVersion("0");
         var version = tileVersion.getVersion();
         expect(version).toEqual("0");
diff --git a/test/mapboxgl/overlay/GraphThemeLayerSpec.js b/test/mapboxgl/overlay/GraphThemeLayerSpec.js
@@ -1,5 +1,5 @@
-import {Graph} from '../../../src/mapboxgl/overlay/GraphThemeLayer';
-import {ThemeFeature} from '../../../src/mapboxgl/overlay/theme/ThemeFeature';
+import { Graph } from '../../../src/mapboxgl/overlay/GraphThemeLayer';
+import { ThemeFeature } from '../../../src/mapboxgl/overlay/theme/ThemeFeature';
 import '../../resources/chinaConsumptionLevel';
 import mapboxgl from 'mapbox-gl';
 
@@ -64,13 +64,13 @@ describe('mapboxgl_GraphThemeLayer', () => {
                     width: 240,
                     height: 100,
                     codomain: [0, 40000],               // 允许图表展示的值域范围，此范围外的数据将不制作图表
-                    barStyle: {fillOpacity: 0.7},       // 柱状图中柱条的（表示字段值的图形）样式
-                    barHoverStyle: {fillOpacity: 1},    //  柱条 hover 样式
+                    barStyle: { fillOpacity: 0.7 },       // 柱状图中柱条的（表示字段值的图形）样式
+                    barHoverStyle: { fillOpacity: 1 },    //  柱条 hover 样式
                     xShapeBlank: [10, 10, 10],          // 水平方向上的空白间距参数
                     axisYTick: 4,                       // y 轴刻度数量
                     axisYLabels: ["4万", "3万", "2万", "1万", "0"],          // y 轴标签内容
                     axisXLabels: ["09年", "10年", "11年", "12年", "13年"],   // x 轴标签内容
-                    backgroundStyle: {fillColor: "#CCE8CF"},                // 背景样式
+                    backgroundStyle: { fillColor: "#CCE8CF" },                // 背景样式
                     backgroundRadius: [5, 5, 5, 5],      // 背景框圆角参数
                     //阴影开关 默认是打开
                     showShadow: true,
@@ -151,13 +151,13 @@ describe('mapboxgl_GraphThemeLayer', () => {
                     width: 240,
                     height: 100,
                     codomain: [0, 40000],
-                    barStyle: {fillOpacity: 0.7},
-                    barHoverStyle: {fillOpacity: 1},
+                    barStyle: { fillOpacity: 0.7 },
+                    barHoverStyle: { fillOpacity: 1 },
                     xShapeBlank: [10, 10, 10],
                     axisYTick: 4,
                     axisYLabels: ["4万", "3万", "2万", "1万", "0"],
                     axisXLabels: ["09年", "10年", "11年", "12年", "13年"],
-                    backgroundStyle: {fillColor: "#CCE8CF"},
+                    backgroundStyle: { fillColor: "#CCE8CF" },
                     backgroundRadius: [5, 5, 5, 5],
                     showShadow: true,
                     barShadowStyle: {
@@ -223,12 +223,12 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 }
             });
         var quadrilateral, quadrilateral2;
-        quadrilateral = [{"x": 1, "y": 1}, {"x": 3, "y": 1}, {"x": 6, "y": 4}, {"x": 2, "y": 10}, {"x": 1, "y": 1}];
-        quadrilateral2 = [{"x": 1, "y": 1}, {"x": 3, "y": 1}, {"x": 6, "y": 4}, {"x": 2, "y": 10}, {"x": 1, "y": 1}];
+        quadrilateral = [{ "x": 1, "y": 1 }, { "x": 3, "y": 1 }, { "x": 6, "y": 4 }, { "x": 2, "y": 10 }, { "x": 1, "y": 1 }];
+        quadrilateral2 = [{ "x": 1, "y": 1 }, { "x": 3, "y": 1 }, { "x": 6, "y": 4 }, { "x": 2, "y": 10 }, { "x": 1, "y": 1 }];
         var isQuadrilateralOverLap = graphThemeLayer.isQuadrilateralOverLap(quadrilateral, quadrilateral2);
         expect(isQuadrilateralOverLap).toBeTruthy();
-        var point = {"x": 2, "y": 5};
-        var polygon = [{"x": 1, "y": 1}, {"x": 3, "y": 1}, {"x": 6, "y": 4}, {"x": 2, "y": 10}, {"x": 1, "y": 1}];
+        var point = { "x": 2, "y": 5 };
+        var polygon = [{ "x": 1, "y": 1 }, { "x": 3, "y": 1 }, { "x": 6, "y": 4 }, { "x": 2, "y": 10 }, { "x": 1, "y": 1 }];
         var isPointInPoly = graphThemeLayer.isPointInPoly(point, polygon);
         expect(isPointInPoly).toBeTruthy();
         graphThemeLayer.clear();
@@ -245,13 +245,13 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 width: 240,
                 height: 100,
                 codomain: [0, 40000],
-                barStyle: {fillOpacity: 0.7},
-                barHoverStyle: {fillOpacity: 1},
+                barStyle: { fillOpacity: 0.7 },
+                barHoverStyle: { fillOpacity: 1 },
                 xShapeBlank: [10, 10, 10],
                 axisYTick: 4,
                 axisYLabels: ["4万", "3万", "2万", "1万", "0"],
                 axisXLabels: ["09年", "10年", "11年", "12年", "13年"],
-                backgroundStyle: {fillColor: "#CCE8CF"},
+                backgroundStyle: { fillColor: "#CCE8CF" },
                 backgroundRadius: [5, 5, 5, 5],
                 showShadow: true,
                 barShadowStyle: {
@@ -279,7 +279,7 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 codomain: [0, 40000]
             },
             charts: [1, 2, 3],
-            cache: {'name': 'ONETWO'}
+            cache: { 'name': 'ONETWO' }
         });
         expect(graphThemeLayer.charts.length).toEqual(3);
         expect(graphThemeLayer.cache).toEqual(Object({
@@ -302,13 +302,14 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 codomain: [0, 40000]
             },
             charts: [1, 2, 3],
-            cache: {'name': 'ONETWO'}
+            cache: { 'name': 'ONETWO' }
         });
         expect(graphThemeLayer.visibility).toBeTruthy();
         graphThemeLayer.setVisibility(false);
         expect(graphThemeLayer.visibility).toBeFalsy();
     });
-    xit('moveTo', () => {
+   
+    it('moveTo', () => {
         const graphThemeLayer = new Graph("GraphThemeLayer", "Bar", {
             map: map,
             isOverLay: false,
@@ -319,9 +320,10 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 codomain: [0, 40000]
             },
             charts: [1, 2, 3],
-            cache: {'name': 'ONETWO'}
+            cache: { 'name': 'ONETWO' }
         });
-        map.addLayer(graphThemeLayer);
+        //ThemeLayer 75行已经添加过一次了
+        // map.addLayer(graphThemeLayer);
         const graphThemeLayer2 = new Graph("GraphThemeLayer2", "Bar", {
             map: map,
             isOverLay: false,
@@ -332,13 +334,13 @@ describe('mapboxgl_GraphThemeLayer', () => {
                 codomain: [0, 40000]
             },
             charts: [1, 2, 3],
-            cache: {'name': 'ONETWO'}
+            cache: { 'name': 'ONETWO' }
         });
-        map.addLayer(graphThemeLayer2);
-        const zIndex = graphThemeLayer.div.style.zIndex;
-        const zIndex2 = graphThemeLayer2.div.style.zIndex;
-        expect(zIndex2).toBeGreaterThan(zIndex);
-        graphThemeLayer.moveTo("graphThemeLayer2");
-        expect(zIndex).toBeGreaterThan(zIndex2);
+        //ThemeLayer 75行已经添加过一次了
+        // map.addLayer(graphThemeLayer2);
+        //移动前，第一个layer是第一个
+        expect(graphThemeLayer.div.parentNode.getElementsByClassName("themeLayer")[0].id).toEqual(graphThemeLayer.id);
+        graphThemeLayer2.moveTo(graphThemeLayer.id);
+        expect(graphThemeLayer.div.parentNode.getElementsByClassName("themeLayer")[0].id).toEqual(graphThemeLayer2.id);
     });
 });
diff --git a/test/mapboxgl/services/DensityAnalysisSpec.js b/test/mapboxgl/services/DensityAnalysisSpec.js
@@ -94,10 +94,4 @@ describe('mapboxgl_SpatialAnalystService_densityAnalysis', () => {
         });
     });
 
-    // 删除测试过程中产生的测试数据集
-    xit('delete test resources', (done)=> {
-        var testResult = GlobeParameter.datachangchunURL + resultDataset;
-        request.delete(testResult);
-        done();
-    });
 });
diff --git a/test/mapboxgl/services/LayerInfoServiceSpec.js b/test/mapboxgl/services/LayerInfoServiceSpec.js
@@ -33,9 +33,7 @@ describe('mapboxgl_LayerInfoService', () => {
             return Promise.resolve(new Response("["+JSON.stringify(layersInfo)+"]"));
         });
         service.getLayersInfo((result) => {
-            serviceResult = result
-        });
-        setTimeout(() => {
+            serviceResult = result;
             try {
                 expect(service).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -57,11 +55,12 @@ describe('mapboxgl_LayerInfoService', () => {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 5000)
+        });
+
     });
 
     //子图层显示控制服务
-    it('setLayerStatus', (done) => {
+     it('setLayerStatus', (done) => {
         var layerStatus = [new LayerStatus({
             layerName: "continent_T@World",
             isVisible: true,
@@ -95,8 +94,6 @@ describe('mapboxgl_LayerInfoService', () => {
         });
         layerService.setLayerStatus(setLayerStatusParameters, (result) => {
             serviceResult = result;
-        });
-        setTimeout(() => {
             try {
                 expect(layerService).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -109,7 +106,8 @@ describe('mapboxgl_LayerInfoService', () => {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 5000);
+        });
+
     });
 
     //新建临时图层   isTempLayers=false
@@ -127,9 +125,7 @@ describe('mapboxgl_LayerInfoService', () => {
             return Promise.resolve(new Response(`{"postResultType":"CreateChild","newResourceID":"c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d","succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World/tempLayersSet/c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d.json"}`));
         });
         service.setLayersInfo(setLayersInfoParameters, (result) => {
-            serviceResult = result
-        });
-        setTimeout(() => {
+            serviceResult = result;
             try {
                 expect(service).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -145,7 +141,8 @@ describe('mapboxgl_LayerInfoService', () => {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 5000)
+        });
+
     });
 
     //修改临时图层的信息 isTempLayers=true
@@ -164,9 +161,7 @@ describe('mapboxgl_LayerInfoService', () => {
             return Promise.resolve(new Response(`{"succeed":true}`));
         });
         service.setLayersInfo(setLayersInfoParameters, (result) => {
-            serviceResult = result
-        });
-        setTimeout(() => {
+            serviceResult = result;
             try {
                 expect(service).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -181,11 +176,11 @@ describe('mapboxgl_LayerInfoService', () => {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 5000)
+        });
     });
 
     //设置图层信息服务  并实现临时图层中子图层的修改
-    xit('setLayerInfo', (done) => {
+    it('setLayerInfo', (done) => {
         var layers = layerInfo;
         layers.description = "this is a test";
         var setLayerInfoParameters = new SetLayerInfoParameters({
@@ -194,10 +189,13 @@ describe('mapboxgl_LayerInfoService', () => {
             layerInfo: layers
         });
         var service = new LayerInfoService(url);
-        service.setLayerInfo(setLayerInfoParameters, (result) => {
-            serviceResult = result
+        spyOn(FetchRequest, 'put').and.callFake((testUrl) => {
+            expect(testUrl).toContain("continent_T@World.1@@World.json");
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(`{"succeed":true,"newResourceLocation":"http://localhost:8090/iserver/services/map-world/rest/maps/World Map/tempLayersSet/c01d29d8d41743adb673cd1cecda6ed0_1c0bda07fde943a4a5f3f3d4eb44235d/continent_T@World.1@@World"}`));
         });
-        setTimeout(() => {
+        service.setLayerInfo(setLayerInfoParameters, (result) => {
+            serviceResult = result;
             try {
                 expect(service).not.toBeNull();
                 expect(serviceResult).not.toBeNull();
@@ -212,7 +210,8 @@ describe('mapboxgl_LayerInfoService', () => {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 8000);
+        });
+
     });
 });
                  
diff --git a/test/openlayers/overlay/VectorTileSuperMapRestSpec.js b/test/openlayers/overlay/VectorTileSuperMapRestSpec.js
@@ -57,32 +57,4 @@ describe('openlayers_VectorTileSuperMapRest', () => {
             }
         }, 6000);
     });
-
-    xit('serverType of iportal', () => {
-        var iportaoUrl = "http://support.supermap.com.cn:8092/web/maps/44";
-        var vectorTileOptions, vectorTilesource;
-
-        new MapService(iportaoUrl).getMapInfo((serviceResult) => {
-            vectorTileOptions = VectorTileSuperMapRest.optionsFromMapJSON(iportaoUrl, serviceResult.result);
-            vectorTilesource = new VectorTileSuperMapRest(vectorTileOptions);
-            var vectorLayer = new ol.layer.VectorTile({
-                source: vectorTilesource
-            });
-            map.addLayer(vectorLayer);
-        });
-        setTimeout(() => {
-            try {
-                expect(vectorTileOptions).not.toBeNull();
-                expect(vectorTileOptions.serverType).toBe("IPORTAL");
-                expect(vectorTileOptions.crossOrigin).toBe("anonymous");
-
-                expect(vectorTilesource).not.toBeNull();
-                expect(vectorTilesource.urls.length).toBe(1);
-                done();
-            } catch (exception) {
-                console.log("'constructor and static test'案例失败：" + exception.name + ":" + exception.message);
-                expect(false).toBeTruthy();
-            }
-        }, 6000);
-    });
 });
