Merge branch 'kandrej-fix-ws-disconnect' into develop

Author: Ian Craggs

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 IBM Corp.
+ * Copyright (c) 2009, 2019 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -16,6 +16,8 @@
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,24 +37,41 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
  *
  */
+@RunWith(Parameterized.class)
 public class SendReceiveAsyncCallbackTest {
 
 	static final Class<?> cclass = SendReceiveAsyncTest.class;
 	static final String className = cclass.getName();
 	static final Logger log = Logger.getLogger(className);
 
 	private final int messageCount = 5;
-	private static URI serverURI;
+	private URI serverURI;
 	private static MqttClientFactoryPaho clientFactory;
 	private boolean testFinished = false;
 	private static String topicFilter;
 	private listener myListener = new listener();
 	private onPublish myOnPublish = new onPublish(1);
 	private static String topicPrefix;
+	
+	@Parameters
+	public static Collection<Object[]> data() throws Exception {
+			
+		  return Arrays.asList(new Object[][] {     
+	        { TestProperties.getServerURI() }, { TestProperties.getWebSocketServerURI() }  
+		  });
+			
+	}
+	  
+	public SendReceiveAsyncCallbackTest(URI serverURI) {
+		this.serverURI = serverURI;
+	}
 
 	/**
 	 * @throws Exception
@@ -64,7 +83,6 @@ public static void setUpBeforeClass() throws Exception {
 			String methodName = Utility.getMethodName();
 			LoggingUtilities.banner(log, cclass, methodName);
 
-			serverURI = TestProperties.getServerURI();
 			clientFactory = new MqttClientFactoryPaho();
 			clientFactory.open();
 		    topicPrefix = "SendReceiveAsyncCallbackTest-" + UUID.randomUUID().toString() + "-";

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2014 IBM Corp.
+ * Copyright (c) 2009, 2019 IBM Corp.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -15,6 +15,8 @@
 package org.eclipse.paho.client.mqttv3.test;
 
 import java.net.URI;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -35,19 +37,37 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
  *
  */
+@RunWith(Parameterized.class)
 public class SendReceiveAsyncTest {
 
   static final Class<?> cclass = SendReceiveAsyncTest.class;
   static final String className = cclass.getName();
   static final Logger log = Logger.getLogger(className);
 
-  private static URI serverURI;
+  private URI serverURI;
   private static MqttClientFactoryPaho clientFactory;
   private static String topicPrefix;
+  
+  
+  @Parameters
+  public static Collection<Object[]> data() throws Exception {
+		
+	  return Arrays.asList(new Object[][] {     
+        { TestProperties.getServerURI() }, { TestProperties.getWebSocketServerURI() }  
+	  });
+		
+  }
+  
+  public SendReceiveAsyncTest(URI serverURI) {
+		this.serverURI = serverURI;
+  }
 
 
   /**
@@ -60,7 +80,6 @@ public static void setUpBeforeClass() throws Exception {
       String methodName = Utility.getMethodName();
       LoggingUtilities.banner(log, cclass, methodName);
 
-      serverURI = TestProperties.getServerURI();
       clientFactory = new MqttClientFactoryPaho();
       clientFactory.open();
       topicPrefix = "SendReceiveAsyncTest-" + UUID.randomUUID().toString() + "-";

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

@@ -49,7 +49,7 @@ public class SendReceiveTest {
   private static final String className = cclass.getName();
   private static final Logger log = Logger.getLogger(className);
 
-  private static URI serverURI;
+  private URI serverURI;
   private static MqttClientFactoryPaho clientFactory;
   private static String topicPrefix;
 
@@ -62,9 +62,9 @@ public static Collection<Object[]> data() throws Exception {
 
   }
 
-	public SendReceiveTest(URI serverURI) {
-		this.serverURI = serverURI;
-	}
+  public SendReceiveTest(URI serverURI) {
+	  this.serverURI = serverURI;
+  }
 
 
   /**

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

@@ -19,6 +19,7 @@
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.net.SocketTimeoutException;
 
 import org.eclipse.paho.client.mqttv3.logging.Logger;
 import org.eclipse.paho.client.mqttv3.logging.LoggerFactory;
@@ -114,7 +115,8 @@ public void run() {
 				}
 
 				receiving = false;
-
+			} catch (SocketTimeoutException ex) {
+				// Ignore SocketTimeoutException 
 			} catch (IOException ex) {
 				// Exception occurred whilst reading the stream.
 				this.stop();

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java

@@ -19,6 +19,7 @@
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.net.SocketTimeoutException;
 
 import org.eclipse.paho.mqttv5.client.logging.Logger;
 import org.eclipse.paho.mqttv5.client.logging.LoggerFactory;
@@ -115,6 +116,8 @@ public void run() {
 
 				receiving = false;
 
+			} catch (SocketTimeoutException ex) {
+				// Ignore SocketTimeoutException 
 			} catch (IOException ex) {
 				// Exception occurred whilst reading the stream.
 				this.stop();