Skip to content

Commit ced07d2

Browse files
committed
All test passing
1 parent 1694684 commit ced07d2

File tree

3 files changed

+819
-496
lines changed

3 files changed

+819
-496
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dop",
3-
"version": "1.0.0",
3+
"version": "0.40.0",
44
"main": "./dist/dop.nodejs.js",
55
"browser": "./dist/dop.js",
66
"unpkg": "./dist/dop.min.js",

test/protocol/broadcast.js

Lines changed: 83 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,90 @@
1-
var test = require('tape');
2-
var dop = require('../.proxy').create();
3-
var dopClient1 = require('../.proxy').create();
4-
var dopClient2 = require('../.proxy').create();
5-
var transportName = process.argv[2] || 'local';
6-
var transportListen = require('dop-transports').listen[transportName];
7-
var transportConnect = require('dop-transports').connect[transportName];
8-
9-
dop.env = 'SERVER';
10-
dop.data.object_inc = 25;
11-
dopClient1.env = 'CLIENT1';
12-
dopClient2.env = 'CLIENT2';
13-
1+
var test = require('tape')
2+
var dop = require('../.proxy').create()
3+
var dopClient1 = require('../.proxy').create()
4+
var dopClient2 = require('../.proxy').create()
5+
var transportName = process.argv[2] || 'local'
6+
var transportListen = require('dop-transports').listen[transportName]
7+
var transportConnect = require('dop-transports').connect[transportName]
8+
9+
dop.env = 'SERVER'
10+
dop.data.object_inc = 25
11+
dopClient1.env = 'CLIENT1'
12+
dopClient2.env = 'CLIENT2'
1413

1514
test('BROADCAST TESTS', function(tt) {
16-
17-
var test = function(name, cb){
18-
tt.test(name, {}, cb);
19-
};
20-
21-
var server = dop.listen({transport:transportListen})
22-
var client1 = dopClient1.connect({transport:transportConnect, listener:server})
23-
var client2 = dopClient2.connect({transport:transportConnect, listener:server})
24-
25-
26-
27-
28-
29-
var objServer = {
30-
number:1,
31-
subobject:{}
32-
}
33-
dop.register(objServer);
34-
dop.setBroadcastFunction(objServer.subobject,'broadcast');
35-
dop.onSubscribe(function(){
36-
return objServer;
37-
})
38-
39-
40-
41-
42-
// setBroadcastFunction(object, 'namefunction')
43-
44-
test('BROADCASTING TO CLIENTS', function(t) {
45-
46-
client1.subscribe().into({subobject:{broadcast:function(a,b){return a+b}}})
47-
.then(function(obj) {
48-
return client2.subscribe().into({subobject:{broadcast:function(a,b){return a*b}}})
49-
})
50-
.then(function(obj) {
51-
52-
var promises = objServer.subobject.broadcast(2,5);
53-
t.equal(Array.isArray(promises), true, 'Promises is array');
54-
t.equal(promises.length, 2, 'Promises are two promises');
55-
t.equal(promises[0] instanceof Promise, true, 'First promise is instanceof Promise');
56-
Promise.all(promises)
57-
.then(function(values){
58-
t.equal(values[0], 7, 'First value must be 2+5=7');
59-
t.equal(values[0], 7, 'Second value must be 2*5=10');
60-
// try {
61-
server.listener.close();
62-
// client1.socket.close();
63-
// client2.socket.close();
64-
// } catch(e) {
65-
// console.log( e );
66-
// process.exit();
67-
// }
68-
t.end()
15+
var test = function(name, cb) {
16+
tt.test(name, {}, cb)
17+
}
18+
19+
var server = dop.listen({ transport: transportListen })
20+
var client1 = dopClient1.connect({
21+
transport: transportConnect,
22+
listener: server
23+
})
24+
var client2 = dopClient2.connect({
25+
transport: transportConnect,
26+
listener: server
6927
})
70-
// .catch(function(err){
71-
// console.log( err );
72-
// })
73-
})
74-
})
75-
76-
77-
// More test todo
7828

29+
var objServer = {
30+
number: 1,
31+
subobject: {}
32+
}
33+
dop.register(objServer)
34+
dop.setBroadcastFunction(objServer.subobject, 'broadcast')
35+
dop.onSubscribe(function() {
36+
return objServer
37+
})
7938

39+
// setBroadcastFunction(object, 'namefunction')
40+
41+
test('BROADCASTING TO CLIENTS', function(t) {
42+
client1
43+
.subscribe()
44+
.into({
45+
subobject: {
46+
broadcast: function(a, b) {
47+
return a + b
48+
}
49+
}
50+
})
51+
.then(function(obj) {
52+
return client2.subscribe().into({
53+
subobject: {
54+
broadcast: function(a, b) {
55+
return a * b
56+
}
57+
}
58+
})
59+
})
60+
.then(function(obj) {
61+
var promises = objServer.subobject.broadcast(2, 5)
62+
t.equal(Array.isArray(promises), true, 'Promises is array')
63+
t.equal(promises.length, 2, 'Promises are two promises')
64+
t.equal(
65+
promises[0] instanceof Promise,
66+
true,
67+
'First promise is instanceof Promise'
68+
)
69+
Promise.all(promises).then(function(values) {
70+
t.equal(values[0], 7, 'First value must be 2+5=7')
71+
t.equal(values[0], 7, 'Second value must be 2*5=10')
72+
// try {
73+
server.listener.close()
74+
// client1.socket.close();
75+
// client2.socket.close();
76+
// } catch(e) {
77+
// console.log( e );
78+
// process.exit();
79+
// }
80+
t.end()
81+
})
82+
// .catch(function(err){
83+
// console.log( err );
84+
// })
85+
})
86+
})
8087

88+
// More test todo
89+
tt.end()
8190
})

0 commit comments

Comments
 (0)