Basic MQTT over Websocket test working with modded dependencies.

mcollina · mcollina · commit c8d7dea04f70 · 2013-08-29T15:29:29.000+02:00
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   "devDependencies": {
     "mocha": "*",
     "should": "*",
-    "websocket-stream": "~0.3.1",
+    "websocket-stream": "git://github.com/mcollina/websocket-stream.git#node-support",
     "ws": "~0.4.28"
   }
 }
diff --git a/test/client_websocket.js b/test/client_websocket.js
@@ -8,7 +8,7 @@ var mqtt = require('..')
 /**
  * Testing options
  */
-var port = 9876;
+var serverPort = 9876;
 
 /**
  * Test server
@@ -19,7 +19,7 @@ var websocket = require('websocket-stream')
 var http = require("http");
 
 var server = http.createServer();
-server.listen(port);
+server.listen(serverPort);
 
 var clientHandler = function (client) {
 
@@ -79,16 +79,37 @@ var wss = new WebSocketServer({server: server})
 wss.on('connection', function(ws) {
   var connection = websocket(ws).pipe(new mqtt.MqttConnection());
   clientHandler(connection);
+  server.emit("client", connection);
 })
 
-var createClient = function(port) {
+var createClient = function(port, host, opts) {
+  if ('object' === typeof port) {
+    opts = port;
+    port = serverPort;
+    host = 'localhost';
+  } else if ('object' === typeof host) {
+    opts = host;
+    host = 'localhost';
+  } else if ('object' !== typeof opts) {
+    opts = {};
+  }
+
+  if (!host) {
+    host = 'localhost'
+  }
+
+  if (opts && opts.clean === false && !opts.clientId) {
+    throw new Error("Missing clientId for unclean clients");
+  }
+
   var build = function() {
-    return websocket('ws://localhost:' + port)
+    var url = 'ws://' + host + ':' + port;
+    return websocket(url);
   };
 
-  return new mqtt.MqttClient(build);
+  return new mqtt.MqttClient(build, opts);
 };
 
 describe('MqttClient', function() {
-  abstractClientTests(server, createClient, port);
+  abstractClientTests(server, createClient, serverPort);
 });

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`"devDependencies": {`
`34`	`34`	`"mocha": "*",`
`35`	`35`	`"should": "*",`
`36`		`- "websocket-stream": "~0.3.1",`
	`36`	`+ "websocket-stream": "git://github.com/mcollina/websocket-stream.git#node-support",`
`37`	`37`	`"ws": "~0.4.28"`
`38`	`38`	`}`
`39`	`39`	`}`