Merge branch 'master' into websocket_okhttp

.travis.yml

@@ -1,5 +1,5 @@
 language: java
 install: mvn install -DskipTests=true -Dgpg.skip=true
 jdk:
-  - openjdk6
-  - oraclejdk7
+  - openjdk7
+  - oraclejdk8

src/main/java/com/github/nkzawa/engineio/client/Socket.java

@@ -260,13 +260,18 @@ public class Socket extends Emitter {
         opts.socket = this;
         opts.okHttpClient = this.okHttpClient;
 
+        Transport transport;
         if (WebSocket.NAME.equals(name)) {
-            return new WebSocket(opts);
+            transport = new WebSocket(opts);
         } else if (Polling.NAME.equals(name)) {
-            return new PollingXHR(opts);
+            transport = new PollingXHR(opts);
+        } else {
+            throw new RuntimeException();
         }
 
-        throw new RuntimeException();
+        this.emit(EVENT_TRANSPORT, transport);
+
+        return transport;
     }
 
     private void setTransport(Transport transport) {
@@ -280,8 +285,6 @@ public class Socket extends Emitter {
 
         this.transport = transport;
 
-        self.emit(EVENT_TRANSPORT, transport);
-
         transport.on(Transport.EVENT_DRAIN, new Listener() {
             @Override
             public void call(Object... args) {

src/test/java/com/github/nkzawa/engineio/client/Connection.java

@@ -9,9 +9,12 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.*;
+import java.util.logging.Logger;
 
 public abstract class Connection {
 
+    private static final Logger logger = Logger.getLogger(Socket.class.getName());
+
     final static int TIMEOUT = 10000;
     final static int PORT = 3000;
 
@@ -22,7 +25,7 @@ public abstract class Connection {
 
     @Before
     public void startServer() throws IOException, InterruptedException {
-        System.out.println("Starting server ...");
+        logger.fine("Starting server ...");
 
         final CountDownLatch latch = new CountDownLatch(1);
         serverProcess = Runtime.getRuntime().exec(
@@ -38,10 +41,10 @@ public abstract class Connection {
                     line = reader.readLine();
                     latch.countDown();
                     do {
-                        System.out.println("SERVER OUT: " + line);
+                        logger.fine("SERVER OUT: " + line);
                     } while ((line = reader.readLine()) != null);
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    logger.warning(e.getMessage());
                 }
             }
         });
@@ -53,10 +56,10 @@ public abstract class Connection {
                 String line;
                 try {
                     while ((line = reader.readLine()) != null) {
-                        System.err.println("SERVER ERR: " + line);
+                        logger.fine("SERVER ERR: " + line);
                     }
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    logger.warning(e.getMessage());
                 }
             }
         });
@@ -65,7 +68,7 @@ public abstract class Connection {
 
     @After
     public void stopServer() throws InterruptedException {
-        System.out.println("Stopping server ...");
+        logger.fine("Stopping server ...");
         serverProcess.destroy();
         serverOutout.cancel(false);
         serverError.cancel(false);

src/test/java/com/github/nkzawa/engineio/client/ExecutionTest.java

@@ -7,6 +7,7 @@ import org.junit.runners.JUnit4;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.logging.Logger;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -14,6 +15,8 @@ import static org.junit.Assert.assertThat;
 @RunWith(JUnit4.class)
 public class ExecutionTest extends Connection {
 
+    private static final Logger logger = Logger.getLogger(Socket.class.getName());
+
     final static int TIMEOUT = 30 * 1000;
 
     @Test(timeout = TIMEOUT)
@@ -38,7 +41,7 @@ public class ExecutionTest extends Connection {
                 new InputStreamReader(process.getInputStream()));
         String line;
         while ((line = input.readLine()) != null) {
-            System.out.println("EXEC OUT: " + line);
+            logger.fine("EXEC OUT: " + line);
         }
         process.waitFor();
         assertThat(process.exitValue(), is(0));

src/test/resources/logging.properties

@@ -1,7 +1,7 @@
 handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 .level = ALL
 
-java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.level = INFO
 
 java.util.logging.FileHandler.level = ALL
 java.util.logging.FileHandler.pattern = ./target/test.log