Skip to content

Commit 455ce59

Browse files
NapalysNapalys
committed
Added test cases with export of an instance.
1 parent e16a20e commit 455ce59

File tree

7 files changed

+70
-7
lines changed

7 files changed

+70
-7
lines changed

‎javascript/ql/test/library-tests/frameworks/WebSocket/browser-custom.js

+32-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MyWebSocket, MySockJS } from './browser.js';
1+
import { MyWebSocket, MySockJS, myWebSocketInstance, mySockJSInstance } from './browser.js';
22

33
(function () {
44
const socket = new MyWebSocket('ws://localhost:9080'); // $ clientSocket
@@ -32,3 +32,34 @@ import { MyWebSocket, MySockJS } from './browser.js';
3232
console.log('Using addEventListener ', event.data);
3333
}); // $ clientReceive
3434
})();
35+
36+
37+
(function () {
38+
myWebSocketInstance.addEventListener('open', function (event) {
39+
myWebSocketInstance.send('Hi from browser!'); // $ MISSING: clientSend
40+
});
41+
42+
myWebSocketInstance.addEventListener('message', function (event) {
43+
console.log('Message from server ', event.data);
44+
}); // $ MISSING: clientReceive
45+
46+
myWebSocketInstance.onmessage = function (event) {
47+
console.log("Message from server 2", event.data)
48+
}; // $ MISSING: clientReceive
49+
})();
50+
51+
52+
(function () {
53+
mySockJSInstance.onopen = function () {
54+
mySockJSInstance.send('test'); // $ MISSING: clientSend
55+
};
56+
57+
mySockJSInstance.onmessage = function (e) {
58+
console.log('message', e.data);
59+
mySockJSInstance.close();
60+
}; // $ MISSING: clientReceive
61+
62+
mySockJSInstance.addEventListener('message', function (event) {
63+
console.log('Using addEventListener ', event.data);
64+
}); // $ MISSING: clientReceive
65+
})();

‎javascript/ql/test/library-tests/frameworks/WebSocket/browser.js

+2
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@
3333

3434
export const MyWebSocket = WebSocket;
3535
export const MySockJS = SockJS;
36+
export const myWebSocketInstance = new WebSocket('ws://localhost:8080'); // $ clientSocket
37+
export const mySockJSInstance = new SockJS('http://0.0.0.0:9999/echo'); // $ clientSocket

‎javascript/ql/test/library-tests/frameworks/WebSocket/client-custom.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { MyWebSocketWS } = require('./client.js');
1+
const { MyWebSocketWS, myWebSocketWSInstance } = require('./client.js');
22

33
(function () {
44
const ws = new MyWebSocketWS('ws://example.org'); // $ clientSocket
@@ -11,3 +11,13 @@ const { MyWebSocketWS } = require('./client.js');
1111
console.log(data);
1212
}); // $ clientReceive
1313
})();
14+
15+
(function () {
16+
myWebSocketWSInstance.on('open', function open() {
17+
myWebSocketWSInstance.send('Hi from client!'); // $ MISSING: clientSend
18+
});
19+
20+
myWebSocketWSInstance.on('message', function incoming(data) {
21+
console.log(data);
22+
}); // $ MISSING: clientReceive
23+
})();

‎javascript/ql/test/library-tests/frameworks/WebSocket/client.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(function () {
2-
const WebSocket = require('ws');
1+
const WebSocket = require('ws');
32

3+
(function () {
44
const ws = new WebSocket('ws://example.org'); // $clientSocket
55

66
ws.on('open', function open() {
@@ -13,3 +13,4 @@
1313
})();
1414

1515
module.exports.MyWebSocketWS = require('ws');
16+
module.exports.myWebSocketWSInstance = new WebSocket('ws://example.org'); // $ clientSocket

‎javascript/ql/test/library-tests/frameworks/WebSocket/server-custom.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { MyWebSocketServer } = require('./server.js');
1+
const { MyWebSocketServer, myWebSocketServerInstance } = require('./server.js');
22

33
(function () {
44
const wss = new MyWebSocketServer({ port: 8080 });
@@ -11,3 +11,13 @@ const { MyWebSocketServer } = require('./server.js');
1111
ws.send('Hi from server!'); // $ MISSING: serverSend
1212
});
1313
})();
14+
15+
(function () {
16+
myWebSocketServerInstance.on('connection', function connection(ws) { // $ MISSING: serverSocket
17+
ws.on('message', function incoming(message) { // $ MISSING: remoteFlow
18+
console.log('received: %s', message);
19+
}); // $ MISSING: serverReceive
20+
21+
ws.send('Hi from server!'); // $ MISSING: serverSend
22+
});
23+
})();

‎javascript/ql/test/library-tests/frameworks/WebSocket/server.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
(function () {
2-
const WebSocket = require('ws');
1+
const WebSocket = require('ws');
32

3+
(function () {
44
const wss = new WebSocket.Server({ port: 8080 });
55

66
wss.on('connection', function connection(ws) { // $serverSocket
@@ -13,3 +13,4 @@
1313
})();
1414

1515
module.exports.MyWebSocketServer = require('ws').Server;
16+
module.exports.myWebSocketServerInstance = new WebSocket.Server({ port: 8080 });

‎javascript/ql/test/library-tests/frameworks/WebSocket/test.expected

+8
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,32 @@ clientSocket
2121
| browser-custom.js:21:13:21:52 | new MyS ... /echo') |
2222
| browser.js:2:17:2:52 | new Web ... :8080') |
2323
| browser.js:19:13:19:50 | new Soc ... /echo') |
24+
| browser.js:36:36:36:71 | new Web ... :8080') |
25+
| browser.js:37:33:37:70 | new Soc ... /echo') |
2426
| client-custom.js:4:13:4:49 | new MyW ... e.org') |
2527
| client.js:4:13:4:45 | new Web ... e.org') |
28+
| client.js:16:40:16:72 | new Web ... e.org') |
2629
flowSteps
2730
| browser-custom.js:1:10:1:20 | MyWebSocket | browser-custom.js:1:10:1:20 | MyWebSocket |
2831
| browser-custom.js:1:23:1:30 | MySockJS | browser-custom.js:1:23:1:30 | MySockJS |
32+
| browser-custom.js:1:33:1:51 | myWebSocketInstance | browser-custom.js:1:33:1:51 | myWebSocketInstance |
33+
| browser-custom.js:1:54:1:69 | mySockJSInstance | browser-custom.js:1:54:1:69 | mySockJSInstance |
2934
| browser-custom.js:7:15:7:32 | 'Hi from browser!' | server.js:7:38:7:44 | message |
3035
| browser-custom.js:23:13:23:18 | 'test' | sockjs.js:9:31:9:37 | message |
3136
| browser.js:5:15:5:32 | 'Hi from browser!' | server.js:7:38:7:44 | message |
3237
| browser.js:21:13:21:18 | 'test' | sockjs.js:9:31:9:37 | message |
3338
| client-custom.js:7:11:7:27 | 'Hi from client!' | server.js:7:38:7:44 | message |
3439
| client.js:7:11:7:27 | 'Hi from client!' | server.js:7:38:7:44 | message |
3540
| client.js:15:32:15:44 | require('ws') | client-custom.js:1:9:1:21 | MyWebSocketWS |
41+
| client.js:16:40:16:72 | new Web ... e.org') | client-custom.js:1:24:1:44 | myWebSo ... nstance |
3642
| server.js:11:11:11:27 | 'Hi from server!' | browser-custom.js:11:39:11:48 | event.data |
3743
| server.js:11:11:11:27 | 'Hi from server!' | browser-custom.js:15:40:15:49 | event.data |
3844
| server.js:11:11:11:27 | 'Hi from server!' | browser.js:9:39:9:48 | event.data |
3945
| server.js:11:11:11:27 | 'Hi from server!' | browser.js:13:40:13:49 | event.data |
4046
| server.js:11:11:11:27 | 'Hi from server!' | client-custom.js:10:37:10:40 | data |
4147
| server.js:11:11:11:27 | 'Hi from server!' | client.js:10:37:10:40 | data |
48+
| server.js:15:36:15:55 | require('ws').Server | server-custom.js:1:9:1:25 | MyWebSocketServer |
49+
| server.js:16:44:16:79 | new Web ... 8080 }) | server-custom.js:1:28:1:52 | myWebSo ... nstance |
4250
| sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser-custom.js:27:26:27:31 | e.data |
4351
| sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser-custom.js:32:42:32:51 | event.data |
4452
| sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser.js:25:26:25:31 | e.data |

0 commit comments

Comments
 (0)