Add use-nio profile for Maven test suite

The default is to use blocking IO.

Fixes #11

Author: acogoluegnes

pom.xml

@@ -410,6 +410,28 @@
       </build>
     </profile>
 
+    <!--
+      Profile to activate the NIO mode in the test suite:
+      mvn verify -P use-nio
+    -->
+    <profile>
+      <id>use-nio</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>2.19.1</version>
+            <configuration>
+              <systemPropertyVariables>
+                <use.nio>true</use.nio>
+              </systemPropertyVariables>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <!--
       The "release" Maven profile is used to push release artifacts to a

src/main/java/com/rabbitmq/client/ConnectionFactory.java

@@ -110,7 +110,7 @@ public class ConnectionFactory implements Cloneable {
 
     private MetricsCollector metricsCollector;
 
-    private boolean nio = true;
+    private boolean nio = false;
     private FrameHandlerFactory frameHandlerFactory;
     private NioParams nioParams = new NioParams();
 

src/main/java/com/rabbitmq/client/impl/nio/NioHelper.java

@@ -1,13 +1,25 @@
+// Copyright (c) 2007-Present Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// [email protected].
+
 package com.rabbitmq.client.impl.nio;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SocketChannel;
 
-/**
- * Created by acogoluegnes on 04/10/2016.
- */
 public class NioHelper {
 
     static int read(ReadableByteChannel channel, ByteBuffer buffer) throws IOException {

src/test/java/com/rabbitmq/client/test/AMQConnectionTest.java

@@ -53,7 +53,7 @@ public class AMQConnectionTest {
 
     @Before public void setUp() throws Exception {
         _mockFrameHandler = new MockFrameHandler();
-        factory = new ConnectionFactory();
+        factory = TestUtils.connectionFactory();
         exceptionHandler = new MyExceptionHandler();
         factory.setExceptionHandler(exceptionHandler);
     }
@@ -64,7 +64,7 @@ public class AMQConnectionTest {
     }
 
     @Test public void negativeTCPConnectionTimeout() {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         try {
             cf.setConnectionTimeout(-10);
             fail("expected an exception");
@@ -74,7 +74,7 @@ public class AMQConnectionTest {
     }
 
     @Test public void negativeProtocolHandshakeTimeout() {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         try {
             cf.setHandshakeTimeout(-10);
             fail("expected an exception");
@@ -84,13 +84,13 @@ public class AMQConnectionTest {
     }
 
     @Test public void tcpConnectionTimeoutGreaterThanHandShakeTimeout() {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         cf.setHandshakeTimeout(3000);
         cf.setConnectionTimeout(5000);
     }
 
     @Test public void protocolHandshakeTimeoutGreaterThanTCPConnectionTimeout() {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
 
         cf.setConnectionTimeout(5000);
         cf.setHandshakeTimeout(7000);

src/test/java/com/rabbitmq/client/test/AmqpUriTest.java

@@ -77,7 +77,7 @@ private void parseSuccess(String uri, String user, String password,
                               String host, int port, String vhost)
         throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException
     {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         cf.setUri(uri);
 
         assertEquals(user, cf.getUsername());
@@ -89,7 +89,7 @@ private void parseSuccess(String uri, String user, String password,
 
     private void parseFail(String uri) {
         try {
-            (new ConnectionFactory()).setUri(uri);
+            (TestUtils.connectionFactory()).setUri(uri);
             fail("URI parse didn't fail: '" + uri + "'");
         } catch (Exception e) {
             // whoosh!

src/test/java/com/rabbitmq/client/test/BrokenFramesTest.java

@@ -44,7 +44,7 @@ public class BrokenFramesTest {
 
     @Before public void setUp() throws Exception {
         myFrameHandler = new MyFrameHandler();
-        factory = new ConnectionFactory();
+        factory = TestUtils.connectionFactory();
     }
 
     @After public void tearDown() throws Exception {

src/test/java/com/rabbitmq/client/test/BrokerTestCase.java

@@ -44,7 +44,10 @@ public class BrokerTestCase {
     @Rule
     public TestRule watcher = new TestWatcher() {
         protected void starting(Description description) {
-            LOGGER.info("Starting test: {}.{}", description.getTestClass().getSimpleName(), description.getMethodName());
+            LOGGER.info(
+                "Starting test: {}.{} (nio? {})",
+                description.getTestClass().getSimpleName(), description.getMethodName(), TestUtils.USE_NIO
+            );
         }
 
         @Override
@@ -56,20 +59,10 @@ protected void finished(Description description) {
     protected ConnectionFactory connectionFactory = newConnectionFactory();
 
     protected ConnectionFactory newConnectionFactory() {
-        ConnectionFactory connectionFactory = new ConnectionFactory();
-        if(nio()) {
-            connectionFactory.useNio();
-        } else {
-            connectionFactory.useBlockingIo();
-        }
-
+        ConnectionFactory connectionFactory = TestUtils.connectionFactory();
         return connectionFactory;
     }
 
-    protected boolean nio() {
-        return true;
-    }
-
     protected Connection connection;
     protected Channel channel;
 

src/test/java/com/rabbitmq/client/test/ChannelNumberAllocationTests.java

@@ -42,7 +42,7 @@ public int compare(Channel x, Channel y){
   Connection connection;
 
   @Before public void setUp() throws Exception{
-    connection = new ConnectionFactory().newConnection();
+    connection = TestUtils.connectionFactory().newConnection();
   }
 
   @After public void tearDown() throws Exception{

src/test/java/com/rabbitmq/client/test/CloseInMainLoop.java

@@ -42,7 +42,7 @@ public class CloseInMainLoop extends BrokerTestCase{
     private final CountDownLatch closeLatch = new CountDownLatch(1);
 
     private ConnectionFactory specialConnectionFactory() {
-        ConnectionFactory f = new ConnectionFactory();
+        ConnectionFactory f = TestUtils.connectionFactory();
         f.setExceptionHandler(new DefaultExceptionHandler(){
             @Override
             public void handleConsumerException(Channel channel,

src/test/java/com/rabbitmq/client/test/SharedThreadPoolTest.java

@@ -30,7 +30,7 @@
 
 public class SharedThreadPoolTest extends BrokerTestCase {
     @Test public void willShutDownExecutor() throws IOException, TimeoutException {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         ExecutorService executor = Executors.newFixedThreadPool(8);
         cf.setSharedExecutor(executor);
 

src/test/java/com/rabbitmq/client/test/ssl/NioTlsBadVerifiedConnection.java renamed to src/test/java/com/rabbitmq/client/test/TestUtils.java

@@ -13,15 +13,22 @@
 // If you have any questions regarding licensing, please contact us at
 // [email protected].
 
-package com.rabbitmq.client.test.ssl;
+package com.rabbitmq.client.test;
 
-/**
- *
- */
-public class NioTlsBadVerifiedConnection extends BadVerifiedConnection {
+import com.rabbitmq.client.ConnectionFactory;
 
-    @Override
-    protected boolean nio() {
-        return true;
+public class TestUtils {
+
+    public static final boolean USE_NIO = System.getProperty("use.nio") == null ? false : true;
+
+    public static ConnectionFactory connectionFactory() {
+        ConnectionFactory connectionFactory = new ConnectionFactory();
+        if(USE_NIO) {
+            connectionFactory.useNio();
+        } else {
+            connectionFactory.useBlockingIo();
+        }
+        return connectionFactory;
     }
+
 }

src/test/java/com/rabbitmq/client/test/functional/ConnectionOpen.java

@@ -25,6 +25,7 @@
 import java.net.Socket;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.test.TestUtils;
 import org.junit.Test;
 
 import com.rabbitmq.client.AMQP;
@@ -40,7 +41,7 @@
  */
 public class ConnectionOpen {
     @Test public void correctProtocolHeader() throws IOException {
-        ConnectionFactory factory = new ConnectionFactory();
+        ConnectionFactory factory = TestUtils.connectionFactory();
         SocketFrameHandler fh = new SocketFrameHandler(factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT));
         fh.sendHeader();
         AMQCommand command = new AMQCommand();
@@ -57,7 +58,7 @@ public class ConnectionOpen {
     }
 
     @Test public void crazyProtocolHeader() throws IOException {
-        ConnectionFactory factory = new ConnectionFactory();
+        ConnectionFactory factory = TestUtils.connectionFactory();
         // keep the frame handler's socket
         Socket fhSocket = factory.getSocketFactory().createSocket("localhost", AMQP.PROTOCOL.PORT);
         SocketFrameHandler fh = new SocketFrameHandler(fhSocket);
@@ -89,7 +90,7 @@ public class ConnectionOpen {
     }
 
     @Test public void frameMaxLessThanFrameMinSize() throws IOException, TimeoutException {
-        ConnectionFactory factory = new ConnectionFactory();
+        ConnectionFactory factory = TestUtils.connectionFactory();
         factory.setRequestedFrameMax(100);
         try {
             factory.newConnection();

src/test/java/com/rabbitmq/client/test/functional/ConnectionRecovery.java

@@ -18,6 +18,7 @@
 import com.rabbitmq.client.*;
 import com.rabbitmq.client.impl.recovery.*;
 import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.client.test.TestUtils;
 import com.rabbitmq.tools.Host;
 import org.junit.Test;
 
@@ -822,17 +823,12 @@ private AutorecoveringConnection newRecoveringConnection(String connectionName)
     }
 
     private ConnectionFactory buildConnectionFactoryWithRecoveryEnabled(boolean disableTopologyRecovery) {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         cf.setNetworkRecoveryInterval(RECOVERY_INTERVAL);
         cf.setAutomaticRecoveryEnabled(true);
         if (disableTopologyRecovery) {
             cf.setTopologyRecoveryEnabled(false);
         }
-        if(nio()) {
-            cf.useNio();
-        } else {
-            cf.useBlockingIo();
-        }
         return cf;
     }
 

src/test/java/com/rabbitmq/client/test/functional/ExceptionHandling.java

@@ -23,6 +23,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.test.TestUtils;
 import org.junit.Test;
 
 import com.rabbitmq.client.AMQP;
@@ -38,7 +39,7 @@
 
 public class ExceptionHandling {
     private ConnectionFactory newConnectionFactory(ExceptionHandler eh) {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         cf.setExceptionHandler(eh);
         return cf;
     }
@@ -91,7 +92,7 @@ public void handleDelivery(String consumerTag, Envelope envelope,
     }
 
     @Test public void nullExceptionHandler() {
-      ConnectionFactory cf = new ConnectionFactory();
+      ConnectionFactory cf = TestUtils.connectionFactory();
       try {
         cf.setExceptionHandler(null);
         fail("expected setExceptionHandler to throw");

src/test/java/com/rabbitmq/client/test/functional/ExchangeDeclare.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.test.TestUtils;
 import org.junit.Test;
 
 import com.rabbitmq.client.BuiltinExchangeType;
@@ -87,7 +88,7 @@ public void releaseResources() throws IOException {
     }
 
     @Test public void exchangeDeclaredWithEnumerationEquivalentOnRecoverableConnection() throws IOException, TimeoutException, InterruptedException {
-        ConnectionFactory connectionFactory = new ConnectionFactory();
+        ConnectionFactory connectionFactory = TestUtils.connectionFactory();
         connectionFactory.setAutomaticRecoveryEnabled(true);
         connectionFactory.setTopologyRecoveryEnabled(false);
         Connection c = connectionFactory.newConnection();

src/test/java/com/rabbitmq/client/test/functional/FrameMax.java

@@ -25,6 +25,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.test.TestUtils;
 import org.junit.Test;
 
 import com.rabbitmq.client.AMQP;
@@ -81,7 +82,7 @@ public FrameMax() {
      * during connection negotiation */
     @Test public void rejectLargeFramesDuringConnectionNegotiation()
             throws IOException, TimeoutException {
-        ConnectionFactory cf = new ConnectionFactory();
+        ConnectionFactory cf = TestUtils.connectionFactory();
         cf.getClientProperties().put("too_long", LongStringHelper.asLongString(new byte[AMQP.FRAME_MIN_SIZE]));
         try {
             cf.newConnection();
@@ -106,6 +107,16 @@ public FrameMax() {
     /* ConnectionFactory that uses MyFrameHandler rather than
      * SocketFrameHandler. */
     private static class MyConnectionFactory extends ConnectionFactory {
+
+        public MyConnectionFactory() {
+            super();
+            if(TestUtils.USE_NIO) {
+                useNio();
+            } else {
+                useBlockingIo();
+            }
+        }
+
         protected FrameHandler createFrameHandler(Socket sock)
             throws IOException
         {
@@ -154,6 +165,15 @@ public GenerousAMQConnection(ConnectionFactory factory,
 
     private static class GenerousConnectionFactory extends ConnectionFactory {
 
+        public GenerousConnectionFactory() {
+            super();
+            if(TestUtils.USE_NIO) {
+                useNio();
+            } else {
+                useBlockingIo();
+            }
+        }
+
         @Override public Connection newConnection(ExecutorService executor, List<Address> addrs)
                 throws IOException, TimeoutException {
             IOException lastException = null;