Skip to content

Commit cd56c72

Browse files
committed
打开ignore的ut review by songym
1 parent ac32392 commit cd56c72

File tree

1 file changed

+51
-40
lines changed

1 file changed

+51
-40
lines changed

test/leaflet/overlay/DataFlowLayerSpec.js

Lines changed: 51 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import {dataFlowService} from '../../../src/leaflet/services/DataFlowService';
2-
import {dataFlowLayer} from '../../../src/leaflet/overlay/DataFlowLayer';
3-
import {SecurityManager} from '../../../src/common/security/SecurityManager';
4-
import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
1+
import { dataFlowService } from '../../../src/leaflet/services/DataFlowService';
2+
import { dataFlowLayer } from '../../../src/leaflet/overlay/DataFlowLayer';
3+
import { SecurityManager } from '../../../src/common/security/SecurityManager';
4+
import { tiledMapLayer } from '../../../src/leaflet/mapping/TiledMapLayer';
55

66
var wsHost = "ws:\//" + "54.223.164.155:8800";
7-
var urlDataFlow = wsHost + "/iserver/services/dataflow/dataflow";
7+
var urlDataFlow = wsHost + "/iserver/services/dataflowTest/dataflow";
88
var urlMap = "http://54.223.164.155:8090/iserver/services/map-china400/rest/maps/China";
99
describe('leaflet_DataFlowLayer', () => {
1010
var originalTimeout;
1111
var testDiv, map;
12-
var token = "15xQ_l77895DvXHYKWPesuU7x0tenRLuYXgjxX4x_s51Wqh9qrQiLuLKudwWWm6vQVTXej2cXEQKcIcFAxxzOw..";
12+
// var token = "15xQ_l77895DvXHYKWPesuU7x0tenRLuYXgjxX4x_s51Wqh9qrQiLuLKudwWWm6vQVTXej2cXEQKcIcFAxxzOw..";
13+
var token = "0ra2250-rPu6ZnqHPKqcqDjGkDGDv3bg5HHy1SNNXf79OlN0ArG07bq3cGFz0v-nfBm2RAnYJ3LGBsuiptH43g..";
1314
beforeAll(() => {
1415
testDiv = window.document.createElement("div");
1516
testDiv.setAttribute("id", "map");
@@ -28,6 +29,8 @@ describe('leaflet_DataFlowLayer', () => {
2829
zoom: 12
2930
});
3031
tiledMapLayer(urlMap).addTo(map);
32+
33+
3134
});
3235
beforeEach(() => {
3336
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -56,7 +59,7 @@ describe('leaflet_DataFlowLayer', () => {
5659
},
5760
id: 1,
5861
type: "Feature",
59-
properties: {id: 1, time: new Date()}
62+
properties: { id: 1, time: new Date() }
6063
};
6164
flowService.broadcast(feature);
6265
}
@@ -77,6 +80,10 @@ describe('leaflet_DataFlowLayer', () => {
7780
});
7881
layer.addTo(map);
7982
service = dataFlowService(urlDataFlow);
83+
spyOn(service.dataFlow, '_connect').and.callFake(() => {
84+
return new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
85+
});
86+
8087
service.initBroadcast();
8188
service.on('broadcastSocketConnected', (e) => {
8289
var dataFlow = service.dataFlow;
@@ -120,7 +127,7 @@ describe('leaflet_DataFlowLayer', () => {
120127
},
121128
id: 2,
122129
type: "Feature",
123-
properties: {id: 2, time: new Date()}
130+
properties: { id: 2, time: new Date() }
124131
};
125132
flowService.broadcast(feature);
126133
}
@@ -132,6 +139,9 @@ describe('leaflet_DataFlowLayer', () => {
132139
layer = dataFlowLayer(urlDataFlow);
133140
layer.addTo(map);
134141
service = dataFlowService(urlDataFlow);
142+
spyOn(service.dataFlow, '_connect').and.callFake(() => {
143+
return new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
144+
});
135145
service.initBroadcast();
136146
service.on('broadcastSocketConnected', (e) => {
137147
timer = window.setInterval(broadcast_LineString(service), 1000);
@@ -165,7 +175,7 @@ describe('leaflet_DataFlowLayer', () => {
165175
},
166176
id: 3,
167177
type: "Feature",
168-
properties: {id: 3, time: new Date()}
178+
properties: { id: 3, time: new Date() }
169179
};
170180
flowService.broadcast(feature);
171181
}
@@ -177,6 +187,9 @@ describe('leaflet_DataFlowLayer', () => {
177187
layer = dataFlowLayer(urlDataFlow);
178188
layer.addTo(map);
179189
service = dataFlowService(urlDataFlow);
190+
spyOn(service.dataFlow, '_connect').and.callFake(() => {
191+
return new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
192+
});
180193
service.initBroadcast();
181194
service.on('broadcastSocketConnected', (e) => {
182195
timer = window.setInterval(broadcast_Polygon(service), 1000);
@@ -213,7 +226,7 @@ describe('leaflet_DataFlowLayer', () => {
213226
},
214227
id: 4,
215228
type: "Feature",
216-
properties: {id: 4, time: new Date()}
229+
properties: { id: 4, time: new Date() }
217230
};
218231
flowService.broadcast(feature);
219232
}
@@ -225,6 +238,9 @@ describe('leaflet_DataFlowLayer', () => {
225238
layer = dataFlowLayer(urlDataFlow);
226239
layer.addTo(map);
227240
service = dataFlowService(urlDataFlow);
241+
spyOn(service.dataFlow, '_connect').and.callFake(() => {
242+
return new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
243+
});
228244
service.initBroadcast();
229245
service.on('broadcastSocketConnected', (e) => {
230246
timer = window.setInterval(broadcast_MultiPolygon(service), 1000);
@@ -248,7 +264,6 @@ describe('leaflet_DataFlowLayer', () => {
248264
if (layer) {
249265
layer.remove();
250266
}
251-
252267
}
253268
});
254269

@@ -263,71 +278,67 @@ describe('leaflet_DataFlowLayer', () => {
263278
done();
264279
}, 4000)
265280
} finally {
266-
267281
if (layer) {
268282
layer.remove();
269283
}
270-
271284
}
272285
});
273286

274-
xit('setExcludeField', (done) => {
287+
it('setExcludeField', (done) => {
275288
var layer;
289+
var socket = new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
276290
try {
277291
layer = dataFlowLayer(urlDataFlow);
278-
layer.addTo(map);
279-
layer.setExcludeField("id");
292+
var dataService = new dataFlowService(urlDataFlow, null)
293+
spyOn(dataService.dataFlow, '_connect').and.callFake(() => {
294+
return socket;
295+
});
296+
spyOn(socket, "send").and.callFake(() => {
297+
298+
});
299+
layer.dataService = dataService.initSubscribe();
280300
setTimeout(() => {
301+
layer.setExcludeField("id");
281302
expect(layer).not.toBeNull();
282303
done();
283304
}, 4000)
284-
} finally {
305+
} catch (e) {
306+
console.log(e);
307+
}
308+
finally {
285309
if (layer) {
286310
layer.remove();
287311
}
288-
289312
}
290313
});
291314

292-
xit('setGeometry', (done) => {
315+
it('setGeometry', (done) => {
293316
var layer;
317+
var socket = new WebSocket(urlDataFlow + '/broadcast' + "?token=" + token);
294318
try {
295319
layer = dataFlowLayer(urlDataFlow);
296-
layer.addTo(map);
320+
var dataService = new dataFlowService(urlDataFlow, null)
321+
spyOn(dataService.dataFlow, '_connect').and.callFake(() => {
322+
return socket;
323+
});
324+
spyOn(socket, "send").and.callFake(() => {
325+
});
326+
layer.dataService = dataService.initSubscribe();
297327
var geometry = {
298328
coordinates: [[[116.381741960923, 39.8765100055449], [116.414681699817, 39.8765100055449], [116.414681699817, 39.8415115329708], [116.381741960923, 39.8415115329708], [116.381741960923, 39.8765100055449]]],
299329
type: "Polygon"
300330
};
301-
layer.setGeometry(geometry);
302331
setTimeout(() => {
332+
layer.setGeometry(geometry);
303333
expect(layer).not.toBeNull();
304334
done();
305335
}, 4000)
306336
} finally {
307-
308337
if (layer) {
309338
layer.remove();
310339
}
311-
312340
}
313341
});
314-
315-
xit('destroy', () => {
316-
var layer;
317-
try {
318-
layer = dataFlowLayer(urlDataFlow);
319-
layer.addTo(map);
320-
layer.destroy();
321-
} finally {
322-
if (timer) {
323-
window.clearInterval(timer);
324-
}
325-
if (layer) {
326-
layer.remove();
327-
}
328-
329-
}
330-
})
331342
});
332343

333344

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy