h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move HandshakeData

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2013-05-03 12:59:53 +09:00
parent 9f2ef5b5e0
commit 4890247a03
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/github/nkzawa/engineio/client/Socket.java
View File

@@ -4,6 +4,7 @@ import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.engineio.client.transports.Polling; import com.github.nkzawa.engineio.client.transports.Polling;
import com.github.nkzawa.engineio.client.transports.PollingXHR; import com.github.nkzawa.engineio.client.transports.PollingXHR;
import com.github.nkzawa.engineio.client.transports.WebSocket; import com.github.nkzawa.engineio.client.transports.WebSocket;
import com.github.nkzawa.engineio.parser.HandshakeData;
import com.github.nkzawa.engineio.parser.Packet; import com.github.nkzawa.engineio.parser.Packet;
import com.github.nkzawa.engineio.parser.Parser; import com.github.nkzawa.engineio.parser.Parser;
import com.google.gson.Gson; import com.google.gson.Gson;
@@ -553,12 +554,4 @@ public abstract class Socket extends Emitter {
public Emitter evs = new Emitter(); public Emitter evs = new Emitter();
} }
public static class HandshakeData {
public String sid;
public List<String> upgrades;
public long pingInterval;
public long pingTimeout;
}
} }

12
src/main/java/com/github/nkzawa/engineio/parser/HandshakeData.java Normal file
View File

@@ -0,0 +1,12 @@
package com.github.nkzawa.engineio.parser;
import java.util.List;
public class HandshakeData {
public String sid;
public List<String> upgrades;
public long pingInterval;
public long pingTimeout;
}

12
src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
View File

@@ -1,6 +1,7 @@
package com.github.nkzawa.engineio.client; package com.github.nkzawa.engineio.client;
import com.github.nkzawa.emitter.Emitter; import com.github.nkzawa.emitter.Emitter;
import com.github.nkzawa.engineio.parser.HandshakeData;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -13,9 +14,10 @@ import java.io.InputStreamReader;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.concurrent.*; import java.util.concurrent.*;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
@@ -161,9 +163,9 @@ public class ServerConnectionTest {
Object[] args = events.take(); Object[] args = events.take();
assertThat(args.length, is(1)); assertThat(args.length, is(1));
assertThat(args[0], is(instanceOf(Socket.HandshakeData.class))); assertThat(args[0], is(instanceOf(HandshakeData.class)));
Socket.HandshakeData data = (Socket.HandshakeData)args[0]; HandshakeData data = (HandshakeData)args[0];
assertThat(data.sid, is(notNullValue())); assertThat(data.sid, is(notNullValue()));
assertThat(data.upgrades, is(notNullValue())); assertThat(data.upgrades, is(notNullValue()));
assertThat(data.upgrades, is(not(empty()))); assertThat(data.upgrades, is(not(empty())));