Handle executors better in tests

Author: lutovich

driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java

@@ -31,6 +31,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -62,7 +63,6 @@
 import org.neo4j.driver.v1.util.TestNeo4j;
 
 import static java.lang.String.format;
-import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -98,6 +98,7 @@ public class SessionIT
     public ExpectedException exception = ExpectedException.none();
 
     private Driver driver;
+    private ExecutorService executor;
 
     @After
     public void tearDown()
@@ -106,6 +107,10 @@ public void tearDown()
         {
             driver.close();
         }
+        if ( executor != null )
+        {
+            executor.shutdownNow();
+        }
     }
 
     @Test
@@ -1451,9 +1456,12 @@ private static void assertDeadlockDetectedError( ExecutionException e )
         assertEquals( "Neo.TransientError.Transaction.DeadlockDetected", errorCode );
     }
 
-    private static <T> Future<T> executeInDifferentThread( Callable<T> callable )
+    private <T> Future<T> executeInDifferentThread( Callable<T> callable )
     {
-        ExecutorService executor = newSingleThreadExecutor( daemon( "test-thread-" ) );
+        if ( executor == null )
+        {
+            executor = Executors.newCachedThreadPool( daemon( getClass().getSimpleName() + "-thread-" ) );
+        }
         return executor.submit( callable );
     }
 
@@ -1470,7 +1478,7 @@ private static void await( CountDownLatch latch )
         }
     }
 
-    private static abstract class NodeIdUpdater
+    private abstract class NodeIdUpdater
     {
         final Future<Void> update( final Driver driver, final int nodeId, final int newNodeId,
                 final AtomicReference<Session> usedSessionRef, final CountDownLatch latchToWait )

driver/src/test/java/org/neo4j/driver/v1/stress/SessionPoolingStressIT.java

@@ -35,7 +35,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.neo4j.driver.v1.AuthTokens;
 import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.Session;
@@ -45,6 +44,7 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.driver.v1.GraphDatabase.driver;
+import static org.neo4j.driver.v1.util.DaemonThreadFactory.daemon;
 
 public class SessionPoolingStressIT
 {
@@ -87,7 +87,7 @@ protected void failed( Throwable e, Description description )
     @Before
     public void setUp() throws Exception
     {
-        executor = Executors.newFixedThreadPool( N_THREADS );
+        executor = Executors.newFixedThreadPool( N_THREADS, daemon( getClass().getSimpleName() + "-thread-" ) );
     }
 
     @After
@@ -122,7 +122,7 @@ public void shouldWorkFine() throws Throwable
 
         stop.set( true );
         executor.shutdown();
-        assertTrue( executor.awaitTermination( 20, TimeUnit.SECONDS ) );
+        assertTrue( executor.awaitTermination( 30, TimeUnit.SECONDS ) );
 
         Throwable failure = failureReference.get();
         if ( failure != null )