Skip to content

Commit 61116cb

Browse files
Fixed compilation
Change-Id: Ib8d699d6743cfb605fc7eda0aaf9ee1056c84d90
1 parent b2c678e commit 61116cb

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.appunite.websocket.NewWebSocket;
2020
import com.appunite.websocket.rx.RxWebSockets;
21+
import com.appunite.websocket.rx.object.GsonObjectSerializer;
2122
import com.appunite.websocket.rx.object.RxObjectWebSockets;
2223
import com.example.model.Message;
2324
import com.example.model.MessageType;
@@ -63,7 +64,7 @@ public void setUp() throws Exception {
6364
SERVER_URI,
6465
ImmutableList.of("chat"),
6566
ImmutableList.<Header>of());
66-
socket = new RxObjectWebSockets(rxWebSockets, gson, Message.class);;
67+
socket = new RxObjectWebSockets(rxWebSockets, new GsonObjectSerializer(gson, Message.class));
6768
}
6869

6970
@Test

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.appunite.websocket.NewWebSocket;
2020
import com.appunite.websocket.rx.*;
21+
import com.appunite.websocket.rx.object.GsonObjectSerializer;
2122
import com.appunite.websocket.rx.object.RxObjectWebSockets;
2223
import com.example.model.DataMessage;
2324
import com.example.model.MessageType;
@@ -67,7 +68,7 @@ public void setUp() throws Exception {
6768
SERVER_URI,
6869
ImmutableList.of("chat"),
6970
ImmutableList.<Header>of());
70-
final RxObjectWebSockets jsonWebSockets = new RxObjectWebSockets(webSockets, gson, Message.class);
71+
final RxObjectWebSockets jsonWebSockets = new RxObjectWebSockets(webSockets, new GsonObjectSerializer(gson, Message.class));
7172
final SocketConnection socketConnection = new SocketConnectionImpl(jsonWebSockets, Schedulers.computation());
7273
socket = new Socket(socketConnection, Schedulers.computation());
7374

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.example;
1818

1919
import com.appunite.websocket.NotConnectedException;
20+
import com.appunite.websocket.rx.object.ObjectParseException;
2021
import com.appunite.websocket.rx.object.ObjectWebSocketSender;
2122
import com.appunite.websocket.rx.object.messages.RxObjectEvent;
2223
import com.appunite.websocket.rx.object.messages.RxObjectEventConnected;
@@ -82,7 +83,8 @@ public void testConnection_registerIsSent() throws Exception {
8283
}
8384
}
8485

85-
private void register() throws IOException, InterruptedException, NotConnectedException {
86+
private void register() throws IOException, InterruptedException, NotConnectedException,
87+
ObjectParseException {
8688
connection.onNext(new RxObjectEventConnected(sender), 0);
8789
testScheduler.triggerActions();
8890
verify(sender).sendObjectMessage(new RegisterMessage("asdf"));

0 commit comments

Comments
 (0)