Fixed tests

Change-Id: I13594b5f53b5625735d307bd7014ff7be9308ada

Author: jacek-marchwicki

websockets-rxjava-example/build.gradle

@@ -42,4 +42,7 @@ android {
             proguardFiles = [getDefaultProguardFile('proguard-android.txt'), 'src/main/proguard-project.txt']
         }
     }
+    lintOptions {
+        disable 'InvalidPackage'
+    }
 }

websockets-rxjava-example/src/test/java/com/example/RxJsonWebSocketsRealTest.java

@@ -16,7 +16,6 @@
 
 package com.example;
 
-import com.appunite.websocket.NewWebSocket;
 import com.appunite.websocket.rx.RxWebSockets;
 import com.appunite.websocket.rx.object.GsonObjectSerializer;
 import com.appunite.websocket.rx.object.RxObjectWebSockets;
@@ -25,6 +24,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
 
 import org.apache.http.Header;
 import org.junit.Before;
@@ -59,11 +60,12 @@ public void setUp() throws Exception {
                 .registerTypeAdapter(MessageType.class, new MessageType.SerializerDeserializer())
                 .create();
 
-        final NewWebSocket newWebSocket = new NewWebSocket();
-        final RxWebSockets rxWebSockets = new RxWebSockets(newWebSocket,
-                SERVER_URI,
-                ImmutableList.of("chat"),
-                ImmutableList.<Header>of());
+        final RxWebSockets rxWebSockets = new RxWebSockets(new OkHttpClient(),
+                new Request.Builder()
+                        .get()
+                        .url("ws://10.10.0.2:8080/ws")
+                        .addHeader("Sec-WebSocket-Protocol", "chat")
+                        .build());
         socket = new RxObjectWebSockets(rxWebSockets, new GsonObjectSerializer(gson, Message.class));
     }
 

websockets-rxjava-example/src/test/java/com/example/RxWebSocketsRealTest.java

@@ -16,46 +16,31 @@
 
 package com.example;
 
-import com.appunite.websocket.NewWebSocket;
 import com.appunite.websocket.rx.RxWebSockets;
 import com.appunite.websocket.rx.messages.RxEvent;
-import com.google.common.collect.ImmutableList;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
 
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
 import rx.Subscription;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 public class RxWebSocketsRealTest {
 
-    private static final URI SERVER_URI;
-
-    static {
-        try {
-            SERVER_URI = new URI("ws://192.168.0.142:8080/ws");
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
     private RxWebSockets socket;
 
     @Before
     public void setUp() throws Exception {
-        final NewWebSocket newWebSocket = new NewWebSocket();
-        socket = new RxWebSockets(newWebSocket,
-                SERVER_URI,
-                ImmutableList.of("chat"),
-                ImmutableList.<Header>of());
+        socket = new RxWebSockets(new OkHttpClient(),
+                new Request.Builder()
+                        .get()
+                        .url("ws://10.10.0.2:8080/ws")
+                        .addHeader("Sec-WebSocket-Protocol", "chat")
+                        .build());
 
     }
 

websockets-rxjava-example/src/test/java/com/example/SocketRealTest.java

@@ -16,24 +16,21 @@
 
 package com.example;
 
-import com.appunite.websocket.NewWebSocket;
-import com.appunite.websocket.rx.*;
+import com.appunite.websocket.rx.RxWebSockets;
 import com.appunite.websocket.rx.object.GsonObjectSerializer;
 import com.appunite.websocket.rx.object.RxObjectWebSockets;
 import com.example.model.DataMessage;
-import com.example.model.MessageType;
 import com.example.model.Message;
-import com.google.common.collect.ImmutableList;
+import com.example.model.MessageType;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
 
-import org.apache.http.Header;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.logging.Logger;
 
 import rx.Observable;
@@ -43,17 +40,6 @@
 
 public class SocketRealTest {
 
-    private static final URI SERVER_URI;
-
-    static {
-        try {
-            SERVER_URI = new URI("ws://192.168.0.142:8080/ws");
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
     private Socket socket;
 
     @Before
@@ -63,11 +49,12 @@ public void setUp() throws Exception {
                 .registerTypeAdapter(MessageType.class, new MessageType.SerializerDeserializer())
                 .create();
 
-        final NewWebSocket newWebSocket = new NewWebSocket();
-        final RxWebSockets webSockets = new RxWebSockets(newWebSocket,
-                SERVER_URI,
-                ImmutableList.of("chat"),
-                ImmutableList.<Header>of());
+        final RxWebSockets webSockets = new RxWebSockets(new OkHttpClient(),
+                new Request.Builder()
+                        .get()
+                        .url("ws://10.10.0.2:8080/ws")
+                        .addHeader("Sec-WebSocket-Protocol", "chat")
+                        .build());
         final RxObjectWebSockets jsonWebSockets = new RxObjectWebSockets(webSockets, new GsonObjectSerializer(gson, Message.class));
         final SocketConnection socketConnection = new SocketConnectionImpl(jsonWebSockets, Schedulers.computation());
         socket = new Socket(socketConnection, Schedulers.computation());

websockets-rxjava-example/src/test/java/com/example/SocketTest.java

@@ -16,7 +16,6 @@
 
 package com.example;
 
-import com.appunite.websocket.NotConnectedException;
 import com.appunite.websocket.rx.object.ObjectParseException;
 import com.appunite.websocket.rx.object.ObjectWebSocketSender;
 import com.appunite.websocket.rx.object.messages.RxObjectEvent;
@@ -83,7 +82,7 @@ public void testConnection_registerIsSent() throws Exception {
         }
     }
 
-    private void register() throws IOException, InterruptedException, NotConnectedException,
+    private void register() throws IOException, InterruptedException,
             ObjectParseException {
         connection.onNext(new RxObjectEventConnected(sender), 0);
         testScheduler.triggerActions();