Added a test and more synchronized logic

Author: mmimeault

ParseLiveQuery/src/main/java/com/parse/OkHttp3SocketClientFactory.java

@@ -94,14 +94,14 @@ public synchronized void open() {
 
         @Override
         public synchronized void close() {
-            setState(State.DISCONNECTING);
-            if (webSocket != null) {
+            if (State.NONE != state) {
+                setState(State.DISCONNECTING);
                 webSocket.close(STATUS_CODE, CLOSING_MSG);
             }
         }
 
         @Override
-        public void send(String message) {
+        public synchronized void send(String message) {
             if (state == State.CONNECTED) {
                 webSocket.send(message);
             }
@@ -113,7 +113,9 @@ public State getState() {
         }
 
         private void setState(State newState) {
-            this.state = newState;
+            synchronized (this) {
+                this.state = newState;
+            }
             this.webSocketClientCallback.stateChanged();
         }
     }

ParseLiveQuery/src/test/java/com/parse/TestOkHttpClientFactory.java

@@ -0,0 +1,49 @@
+package com.parse;
+
+import junit.framework.Assert;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.net.URI;
+
+import okhttp3.OkHttpClient;
+
+import static com.parse.WebSocketClient.State.NONE;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TestOkHttpClientFactory {
+
+    @Mock
+    private OkHttpClient okHttpClientMock;
+
+    @Mock
+    private WebSocketClient.WebSocketClientCallback webSocketClientCallbackMock;
+
+    private OkHttp3SocketClientFactory okHttp3SocketClientFactory;
+    private WebSocketClient webSocketClient;
+
+    @Before
+    public void setUp() throws Exception {
+        okHttp3SocketClientFactory = new OkHttp3SocketClientFactory(okHttpClientMock);
+        webSocketClient = okHttp3SocketClientFactory.createInstance(webSocketClientCallbackMock, new URI("http://www.test.com"));
+    }
+
+    @After
+    public void tearDown() {
+        webSocketClient.close();
+    }
+
+    @Test
+    public void testClientCloseWithoutOpenShouldBeNoOp()  {
+        Assert.assertEquals(NONE, webSocketClient.getState());
+        webSocketClient.close();
+        webSocketClient.send("test");
+        Assert.assertEquals(NONE, webSocketClient.getState());
+    }
+
+}