Use default ThreadFactory for NIO in test suite

The ExecutorService wasn't closed properly in the base test
class, there were thus many threads in park state when running
the test suite. This could lead to resource exhaustion, especially
on MacOS.

Fixes #11

Author: acogoluegnes

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

@@ -17,7 +17,6 @@
 package com.rabbitmq.client.test;
 
 import com.rabbitmq.client.*;
-import com.rabbitmq.client.impl.nio.NioParams;
 import com.rabbitmq.tools.Host;
 import org.junit.After;
 import org.junit.Before;
@@ -34,8 +33,6 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
 
 import static org.junit.Assert.*;
@@ -58,17 +55,12 @@ protected void finished(Description description) {
 
     protected ConnectionFactory connectionFactory = newConnectionFactory();
 
-    protected ExecutorService nioExecutor = null;
-
     protected ConnectionFactory newConnectionFactory() {
         ConnectionFactory connectionFactory = new ConnectionFactory();
         if(nio()) {
             connectionFactory.useNio();
-            this.nioExecutor = Executors.newFixedThreadPool(5);
-            connectionFactory.setNioParams(new NioParams().setNioExecutor(this.nioExecutor));
         } else {
             connectionFactory.useBlockingIo();
-            this.nioExecutor = null;
         }
 
         return connectionFactory;
@@ -91,24 +83,14 @@ protected boolean nio() {
 
     @After public void tearDown()
             throws IOException, TimeoutException {
-        try {
-            closeChannel();
-            closeConnection();
-
-            openConnection();
-            openChannel();
-            releaseResources();
-            closeChannel();
-            closeConnection();
-        } finally {
-            if(nio()) {
-                if(this.nioExecutor != null) {
-                    this.nioExecutor.shutdownNow();
-                }
-            }
-        }
-
+        closeChannel();
+        closeConnection();
 
+        openConnection();
+        openChannel();
+        releaseResources();
+        closeChannel();
+        closeConnection();
     }
 
     /**

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

@@ -55,7 +55,6 @@ public void twoConnectionsWithNioExecutor() throws IOException, TimeoutException
         ExecutorService nioExecutor = Executors.newFixedThreadPool(5);
         ConnectionFactory connectionFactory = new ConnectionFactory();
         connectionFactory.useNio();
-        connectionFactory.setNioParams(new NioParams().setNioExecutor(nioExecutor));
         Connection connection1 = null;
         Connection connection2 = null;
         try {

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

@@ -16,7 +16,6 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.*;
-import com.rabbitmq.client.impl.nio.NioParams;
 import com.rabbitmq.client.impl.recovery.*;
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.tools.Host;
@@ -831,7 +830,6 @@ private ConnectionFactory buildConnectionFactoryWithRecoveryEnabled(boolean disa
         }
         if(nio()) {
             cf.useNio();
-            cf.setNioParams(new NioParams().setNioExecutor(this.nioExecutor));
         } else {
             cf.useBlockingIo();
         }

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

@@ -16,7 +16,6 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.*;
-import com.rabbitmq.client.impl.nio.NioParams;
 import com.rabbitmq.client.impl.StandardMetricsCollector;
 import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;
 import com.rabbitmq.client.test.BrokerTestCase;
@@ -268,6 +267,7 @@ private void doMultiThreadedMetrics(ConnectionFactory connectionFactory) throws
 
         // create connections
         Connection [] connections = new Connection[nbConnections];
+        ExecutorService executorService = Executors.newFixedThreadPool(nbTasks);
         try {
             Channel [] channels = new Channel[nbChannels];
             for(int i = 0; i < nbConnections; i++) {
@@ -284,7 +284,7 @@ private void doMultiThreadedMetrics(ConnectionFactory connectionFactory) throws
                 sendMessage(channels[random.nextInt(nbChannels)]);
             }
 
-            ExecutorService executorService = Executors.newFixedThreadPool(nbTasks);
+
             List<Callable<Void>> tasks = new ArrayList<Callable<Void>>();
             for(int i = 0; i < nbTasks; i++) {
                 Channel channelForConsuming = channels[random.nextInt(nbChannels)];
@@ -311,6 +311,8 @@ private void doMultiThreadedMetrics(ConnectionFactory connectionFactory) throws
                 sendMessage(channels[random.nextInt(nbChannels)]);
             }
 
+            executorService.shutdownNow();
+
             executorService = Executors.newFixedThreadPool(nbTasks);
             tasks = new ArrayList<Callable<Void>>();
             for(int i = 0; i < nbTasks; i++) {
@@ -338,6 +340,8 @@ private void doMultiThreadedMetrics(ConnectionFactory connectionFactory) throws
                 sendMessage(channels[random.nextInt(nbChannels)]);
             }
 
+            executorService.shutdownNow();
+
             executorService = Executors.newFixedThreadPool(nbTasks);
             tasks = new ArrayList<Callable<Void>>();
             for(int i = 0; i < nbTasks; i++) {
@@ -356,6 +360,7 @@ private void doMultiThreadedMetrics(ConnectionFactory connectionFactory) throws
             for (Connection connection : connections) {
                 safeClose(connection);
             }
+            executorService.shutdownNow();
         }
 
     }
@@ -427,7 +432,6 @@ private ConnectionFactory createConnectionFactory() {
         ConnectionFactory connectionFactory = new ConnectionFactory();
         if(nio()) {
             connectionFactory.useNio();
-            connectionFactory.setNioParams(new NioParams().setNioExecutor(this.nioExecutor));
         } else {
             connectionFactory.useBlockingIo();
         }