修改数据流相关的测试 改成用mock server 代替真实的iserver服务 review by songym

zhushusun · zhushusun · commit ab474960081b · 2018-11-15T14:22:54.000+08:00
diff --git a/src/openlayers/overlay/DataFlow.js b/src/openlayers/overlay/DataFlow.js
@@ -47,16 +47,16 @@ export class DataFlow extends ol.source.Vector {
         this.featureCache = {};
     }
 
-    /**
-     * @function ol.source.DataFlow.prototype.setPrjCoordSys
-     * @description 设置坐标参考系。
-     * @param {Object} prjCoordSys - 参考系。
-     */
-    setPrjCoordSys(prjCoordSys) {
-        this.dataService.setPrjCoordSys(prjCoordSys);
-        this.prjCoordSys = prjCoordSys;
-        return this;
-    }
+    // /**
+    //  * @function ol.source.DataFlow.prototype.setPrjCoordSys
+    //  * @description 设置坐标参考系。
+    //  * @param {Object} prjCoordSys - 参考系。
+    //  */
+    // setPrjCoordSys(prjCoordSys) {
+    //     this.dataService.setPrjCoordSys(prjCoordSys);
+    //     this.prjCoordSys = prjCoordSys;
+    //     return this;
+    // }
 
     /**
      * @function ol.source.DataFlow.prototype.setExcludeField
diff --git a/test/leaflet/overlay/DataFlowLayerSpec.js b/test/leaflet/overlay/DataFlowLayerSpec.js
@@ -1,6 +1,5 @@
 ﻿﻿import { dataFlowService } from '../../../src/leaflet/services/DataFlowService';
 import { dataFlowLayer } from '../../../src/leaflet/overlay/DataFlowLayer';
-import { SecurityManager } from '../../../src/common/security/SecurityManager';
 import { Server } from 'mock-socket';
 var urlDataFlow = "ws:\//localhost:8001/";
 var server;
@@ -53,15 +52,15 @@ describe('leaflet_DataFlowLayer', () => {
 
     });
     afterEach(() => {
+        if (layer) {
+            layer.onRemove(map);
+            layer=null;
+        }
         if (service) {
             service.unSubscribe();
             service.unBroadcast();
             service.destroy();
         }
-        if (layer) {
-            layer.onRemove(map);
-            layer=null;
-        }
         jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
     });
     afterAll(() => {
@@ -71,11 +70,6 @@ describe('leaflet_DataFlowLayer', () => {
         window.document.body.removeChild(testDiv);
     });
 
-    xit('bug', () => {
-        console.log('1、destroy分支走不进去');
-        console.log('2、unBroadcast的if分支条件缺少!');
-    });
-
     it('broadcast_Point', (done) => {
         var broadcast_Point = (flowService) => {
             var feature = {
@@ -102,12 +96,11 @@ describe('leaflet_DataFlowLayer', () => {
                     };
                 }
             });
-            layer.addTo(map);
             service = layer.dataService;
             spyOn(service.dataFlow, '_connect').and.callFake(() => {
                 return new WebSocket(urlDataFlow);
             });
-
+            layer.addTo(map);
             service.initBroadcast();
             service.on('broadcastSocketConnected', (e) => {
                 var dataFlow = service.dataFlow;
@@ -123,6 +116,7 @@ describe('leaflet_DataFlowLayer', () => {
                 expect(layer.options).not.toBeNull();
                 expect(service).not.toBeNull();
                 expect(service._events.broadcastSocketConnected.length).toEqual(1);
+                service.unBroadcast();
                 done();
             }, 4000)
         }
@@ -345,6 +339,7 @@ describe('leaflet_DataFlowLayer', () => {
                     done();
                 }
             });
+            // done();
             layer.dataService.dataFlow.events.triggerEvent('messageSuccessed', e);
         }, 2000)
 
diff --git a/test/mapboxgl/services/DataFlowServiceSpec.js b/test/mapboxgl/services/DataFlowServiceSpec.js
@@ -2,23 +2,38 @@ import mapboxgl from 'mapbox-gl';
 import {
     DataFlowService
 } from '../../../src/mapboxgl/services/DataFlowService';
-import {
-    SecurityManager
-} from '../../../src/common/security/SecurityManager';
 
-var wsHost = "ws:\//" + "54.223.164.155:8800";
-var urlDataFlow = wsHost + "/iserver/services/dataflow/dataflow";
+
+import { Server } from 'mock-socket';
+var urlDataFlow = "ws:\//localhost:8003/";
 describe('mapboxgl_DataFlowService', () => {
     var originalTimeout;
     var service;
-    var token = "15xQ_l77895DvXHYKWPesuU7x0tenRLuYXgjxX4x_s51Wqh9qrQiLuLKudwWWm6vQVTXej2cXEQKcIcFAxxzOw..";
+    var mockServer = new Server(urlDataFlow);
     beforeAll(() => {
-        SecurityManager.registerToken(urlDataFlow, token);
+        var e = {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [0, 0]
+            },
+            "properties": {
+                "id": 1
+            }
+        };
+        mockServer.on('connection', socket => {
+            socket.on('message', () => {
+                console.log("onmessage");
+            });
+            socket.on('close', () => { });
+            socket.send(JSON.stringify(e));
+            socket.close();
+        });
     });
     beforeEach(() => {
         originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
         jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
-        service=null;
+        service = null;
 
     });
     afterEach(() => {
@@ -28,25 +43,10 @@ describe('mapboxgl_DataFlowService', () => {
             service.unBroadcast();
         }
     });
-
-    /* it('initSubscribe', (done) => {
-        var initSubscribeMsg;
-        var service = new DataFlowService(urlDataFlow);
-        service.initSubscribe();
-        service.on('messageSuccessed', (msg) => {
-            initSubscribeMsg = msg;
-            try {
-                expect(service).not.toBeNull();
-                expect(initSubscribeMsg).not.toBeNull();
-                done();
-            } catch (e) {
-                console.log("'initSubscribe'案例失败" + e.name + ":" + e.message);
-                expect(false).toBeTruthy();
-                done();
-            }
-        })
-    }); */
-
+    afterAll(() => {
+        mockServer.stop();
+        mockServer = null;
+    });
 
     it('broadcast_Point', (done) => {
         var broadcast_Point = (flowService) => {
@@ -64,7 +64,7 @@ describe('mapboxgl_DataFlowService', () => {
             };
             flowService.broadcast(feature);
         }
-      
+
         var timer;
         try {
             service = new DataFlowService(urlDataFlow);
@@ -74,7 +74,7 @@ describe('mapboxgl_DataFlowService', () => {
                 expect(dataFlow.CLASS_NAME).toBe("SuperMap.DataFlowService");
                 expect(dataFlow.EVENT_TYPES.length).toEqual(8);
                 expect(dataFlow.broadcastWebSocket.binaryType).toBe("blob");
-                expect(dataFlow.broadcastWebSocket.url).toBe(urlDataFlow + "/broadcast?token=" + token);
+                expect(dataFlow.broadcastWebSocket.url).toBe(urlDataFlow + "broadcast");
                 timer = window.setInterval(broadcast_Point(service), 1000);
             });
             setTimeout(() => {
@@ -109,7 +109,7 @@ describe('mapboxgl_DataFlowService', () => {
             flowService.broadcast(feature);
         }
 
-      
+
         var timer;
         try {
             service = new DataFlowService(urlDataFlow);
@@ -125,7 +125,7 @@ describe('mapboxgl_DataFlowService', () => {
             if (timer) {
                 window.clearInterval(timer);
             }
-           
+
         }
     });
 
@@ -153,7 +153,7 @@ describe('mapboxgl_DataFlowService', () => {
             flowService.broadcast(feature);
         }
 
-      
+
         var timer;
         try {
             service = new DataFlowService(urlDataFlow);
@@ -207,7 +207,7 @@ describe('mapboxgl_DataFlowService', () => {
             };
             flowService.broadcast(feature);
         }
-      
+
         var timer;
         try {
             service = new DataFlowService(urlDataFlow);
@@ -229,20 +229,19 @@ describe('mapboxgl_DataFlowService', () => {
     });
 
     // 设置设置排除字段。
-    /* it('setExcludeField', (done) => {
+    it('initSubscribe,setExcludeField', (done) => {
+        var socket = new WebSocket(urlDataFlow);
         var service = new DataFlowService(urlDataFlow);
-        service.setExcludeField("id"); 
-        service.on('subscribeSuccessed', (e) => {
-            service.setExcludeField("id"); 
-            try {
-                expect(service).not.toBeNull();
-                expect(service.options.excludeField).not.toBeNull();
-                done();
-            } catch(e) {
-                console.log("'setExcludeField'案例失败" + e.name + ":" + e.message);
-                expect(false).toBeTruthy();
-                done();
-            }
+        spyOn(service.dataFlow, '_connect').and.callFake(() => {
+            return socket;
+        });
+        spyOn(socket, "send").and.callFake(() => {
         });
-    }); */
+        service.initSubscribe();
+        setTimeout(() => {
+            service.setExcludeField("id");
+            expect(service).not.toBeNull();
+            done();
+        }, 4000)
+});
 });
diff --git a/test/openlayers/overlay/DataFlowSpec.js b/test/openlayers/overlay/DataFlowSpec.js
