Skip to content

Commit 93c712d

Browse files
committed
Making events_transports test
1 parent a378a75 commit 93c712d

File tree

2 files changed

+87
-8
lines changed

2 files changed

+87
-8
lines changed

src/env/browser/websocket.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,14 @@ function websocket(dop, node, options) {
1313

1414
var api = options.transport.api(),
1515
socket = new api(url),
16-
send = socket.send,
17-
send_queue = [];
16+
send = socket.send;
1817

1918
socket.send = function(message) {
20-
// (socket.readyState !== 1) ?
21-
// send_queue.push(message)
22-
// :
23-
send.call(socket, message);
19+
send.call(socket, message);
2420
};
2521

2622
socket.addEventListener('open', function() {
2723
dop.core.onopen(node, socket);
28-
// while (send_queue.length>0)
29-
// send.call(socket, send_queue.shift());
3024
});
3125

3226
socket.addEventListener('message', function(message) {

test/events_transports.js

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
var test = require('tape');
2+
var dop = require('../dist/nodejs').create();
3+
var dopClient = require('../dist/nodejs').create();
4+
var localtransportlisten = require('dop-transports').listen.local;
5+
var localtransportconnect = require('dop-transports').connect.local;
6+
7+
// Browsers
8+
var server = dop.listen({transport:localtransportlisten});
9+
var client = dopClient.connect({transport:localtransportconnect, listener:server});
10+
// node.js (WebSockets)
11+
var server = dop.listen({});
12+
var client = dopClient.connect({});
13+
14+
15+
test('Events', function(t) {
16+
var sock, msg;
17+
var sock2, msg2;
18+
var order = 1;
19+
20+
server.on('open', function(socket){
21+
sock = socket;
22+
t.equal(order++, 1, 'server/open');
23+
});
24+
25+
server.listener.on('connection', function(socket){
26+
sock.on('message', onmessageserver);
27+
t.equal(order++, 2, 'server/connection');
28+
t.equal(sock, socket, 'server/connection sock');
29+
});
30+
31+
client.on('open', function(socket){
32+
sock2 = socket;
33+
t.equal(order++, 3, 'client/open');
34+
});
35+
36+
client.socket.on('open', function(){
37+
sock2.on('message', onmessageclient);
38+
t.equal(order++, 4, 'clientsocket/open');
39+
t.equal(sock2, this, 'clientsocket/open sock');
40+
});
41+
42+
43+
client.on('message', function(socket, message){
44+
msg2 = message;
45+
t.equal(order++, 5, 'client/message');
46+
t.equal(sock2, socket, 'client/message sock');
47+
});
48+
function onmessageclient(message){
49+
t.equal(order++, 6, 'clientsocket/message');
50+
t.equal(msg2, message, 'clientsocket/message msg');
51+
};
52+
53+
server.on('message', function(socket, message){
54+
msg = message;
55+
t.equal(order++, 7, 'server/message');
56+
t.equal(sock, socket, 'server/message sock');
57+
});
58+
function onmessageserver(message){
59+
t.equal(order++, 8, 'serverlistener/message');
60+
t.equal(msg, message, 'serverlistener/message msg');
61+
t.end();
62+
try {server.listener.close()} catch(e) {}
63+
};
64+
65+
66+
67+
68+
69+
70+
71+
72+
73+
74+
75+
76+
77+
78+
79+
80+
81+
82+
});
83+
84+
85+

0 commit comments

Comments
 (0)