From c9455dc4ab4fa9b27b995cf3a237223a3a3e66a8 Mon Sep 17 00:00:00 2001
From: "Enno Boland (Gottox)" <g@s01.de>
Date: Mon, 20 Feb 2012 13:51:39 +0100
Subject: [PATCH] Merge

---
 tests/io/socket/TestSocketIO.java | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/io/socket/TestSocketIO.java b/tests/io/socket/TestSocketIO.java
index bf25e04..1b30f05 100644
--- a/tests/io/socket/TestSocketIO.java
+++ b/tests/io/socket/TestSocketIO.java
@@ -5,9 +5,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
@@ -21,9 +19,9 @@
 
 @RunWith(io.socket.RandomBlockJUnit4ClassRunner.class)
 public class TestSocketIO implements IOCallback {
-	private final static String NODE = "C:\\Program Files (x86)\\nodejs\\node.exe";
+	private final static String NODE = "/opt/local/bin/node";
 	private static final int PORT = 10214;
-	private static final int TIMEOUT = 2;
+	private static final int TIMEOUT = 200;
 	LinkedBlockingQueue<String> events;
 	LinkedBlockingQueue<String> outputs;
 	LinkedBlockingQueue<Object> args;
@@ -47,7 +45,7 @@ public void setUp() throws Exception {
 		outputs = new LinkedBlockingQueue<String>();
 		args = new LinkedBlockingQueue<Object>();
 		node = Runtime.getRuntime().exec(
-				new String[] { NODE, "./node/socketio.js", "" + PORT });
+				new String[] { NODE, "./tests/io/socket/socketio.js", "" + PORT });
 
 		stdoutThread = new Thread("stdoutThread") {
 			public void run() {
@@ -222,6 +220,21 @@ public void error() throws Exception {
 		assertEquals("onError", takeEvent());
 		doClose();
 	}
+	
+	@Test
+	public void acknowledge() throws Exception {
+		doConnect();
+		socket.emit("echoAck", new IOAcknowledge() {
+			@Override
+			public void ack(Object... args) {
+				events.add("ack");
+				TestSocketIO.this.args.addAll(Arrays.asList(args));
+			}
+		}, "TESTSTRING");
+		assertEquals("ack", takeEvent());
+		assertEquals("TESTSTRING", takeArg());
+		doClose();
+	}
 
 	// END TESTS