Added test cases with export of an instance.

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

@@ -1,4 +1,4 @@
-import { MyWebSocket, MySockJS } from './browser.js';
+import { MyWebSocket, MySockJS, myWebSocketInstance, mySockJSInstance } from './browser.js';
 
 (function () {
 	const socket = new MyWebSocket('ws://localhost:9080'); // $ clientSocket
@@ -32,3 +32,34 @@ import { MyWebSocket, MySockJS } from './browser.js';
 		console.log('Using addEventListener ', event.data);
 	}); // $ clientReceive
 })();
+
+
+(function () {
+    myWebSocketInstance.addEventListener('open', function (event) {
+        myWebSocketInstance.send('Hi from browser!'); // $ MISSING: clientSend
+    });
+
+    myWebSocketInstance.addEventListener('message', function (event) {
+        console.log('Message from server ', event.data);
+    }); // $ MISSING: clientReceive
+
+    myWebSocketInstance.onmessage = function (event) {
+        console.log("Message from server 2", event.data)
+    }; // $ MISSING: clientReceive
+})();
+
+
+(function () {
+    mySockJSInstance.onopen = function () {
+        mySockJSInstance.send('test'); // $ MISSING: clientSend
+    };
+    
+    mySockJSInstance.onmessage = function (e) {
+        console.log('message', e.data);
+        mySockJSInstance.close();
+    }; // $ MISSING: clientReceive
+    
+    mySockJSInstance.addEventListener('message', function (event) {
+        console.log('Using addEventListener ', event.data);
+    }); // $ MISSING: clientReceive
+})();

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

@@ -33,3 +33,5 @@
 
 export const MyWebSocket = WebSocket;
 export const MySockJS = SockJS;
+export const myWebSocketInstance = new WebSocket('ws://localhost:8080'); // $ clientSocket
+export const mySockJSInstance = new SockJS('http://0.0.0.0:9999/echo'); // $ clientSocket

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

@@ -1,4 +1,4 @@
-const { MyWebSocketWS } = require('./client.js');
+const { MyWebSocketWS, myWebSocketWSInstance } = require('./client.js');
 
 (function () {
 	const ws = new MyWebSocketWS('ws://example.org'); // $ clientSocket
@@ -11,3 +11,13 @@ const { MyWebSocketWS } = require('./client.js');
 		console.log(data);
 	}); // $ clientReceive
 })();
+
+(function () {
+	myWebSocketWSInstance.on('open', function open() {
+		myWebSocketWSInstance.send('Hi from client!'); // $ MISSING: clientSend
+	});
+
+	myWebSocketWSInstance.on('message', function incoming(data) {
+		console.log(data);
+	}); // $ MISSING: clientReceive
+})();

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

@@ -1,6 +1,6 @@
-(function () {
-	const WebSocket = require('ws');
+const WebSocket = require('ws');
 
+(function () {
 	const ws = new WebSocket('ws://example.org'); // $clientSocket
 
 	ws.on('open', function open() {
@@ -13,3 +13,4 @@
 })();
 
 module.exports.MyWebSocketWS = require('ws');
+module.exports.myWebSocketWSInstance = new WebSocket('ws://example.org'); // $ clientSocket

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

@@ -1,4 +1,4 @@
-const { MyWebSocketServer } = require('./server.js');
+const { MyWebSocketServer, myWebSocketServerInstance } = require('./server.js');
 
 (function () {
 	const wss = new MyWebSocketServer({ port: 8080 });
@@ -11,3 +11,13 @@ const { MyWebSocketServer } = require('./server.js');
 		ws.send('Hi from server!'); // $ MISSING: serverSend
 	});
 })();
+
+(function () {
+	myWebSocketServerInstance.on('connection', function connection(ws) { // $ MISSING: serverSocket
+		ws.on('message', function incoming(message) { // $ MISSING: remoteFlow
+			console.log('received: %s', message);
+		}); // $ MISSING: serverReceive
+
+		ws.send('Hi from server!'); // $ MISSING: serverSend
+	});
+})();

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

@@ -1,6 +1,6 @@
-(function () {
-	const WebSocket = require('ws');
+const WebSocket = require('ws');
 
+(function () {
 	const wss = new WebSocket.Server({ port: 8080 });
 
 	wss.on('connection', function connection(ws) { // $serverSocket
@@ -13,3 +13,4 @@
 })();
 
 module.exports.MyWebSocketServer = require('ws').Server;
+module.exports.myWebSocketServerInstance = new WebSocket.Server({ port: 8080 });

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

@@ -21,11 +21,16 @@ clientSocket
 | browser-custom.js:21:13:21:52 | new MyS ... /echo') |
 | browser.js:2:17:2:52 | new Web ... :8080') |
 | browser.js:19:13:19:50 | new Soc ... /echo') |
+| browser.js:36:36:36:71 | new Web ... :8080') |
+| browser.js:37:33:37:70 | new Soc ... /echo') |
 | client-custom.js:4:13:4:49 | new MyW ... e.org') |
 | client.js:4:13:4:45 | new Web ... e.org') |
+| client.js:16:40:16:72 | new Web ... e.org') |
 flowSteps
 | browser-custom.js:1:10:1:20 | MyWebSocket | browser-custom.js:1:10:1:20 | MyWebSocket |
 | browser-custom.js:1:23:1:30 | MySockJS | browser-custom.js:1:23:1:30 | MySockJS |
+| browser-custom.js:1:33:1:51 | myWebSocketInstance | browser-custom.js:1:33:1:51 | myWebSocketInstance |
+| browser-custom.js:1:54:1:69 | mySockJSInstance | browser-custom.js:1:54:1:69 | mySockJSInstance |
 | browser-custom.js:7:15:7:32 | 'Hi from browser!' | server.js:7:38:7:44 | message |
 | browser-custom.js:23:13:23:18 | 'test' | sockjs.js:9:31:9:37 | message |
 | browser.js:5:15:5:32 | 'Hi from browser!' | server.js:7:38:7:44 | message |
@@ -33,12 +38,15 @@ flowSteps
 | client-custom.js:7:11:7:27 | 'Hi from client!' | server.js:7:38:7:44 | message |
 | client.js:7:11:7:27 | 'Hi from client!' | server.js:7:38:7:44 | message |
 | client.js:15:32:15:44 | require('ws') | client-custom.js:1:9:1:21 | MyWebSocketWS |
+| client.js:16:40:16:72 | new Web ... e.org') | client-custom.js:1:24:1:44 | myWebSo ... nstance |
 | server.js:11:11:11:27 | 'Hi from server!' | browser-custom.js:11:39:11:48 | event.data |
 | server.js:11:11:11:27 | 'Hi from server!' | browser-custom.js:15:40:15:49 | event.data |
 | server.js:11:11:11:27 | 'Hi from server!' | browser.js:9:39:9:48 | event.data |
 | server.js:11:11:11:27 | 'Hi from server!' | browser.js:13:40:13:49 | event.data |
 | server.js:11:11:11:27 | 'Hi from server!' | client-custom.js:10:37:10:40 | data |
 | server.js:11:11:11:27 | 'Hi from server!' | client.js:10:37:10:40 | data |
+| server.js:15:36:15:55 | require('ws').Server | server-custom.js:1:9:1:25 | MyWebSocketServer |
+| server.js:16:44:16:79 | new Web ... 8080 }) | server-custom.js:1:28:1:52 | myWebSo ... nstance |
 | sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser-custom.js:27:26:27:31 | e.data |
 | sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser-custom.js:32:42:32:51 | event.data |
 | sockjs.js:11:20:11:50 | JSON.st ... .test)) | browser.js:25:26:25:31 | e.data |