fix java-websocket dependency, and enable to run tests (though it fails)

nkzawa · nkzawa · commit ad8d726bcda8 · 2013-03-30T17:02:42.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ target/
 bin/
 .externalToolBuilders/
 .settings/
+node_modules/
diff --git a/pom.xml b/pom.xml
@@ -7,6 +7,16 @@
 
 
   <repositories>
+    <repository>
+      <id>sonatype-oss-public</id>
+      <url>https://oss.sonatype.org/content/groups/public/</url>
+      <releases>
+          <enabled>true</enabled>
+      </releases>
+      <snapshots>
+          <enabled>true</enabled>
+      </snapshots>
+    </repository>
     <repository>
       <releases>
         <enabled>true</enabled>
@@ -29,9 +39,9 @@
     </dependency>
   
     <dependency>
-      <groupId>org.java_websocket</groupId>
-      <artifactId>WebSocket</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <groupId>org.java-websocket</groupId>
+      <artifactId>Java-WebSocket</artifactId>
+      <version>1.3.0-SNAPSHOT</version>
     </dependency>
     
     <dependency>
@@ -41,8 +51,7 @@
       <type>jar</type>
       <scope>test</scope>
     </dependency>
-    
-    
+
   </dependencies>
   
   
@@ -88,8 +97,18 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+       <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.14</version>
+          <configuration>
+            <includes>
+              <include>**/AllTests.java</include>
+            </includes>
+          </configuration>
+       </plugin>
       
-      
+
       <!--  DEPLOY -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -102,4 +121,4 @@
     </plugins>
   </build>
   
-</project>
+</project>
diff --git a/src/test/java/io/socket/AbstractTestSocketIO.java b/src/test/java/io/socket/AbstractTestSocketIO.java
@@ -14,6 +14,7 @@
 import io.socket.testutils.MutateProxy;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Arrays;
@@ -40,7 +41,10 @@ public abstract class AbstractTestSocketIO implements IOCallback {
 	private static final String REQUEST_ACKNOWLEDGE = "requestAcknowledge";
 
 	/** The Constant to the node executable */
-	private final static String NODE = "/usr/local/bin/node";
+	private final static String NODE = "node";
+	private final static String NPM = "npm";
+
+	private final static File RESOURCES_DIR = new File("./src/test/resources");
 
 	/** The port of this test, randomly choosed */
 	private int port = -1;
@@ -98,10 +102,15 @@ public void setUp() throws Exception {
 		events = new LinkedBlockingQueue<String>();
 		outputs = new LinkedBlockingQueue<String>();
 		args = new LinkedBlockingQueue<Object>();
+
+		System.out.println("Installing socket.io ...");
+		Runtime.getRuntime().exec(new String[] { NPM, "install" },
+				null, RESOURCES_DIR).waitFor();
+
 		System.out.println("Connect with " + transport);
 		node = Runtime.getRuntime().exec(
-				new String[] { NODE, "./tests/io/socket/testutils/socketio.js",
-						"" + getPort(), transport });
+				new String[] { NODE, "socketio.js", "" + getPort(), transport },
+				null, RESOURCES_DIR);
 		proxy = new MutateProxy(getPort() + 1, getPort());
 		proxy.start();
 
diff --git a/src/test/resources/package.json b/src/test/resources/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "socket.io-java-client-test",
+  "version": "0.0.0",
+  "dependencies": {
+    "socket.io": "0.9.14"
+  }
+}
diff --git a/src/test/resources/socketio.js b/src/test/resources/socketio.js
