Adding connection checks to WebSocket Tests (#263)

* Adding connection checks to WebSocket Tests

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

* Making WebSocket Handshake Sec-WebSocket-Key 16 bytes (Issue #234)

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/WebSocketTest.java

@@ -131,6 +131,9 @@ public void testWebSocketConnect() throws Exception {
     }
     finally {
       if (client != null) {
+    	  if(client.isConnected()){
+    		  client.disconnectForcibly();
+    	  }
         log.info("Close...");
         client.close();
       }
@@ -240,6 +243,9 @@ public void largePayloadTest() throws Exception{
 	    	e.printStackTrace();
 	    } finally {
 	      if (client != null) {
+	    	  if(client.isConnected()){
+	    		  client.disconnectForcibly();
+	    	  }
 	        log.info("Close...");
 	        client.close();
 	      }
@@ -263,10 +269,22 @@ public void testBasicAuth() throws Exception {
             serverURI.getPath(),
             serverURI.getQuery(),
             serverURI.getFragment());
-
-    IMqttClient client = clientFactory.createMqttClient(serverURIWithUserInfo, clientId);
-    client.connect();
-    client.disconnect();
+    IMqttClient client = null;
+    try {
+     client = clientFactory.createMqttClient(serverURIWithUserInfo, clientId);
+    	client.connect();
+    	client.disconnect();
+    } catch (Exception e){
+    	e.printStackTrace();
+    } finally {
+      if (client != null) {
+    	  if(client.isConnected()){
+    		  client.disconnectForcibly();
+    	  }
+        log.info("Close...");
+        client.close();
+      }
+    }
   }
 
   // -------------------------------------------------------------

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketHandshake.java

@@ -68,7 +68,7 @@ public WebSocketHandshake(InputStream input, OutputStream output, String uri, St
 	 * @throws IOException
 	 */
 	public void execute() throws IOException {
-		String key = "mqtt-" + (System.currentTimeMillis()/1000);
+		String key = "mqtt3-" + (System.currentTimeMillis()/1000);
 		String b64Key = Base64.encode(key);
 		sendHandshakeRequest(b64Key);
 		receiveHandshakeResponse(b64Key);