Merge branch 'master' into v2-release

Author: WillSewell

build.gradle

@@ -43,7 +43,7 @@ repositories {
 
 dependencies {
 	compile "com.google.code.gson:gson:2.2.2"
-	compile "com.pusher:java-websocket:1.4.1"
+	compile "org.java-websocket:Java-WebSocket:1.4.0"
 	testCompile "org.mockito:mockito-all:1.8.5"
 	testCompile "org.powermock:powermock-module-junit4:1.4.11"
 	testCompile "org.powermock:powermock-api-mockito:1.4.11"

src/main/java/com/pusher/client/connection/websocket/WebSocketClientWrapper.java

@@ -10,8 +10,8 @@
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSocketFactory;
 
-import com.pusher.java_websocket.client.WebSocketClient;
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
 
 /**
  * A thin wrapper around the WebSocketClient class from the Java-WebSocket

src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java

@@ -14,7 +14,7 @@
 
 import javax.net.ssl.SSLException;
 
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.handshake.ServerHandshake;
 
 import com.google.gson.Gson;
 
@@ -323,6 +323,7 @@ public void run() {
                 factory.shutdownThreads();
             }
         });
+        reconnectAttempts = 0;
     }
 
     @Override

src/main/java/com/pusher/client/connection/websocket/WebSocketListener.java

@@ -1,6 +1,6 @@
 package com.pusher.client.connection.websocket;
 
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.handshake.ServerHandshake;
 
 public interface WebSocketListener {
 

src/main/java/com/pusher/client/example/SimpleWebSocket.java

@@ -3,8 +3,8 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import com.pusher.java_websocket.client.WebSocketClient;
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
 
 public class SimpleWebSocket extends WebSocketClient {
     public static void main(final String[] args) throws URISyntaxException {

src/test/java/com/pusher/client/EndToEndTest.java

@@ -31,7 +31,7 @@
 import com.pusher.client.connection.websocket.WebSocketListener;
 import com.pusher.client.util.DoNothingExecutor;
 import com.pusher.client.util.Factory;
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.handshake.ServerHandshake;
 
 @RunWith(MockitoJUnitRunner.class)
 public class EndToEndTest {

src/test/java/com/pusher/client/connection/websocket/WebSocketClientWrapperTest.java

@@ -8,7 +8,7 @@
 
 import javax.net.ssl.SSLException;
 
-import com.pusher.java_websocket.handshake.ServerHandshake;
+import org.java_websocket.handshake.ServerHandshake;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/pusher/client/connection/websocket/WebSocketConnectionTest.java

@@ -8,7 +8,9 @@
 import java.net.Proxy;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLException;
 
@@ -49,6 +51,8 @@ public class WebSocketConnectionTest {
     private ConnectionEventListener mockEventListener;
     @Mock
     private Factory factory;
+    @Mock
+    private ScheduledExecutorService scheduledExecutorService;
 
     private WebSocketConnection connection;
 
@@ -360,26 +364,47 @@ public void stateIsReconnectingAfterTryingToConnectForTheFirstTime() throws Inte
         assertEquals(ConnectionState.RECONNECTING, connection.getState());
     }
 
-//    TODO: leaving the following tests commented out just for reference. The lib needs to be rearchitected before we can hope to get any of these in
-//    @Test
-//    public void reconnectingLogicActuallyBeingCalled(){
-//        fail("not implemented");
-//    }
-//
-//    @Test
-//    public void retryMaximumNumberOfTimes(){
-//        fail("not implemented");
-//    }
-//
-//    @Test
-//    public void disconnectAfterTooManyRetries(){
-//        fail("not implemented");
-//    }
-//
-//    @Test
-//    public void retryWithTimeout(){
-//        fail("not implemented");
-//    }
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testStopsReconnectingAfterMaxReconnectionAttemptsIsReached() throws URISyntaxException, InterruptedException, SSLException {
+        when(factory.getTimers()).thenReturn(scheduledExecutorService);
+        // Run the reconnect functionality synchronously
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                final Runnable r = (Runnable) invocation.getArguments()[0];
+                r.run();
+                return null;
+            }
+        }).when(scheduledExecutorService).schedule(any(Runnable.class), any(Long.class), any(TimeUnit.class));
+
+        // Reconnect a single time (maxReconnectionAttempts = 1)
+        connection = new WebSocketConnection(URL, ACTIVITY_TIMEOUT, PONG_TIMEOUT, 1, MAX_GAP, PROXY, factory);
+
+        connection.connect();
+
+        // After the first close, we expect a reconnect
+        connection.onClose(500, "reason", true);
+        assertEquals(ConnectionState.CONNECTING, connection.getState());
+
+        // It should give up on the second attempt
+        connection.onClose(500, "reason", true);
+        assertEquals(ConnectionState.DISCONNECTED, connection.getState());
+
+        // Test that behavior is the same after `connect()` is called
+        // This guards against a bug fixed in https://github.com/pusher/pusher-websocket-java/pull/201
+        // where the number of retries was not reset after calling `connect()`.
+
+        connection.connect();
+
+        // After the first close, we expect a reconnect
+        connection.onClose(500, "reason", true);
+        assertEquals(ConnectionState.CONNECTING, connection.getState());
+
+        // It should give up on the second attempt
+        connection.onClose(500, "reason", true);
+        assertEquals(ConnectionState.DISCONNECTED, connection.getState());
+    }
 
     /* end of tests */