提交SuperMap#20 ，21，22，24对应的单元测试 review by songym

Author: zhushusun

test/common/iServer/QueryBySQLServiceSpec.js

@@ -1,8 +1,9 @@
-import {QueryBySQLService} from '../../../src/common/iServer/QueryBySQLService';
-import {QueryBySQLParameters} from '../../../src/common/iServer/QueryBySQLParameters';
-import {FilterParameter} from '../../../src/common/iServer/FilterParameter';
-import {GeometryType} from '../../../src/common/REST';
-import {QueryOption} from '../../../src/common/REST';
+import { QueryBySQLService } from '../../../src/common/iServer/QueryBySQLService';
+import { QueryBySQLParameters } from '../../../src/common/iServer/QueryBySQLParameters';
+import { FilterParameter } from '../../../src/common/iServer/FilterParameter';
+import { GeometryType } from '../../../src/common/REST';
+import { QueryOption } from '../../../src/common/REST';
+import { FetchRequest } from '../../../src/common/util/FetchRequest';
 
 var worldMapURL = GlobeParameter.mapServiceURL + "World Map";
 describe('testQueryBySQLService_processAsync', () => {
@@ -298,5 +299,75 @@ describe('testQueryBySQLService_processAsync', () => {
                 done();
             }
         }, 2000);
-    })
+    });
+
+    //测试字段别名 #20
+    it('processAsync_returnFeatureWithFieldCaption:true_#20', (done) => {
+        var queryFailedEventArgs = null, serviceSuccessEventArgs = null;
+        var QueryBySQLFailed = (serviceFailedEventArgs) => {
+            queryFailedEventArgs = serviceFailedEventArgs;
+        };
+        var QueryBySQLCompleted = (queryEventArgs) => {
+            serviceSuccessEventArgs = queryEventArgs;
+        };
+        var options = {
+            eventListeners: {
+                'processFailed': QueryBySQLFailed,
+                'processCompleted': QueryBySQLCompleted
+            }
+        };
+        var queryBySQLService = new QueryBySQLService(worldMapURL, options);
+        var queryBySQLParameters = new QueryBySQLParameters({
+            customParams: null,
+            expectCount: 2,
+            networkType: GeometryType.POINT,
+            queryOption: QueryOption.ATTRIBUTE,
+            queryParams: new Array(new FilterParameter({
+                attributeFilter: "SmID>0",
+                name: "Countries@World"
+            })),
+            returnFeatureWithFieldCaption:true,
+            //returnFeatureWithFieldCaption
+            returnContent: true
+        });
+        queryBySQLParameters.startRecord = 0;
+        queryBySQLParameters.holdTime = 10;
+        queryBySQLParameters.returnCustomResult = false;
+
+        spyOn(FetchRequest, 'post').and.callFake((url, params, options) => {
+            // http://54.223.164.155:8090/iserver/services/map-world/rest/maps/World%20Map/queryResults.json?returnContent=true
+            expect(url).toBe(worldMapURL + "/queryResults.json?returnContent=true");
+            expect(params).not.toBeNull();
+            expect(options).not.toBeNull();
+            return Promise.resolve(new Response(JSON.stringify(queryEscapedJson)));
+        }); 
+
+        queryBySQLService.processAsync(queryBySQLParameters);
+        setTimeout(() => {
+            try {
+                var queryResult = serviceSuccessEventArgs.result.recordsets[0].features;
+                expect(queryResult).not.toBeNull();
+                expect(queryResult.type).toBe("FeatureCollection");
+                expect(queryResult.features.length).toBe(2);
+                expect(queryResult.features[0].properties).not.toBeNull();
+                // queryResult.features[0].properties["COLOR_MAP"]
+                //  console.log("QueryBySQLService_" + queryResult.features[1].properties["COLOR_MAP"]);   
+                expect(queryResult.features[1].properties["ColorIDtest"]).toEqual('1');   
+                queryBySQLService.destroy();
+                queryBySQLParameters.destroy();
+
+                queryFailedEventArgs = null;
+                serviceSuccessEventArgs = null;
+                done();
+            } catch (exception) {
+                expect(false).toBeTruthy();
+                console.log("QueryBySQLService_" + exception.name + ":" + exception.message);
+                queryBySQLService.destroy();
+                queryBySQLParameters.destroy();
+                queryFailedEventArgs = null;
+                serviceSuccessEventArgs = null;
+                done();
+            }
+        }, 4000)
+    });
 });

test/karma.conf.js

@@ -38,11 +38,12 @@ module.exports = function (config) {
             {pattern: '../src/classic/libs/Lang/*.js', include: false},
             {pattern: '../src/classic/theme/default/*.css', include: false},
             /**测试文件**/
-            './test-main-classic.js',
+            // './test-main-classic.js',
 
             /***common的源码***/
             '../src/common/**/*.js',
             /**测试文件**/
+           
             './test-main-common.js',
 
             /***leaflet的源码***/

test/leaflet/overlay/EchartsLayerSpec.js

@@ -1,10 +1,10 @@
-import {echartsLayer} from '../../../src/leaflet/overlay/EChartsLayer';
-import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
+import { echartsLayer } from '../../../src/leaflet/overlay/EChartsLayer';
+import { tiledMapLayer } from '../../../src/leaflet/mapping/TiledMapLayer';
 
 var url = GlobeParameter.imageURL;
 describe('leaflet_EChartsLayer', () => {
     var originalTimeout;
-    var testDiv, map;
+    var testDiv, map, tileLayer;
     beforeAll(() => {
         testDiv = window.document.createElement("div");
         testDiv.setAttribute("id", "map");
@@ -20,7 +20,7 @@ describe('leaflet_EChartsLayer', () => {
             maxZoom: 18,
             zoom: 9
         });
-        tiledMapLayer(url).addTo(map);
+        tileLayer = tiledMapLayer(url).addTo(map);
     });
     beforeEach(() => {
         originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -31,10 +31,12 @@ describe('leaflet_EChartsLayer', () => {
     });
     afterAll(() => {
         window.document.body.removeChild(testDiv);
-        map.remove();
+        if (map != null) {
+            map.remove();
+        }
     });
 
-    it('initialize', () => {
+    it('initialize,#24', (done) => {
         var echartsMapLayer;
         var geoCoordMap = {
             '上海': [121.4648, 31.2891],
@@ -153,40 +155,40 @@ describe('leaflet_EChartsLayer', () => {
             '韶关': [113.7964, 24.7028]
         };
         var BJData = [
-            [{name: '北京'}, {name: '上海', value: 95}],
-            [{name: '北京'}, {name: '广州', value: 90}],
-            [{name: '北京'}, {name: '大连', value: 80}],
-            [{name: '北京'}, {name: '南宁', value: 70}],
-            [{name: '北京'}, {name: '南昌', value: 60}],
-            [{name: '北京'}, {name: '拉萨', value: 50}],
-            [{name: '北京'}, {name: '长春', value: 40}],
-            [{name: '北京'}, {name: '包头', value: 30}],
-            [{name: '北京'}, {name: '重庆', value: 20}],
-            [{name: '北京'}, {name: '常州', value: 10}]
+            [{ name: '北京' }, { name: '上海', value: 95 }],
+            [{ name: '北京' }, { name: '广州', value: 90 }],
+            [{ name: '北京' }, { name: '大连', value: 80 }],
+            [{ name: '北京' }, { name: '南宁', value: 70 }],
+            [{ name: '北京' }, { name: '南昌', value: 60 }],
+            [{ name: '北京' }, { name: '拉萨', value: 50 }],
+            [{ name: '北京' }, { name: '长春', value: 40 }],
+            [{ name: '北京' }, { name: '包头', value: 30 }],
+            [{ name: '北京' }, { name: '重庆', value: 20 }],
+            [{ name: '北京' }, { name: '常州', value: 10 }]
         ];
         var SHData = [
-            [{name: '上海'}, {name: '包头', value: 95}],
-            [{name: '上海'}, {name: '昆明', value: 90}],
-            [{name: '上海'}, {name: '广州', value: 80}],
-            [{name: '上海'}, {name: '郑州', value: 70}],
-            [{name: '上海'}, {name: '长春', value: 60}],
-            [{name: '上海'}, {name: '重庆', value: 50}],
-            [{name: '上海'}, {name: '长沙', value: 40}],
-            [{name: '上海'}, {name: '北京', value: 30}],
-            [{name: '上海'}, {name: '丹东', value: 20}],
-            [{name: '上海'}, {name: '大连', value: 10}]
+            [{ name: '上海' }, { name: '包头', value: 95 }],
+            [{ name: '上海' }, { name: '昆明', value: 90 }],
+            [{ name: '上海' }, { name: '广州', value: 80 }],
+            [{ name: '上海' }, { name: '郑州', value: 70 }],
+            [{ name: '上海' }, { name: '长春', value: 60 }],
+            [{ name: '上海' }, { name: '重庆', value: 50 }],
+            [{ name: '上海' }, { name: '长沙', value: 40 }],
+            [{ name: '上海' }, { name: '北京', value: 30 }],
+            [{ name: '上海' }, { name: '丹东', value: 20 }],
+            [{ name: '上海' }, { name: '大连', value: 10 }]
         ];
         var GZData = [
-            [{name: '广州'}, {name: '福州', value: 95}],
-            [{name: '广州'}, {name: '太原', value: 90}],
-            [{name: '广州'}, {name: '长春', value: 80}],
-            [{name: '广州'}, {name: '重庆', value: 70}],
-            [{name: '广州'}, {name: '西安', value: 60}],
-            [{name: '广州'}, {name: '成都', value: 50}],
-            [{name: '广州'}, {name: '常州', value: 40}],
-            [{name: '广州'}, {name: '北京', value: 30}],
-            [{name: '广州'}, {name: '北海', value: 20}],
-            [{name: '广州'}, {name: '海口', value: 10}]
+            [{ name: '广州' }, { name: '福州', value: 95 }],
+            [{ name: '广州' }, { name: '太原', value: 90 }],
+            [{ name: '广州' }, { name: '长春', value: 80 }],
+            [{ name: '广州' }, { name: '重庆', value: 70 }],
+            [{ name: '广州' }, { name: '西安', value: 60 }],
+            [{ name: '广州' }, { name: '成都', value: 50 }],
+            [{ name: '广州' }, { name: '常州', value: 40 }],
+            [{ name: '广州' }, { name: '北京', value: 30 }],
+            [{ name: '广州' }, { name: '北海', value: 20 }],
+            [{ name: '广州' }, { name: '海口', value: 10 }]
         ];
         var planePath = 'path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z';
         var convertData = (data) => {
@@ -209,26 +211,26 @@ describe('leaflet_EChartsLayer', () => {
         var series = [];
         [['北京', BJData], ['上海', SHData], ['广州', GZData]].forEach((item, i) => {
             series.push({
-                    name: item[0] + ' Top10',
-                    type: 'lines',
-                    coordinateSystem: 'leaflet',
-                    zlevel: 1,
-                    effect: {
-                        show: true,
-                        period: 6,
-                        trailLength: 0.7,
-                        color: '#fff',
-                        symbolSize: 3
-                    },
-                    lineStyle: {
-                        normal: {
-                            color: color[i],
-                            width: 0,
-                            curveness: 0.2
-                        }
-                    },
-                    data: convertData(item[1])
+                name: item[0] + ' Top10',
+                type: 'lines',
+                coordinateSystem: 'leaflet',
+                zlevel: 1,
+                effect: {
+                    show: true,
+                    period: 6,
+                    trailLength: 0.7,
+                    color: '#fff',
+                    symbolSize: 3
+                },
+                lineStyle: {
+                    normal: {
+                        color: color[i],
+                        width: 0,
+                        curveness: 0.2
+                    }
                 },
+                data: convertData(item[1])
+            },
                 {
                     name: item[0] + ' Top10',
                     type: 'lines',
@@ -306,10 +308,33 @@ describe('leaflet_EChartsLayer', () => {
             },
             series: series
         };
+
+        var flag = false;
+        var count = 1;
+        function myself() {
+            flag = true;
+            // console.log('次数： '+count++)
+        };
+        expect(flag).toEqual(false);
         echartsMapLayer = echartsLayer(option).addTo(map);
+        map.on('zoomend', myself);
         expect(echartsMapLayer).not.toBeNull();
         expect(echartsMapLayer._echartsOptions.series.length).toBe(9);
         expect(echartsMapLayer._echartsOptions.series[0].name).toBe("北京 Top10");
         expect(echartsMapLayer._echartsOptions.series[7].name).toBe("广州 Top10");
+        map.removeLayer(echartsMapLayer);
+        expect(flag).toEqual(false);
+        map.setZoom(1);
+        // map.zoomIn(2);
+        setTimeout(() => {
+            try {
+                expect(flag).toEqual(true);
+                done()
+            }
+            catch (exception) {
+                expect(false).toBeTruthy();
+                done();
+            };
+        }, 4000)
     });
 });

test/leaflet/overlay/mapv/MapVRendererSpec.js

@@ -0,0 +1,88 @@
+import { MapVRenderer } from '../../../../src/leaflet/overlay/mapV/MapVRenderer';
+import { mapVLayer } from '../../../../src/leaflet/overlay/MapVLayer';
+import { utilCityCenter, DataSet } from 'mapv';
+
+describe('Leaflet_MapVRender', () => {
+    var originalTimeout;
+    var testDiv, map, layer, renderer;
+    beforeAll(() => {
+        testDiv = document.createElement("div");
+        testDiv.setAttribute("id", "map1");
+        testDiv.style.styleFloat = "left";
+        testDiv.style.marginLeft = "8px";
+        testDiv.style.marginTop = "50px";
+        testDiv.style.width = "500px";
+        testDiv.style.height = "500px";
+        document.body.appendChild(testDiv);
+        map = L.map('map1', {
+            center: [32, 109],
+            zoom: 4,
+        });
+        var randomCount = 2;
+        var data = [];
+        var citys = ["北京", "天津"];
+        // 构造数据
+        while (randomCount--) {
+            var cityCenter = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
+            data.push({
+                geometry: {
+                    type: 'Point',
+                    coordinates: [cityCenter.lng - 2 + Math.random() * 4, cityCenter.lat - 2 + Math.random() * 4]
+                },
+                count: 30 * Math.random()
+            });
+        }
+        var dataSet = new DataSet(data);
+        var options = {
+            fillStyle: 'rgba(55, 50, 250, 0.8)',
+            shadowColor: 'rgba(255, 250, 50, 1)',
+            shadowBlur: 20,
+            max: 100,
+            size: 50,
+            label: {
+                show: true,
+                fillStyle: 'white',
+            },
+            globalAlpha: 0.5,
+            gradient: { 0.25: "rgb(0,0,255)", 0.55: "rgb(0,255,0)", 0.85: "yellow", 1.0: "rgb(255,0,0)" },
+            // draw: 'honeycomb',
+            draw: 'simple',
+            animation: {
+                type: 'time',
+                stepsRange: {
+                    start: 0,
+                    end: 1
+                },
+                trails: 1,
+                duration: 1,
+            }
+        };
+        //创建MapV图层
+        layer = mapVLayer(dataSet, options).addTo(map);
+        renderer = layer.renderer;
+        originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
+    });
+
+    afterAll(() => {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
+        layer.remove();
+        document.body.removeChild(testDiv);
+        map.remove();
+
+    });
+
+    it('initialize,_canvasUpdate_#21', () => {
+        expect(renderer).not.toBeNull();
+        expect(renderer.canvasLayer).not.toBeNull();
+        spyOn(renderer, 'drawContext');
+        renderer._canvasUpdate(1);
+        var args = renderer.drawContext.calls.mostRecent().args[3];
+        expect(args.x).not.toEqual(-1240);
+        expect(args.x).toBeCloseTo(-990, 0);
+        expect(args.y).not.toEqual(385);
+        expect(args.y).toBeCloseTo(635, 2);
+    });
+
+
+})