move node server in test package, make acknowledge test working again.

morganwu · Feb 20, 2012 · 9dbb23c · 9dbb23c
1 parent c9455dc
commit 9dbb23c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/tests/io/socket/TestSocketIO.java b/tests/io/socket/TestSocketIO.java
@@ -19,9 +19,9 @@
 
 @RunWith(io.socket.RandomBlockJUnit4ClassRunner.class)
 public class TestSocketIO implements IOCallback {
-	private final static String NODE = "/opt/local/bin/node";
+	private final static String NODE = "C:\\Program Files (x86)\\nodejs\\node.exe";
 	private static final int PORT = 10214;
-	private static final int TIMEOUT = 200;
+	private static final int TIMEOUT = 2;
 	LinkedBlockingQueue<String> events;
 	LinkedBlockingQueue<String> outputs;
 	LinkedBlockingQueue<Object> args;
@@ -205,7 +205,6 @@ public void namespaces() throws Exception {
 		assertEquals("ns2", takeArg());
 
 		ns2_2.disconnect();
-
 		ns2.disconnect();
 		assertEquals("onDisconnect", takeEvent());
 		assertEquals("onDisconnect", takeEvent());
@@ -215,7 +214,7 @@ public void namespaces() throws Exception {
 	@Test
 	public void error() throws Exception {
 		doConnect();
-		SocketIO error = new SocketIO(
+		new SocketIO(
 				"http://127.0.0.1:" + (PORT + 1) + "/ns1", this);
 		assertEquals("onError", takeEvent());
 		doClose();

diff --git a/node/socketio.js → tests/io/socket/socketio.js b/node/socketio.js → tests/io/socket/socketio.js
@@ -23,6 +23,9 @@ var main = io.sockets.on('connection', function(socket) {
 			socket.send(data);
 		}
 	});
+	socket.on('echoAck', function(data, ack) {
+		ack(data);
+	});
 	socket.on('message', function(m) {
 		process.stdout.write("__:MESSAGE:"+m+"\n");
 	});