From 4890247a036fd541fb00a54856cab47eb285f44a Mon Sep 17 00:00:00 2001
From: Naoyuki Kanezawa <naoyuki.kanezawa@gmail.com>
Date: Fri, 3 May 2013 12:59:53 +0900
Subject: [PATCH] move HandshakeData

---
 .../com/github/nkzawa/engineio/client/Socket.java    |  9 +--------
 .../github/nkzawa/engineio/parser/HandshakeData.java | 12 ++++++++++++
 .../nkzawa/engineio/client/ServerConnectionTest.java | 12 +++++++-----
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/github/nkzawa/engineio/parser/HandshakeData.java

diff --git a/src/main/java/com/github/nkzawa/engineio/client/Socket.java b/src/main/java/com/github/nkzawa/engineio/client/Socket.java
index c1d596a..1971437 100644
--- a/src/main/java/com/github/nkzawa/engineio/client/Socket.java
+++ b/src/main/java/com/github/nkzawa/engineio/client/Socket.java
@@ -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.PollingXHR;
 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.Parser;
 import com.google.gson.Gson;
@@ -553,12 +554,4 @@ public abstract class Socket extends Emitter {
 
         public Emitter evs = new Emitter();
     }
-
-    public static class HandshakeData {
-
-        public String sid;
-        public List<String> upgrades;
-        public long pingInterval;
-        public long pingTimeout;
-    }
 }
diff --git a/src/main/java/com/github/nkzawa/engineio/parser/HandshakeData.java b/src/main/java/com/github/nkzawa/engineio/parser/HandshakeData.java
new file mode 100644
index 0000000..16757bb
--- /dev/null
+++ b/src/main/java/com/github/nkzawa/engineio/parser/HandshakeData.java
@@ -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;
+}
diff --git a/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java b/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
index 4da8739..0c91b0f 100644
--- a/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
+++ b/src/test/java/com/github/nkzawa/engineio/client/ServerConnectionTest.java
@@ -1,6 +1,7 @@
 package com.github.nkzawa.engineio.client;
 
 import com.github.nkzawa.emitter.Emitter;
+import com.github.nkzawa.engineio.parser.HandshakeData;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,9 +14,10 @@ import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.util.concurrent.*;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertThat;
 
@@ -161,9 +163,9 @@ public class ServerConnectionTest {
 
         Object[] args = events.take();
         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.upgrades, is(notNullValue()));
         assertThat(data.upgrades, is(not(empty())));