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

Merge pull request #24 from nkzawa/fix-headers

Browse Source 
Fix http headers type
This commit is contained in:
Naoyuki Kanezawa
2015-08-09 05:10:51 +09:00
parent 6710cba980 845a4f0639
commit 3bcf06c53e
5 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -61,7 +63,7 @@ public class ServerConnectionTest extends Connection {
}).on(Socket.EVENT_MESSAGE, new Emitter.Listener() {
@Override
public void call(Object... args) {
events.offer((String)args[0]);
events.offer((String) args[0]);
}
});
socket.open();
@@ -89,7 +91,7 @@ public class ServerConnectionTest extends Connection {
HandshakeData data = (HandshakeData)args[0];
assertThat(data.sid, is(notNullValue()));
assertThat(data.upgrades, is(not(emptyArray())));
assertThat(data.pingTimeout, is(greaterThan((long)0)));
assertThat(data.pingTimeout, is(greaterThan((long) 0)));
assertThat(data.pingInterval, is(greaterThan((long) 0)));
socket.close();
}
@@ -144,15 +146,17 @@ public class ServerConnectionTest extends Connection {
@Override
public void call(Object... args) {
@SuppressWarnings("unchecked")
Map<String, String> headers = (Map<String, String>)args[0];
headers.put("X-EngineIO", "foo");
Map<String, List<String>> headers = (Map<String, List<String>>)args[0];
headers.put("X-EngineIO", Arrays.asList("foo"));
}
}).on(Transport.EVENT_RESPONSE_HEADERS, new Emitter.Listener() {
@Override
public void call(Object... args) {
@SuppressWarnings("unchecked")
Map<String, String> headers = (Map<String, String>)args[0];
messages.offer(headers.get("X-EngineIO"));
Map<String, List<String>> headers = (Map<String, List<String>>)args[0];
List<String> values = headers.get("X-EngineIO");
messages.offer(values.get(0));
messages.offer(values.get(1));
}
});
}
@@ -160,7 +164,7 @@ public class ServerConnectionTest extends Connection {
socket.open();
assertThat(messages.take(), is("foo"));
assertThat(messages.take(), is("foo"));
assertThat(messages.take(), is("hi"));
socket.close();
}
@@ -180,21 +184,24 @@ public class ServerConnectionTest extends Connection {
@Override
public void call(Object... args) {
@SuppressWarnings("unchecked")
Map<String, String> headers = (Map<String, String>)args[0];
headers.put("X-EngineIO", "foo");
Map<String, List<String>> headers = (Map<String, List<String>>)args[0];
headers.put("X-EngineIO", Arrays.asList("foo"));
}
}).on(Transport.EVENT_RESPONSE_HEADERS, new Emitter.Listener() {
@Override
public void call(Object... args) {
@SuppressWarnings("unchecked")
Map<String, String> headers = (Map<String, String>)args[0];
messages.offer(headers.get("X-EngineIO"));
Map<String, List<String>> headers = (Map<String, List<String>>)args[0];
List<String> values = headers.get("X-EngineIO");
messages.offer(values.get(0));
messages.offer(values.get(1));
}
});
}
});
socket.open();
assertThat(messages.take(), is("hi"));
assertThat(messages.take(), is("foo"));
socket.close();
}
@@ -265,7 +272,7 @@ public class ServerConnectionTest extends Connection {
}
});
assertThat((String)values.take(), is(Polling.NAME));
assertThat((String) values.take(), is(Polling.NAME));
assertThat((String)values.take(), is(not(WebSocket.NAME)));
}
}

3
src/test/resources/server.js
View File

@@ -45,7 +45,7 @@ before(server, 'handleRequest', function(req, res) {
// echo a header value
var value = req.headers['x-engineio'];
if (!value) return;
res.setHeader('X-EngineIO', value);
res.setHeader('X-EngineIO', ['hi', value]);
});
before(server, 'handleUpgrade', function(req, socket, head) {
@@ -53,6 +53,7 @@ before(server, 'handleUpgrade', function(req, socket, head) {
var value = req.headers['x-engineio'];
if (!value) return;
this.ws.once('headers', function(headers) {
headers.push('X-EngineIO: hi');
headers.push('X-EngineIO: ' + value);
});
});