Do not start both CC and single db in tests

Author: lutovich

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

@@ -18,6 +18,7 @@
  */
 package org.neo4j.driver.v1.integration;
 
+import org.junit.AfterClass;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -85,6 +86,12 @@ public class CausalClusteringIT
     @Rule
     public final ClusterRule clusterRule = new ClusterRule();
 
+    @AfterClass
+    public static void stopSharedCluster()
+    {
+        ClusterRule.stopSharedCluster();
+    }
+
     @Test
     public void shouldExecuteReadAndWritesWhenDriverSuppliedWithAddressOfLeader() throws Exception
     {

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

@@ -18,6 +18,7 @@
  */
 package org.neo4j.driver.v1.stress;
 
+import org.junit.AfterClass;
 import org.junit.Rule;
 
 import java.net.URI;
@@ -40,6 +41,7 @@
 import org.neo4j.driver.v1.exceptions.SessionExpiredException;
 import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.util.cc.ClusterMemberRole;
+import org.neo4j.driver.v1.util.cc.ClusterRule;
 import org.neo4j.driver.v1.util.cc.LocalOrRemoteClusterRule;
 
 import static org.hamcrest.Matchers.both;
@@ -54,6 +56,12 @@ public class CausalClusteringStressIT extends AbstractStressTestBase<CausalClust
     @Rule
     public final LocalOrRemoteClusterRule clusterRule = new LocalOrRemoteClusterRule();
 
+    @AfterClass
+    public static void stopSharedCluster()
+    {
+        ClusterRule.stopSharedCluster();
+    }
+
     @Override
     URI databaseUri()
     {

driver/src/test/java/org/neo4j/driver/v1/util/Neo4jRunner.java

@@ -80,6 +80,11 @@ public static synchronized Neo4jRunner getOrCreateGlobalRunner() throws IOExcept
         return globalInstance;
     }
 
+    public static synchronized boolean globalRunnerExists()
+    {
+        return globalInstance != null;
+    }
+
     private Neo4jRunner() throws IOException
     {
         try

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterRule.java

@@ -20,6 +20,7 @@
 
 import org.junit.rules.ExternalResource;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -52,11 +53,28 @@ public AuthToken getDefaultAuthToken()
         return AuthTokens.basic( "neo4j", PASSWORD );
     }
 
+    public static void stopSharedCluster()
+    {
+        if ( SharedCluster.exists() )
+        {
+            try
+            {
+                SharedCluster.stop();
+            }
+            finally
+            {
+                SharedCluster.remove();
+            }
+        }
+    }
+
     @Override
     protected void before() throws Throwable
     {
         assumeTrue( "BoltKit cluster support unavailable", boltKitAvailable() );
 
+        stopSingleInstanceDatabase();
+
         if ( !SharedCluster.exists() )
         {
             SharedCluster.install( parseNeo4jVersion(),
@@ -109,6 +127,14 @@ private static String parseNeo4jVersion()
         return version;
     }
 
+    private static void stopSingleInstanceDatabase() throws IOException
+    {
+        if ( Neo4jRunner.globalRunnerExists() )
+        {
+            Neo4jRunner.getOrCreateGlobalRunner().stopNeo4j();
+        }
+    }
+
     private static void addShutdownHookToStopCluster()
     {
         Runtime.getRuntime().addShutdownHook( new Thread()
@@ -118,7 +144,10 @@ public void run()
             {
                 try
                 {
-                    SharedCluster.kill();
+                    if ( SharedCluster.exists() )
+                    {
+                        SharedCluster.kill();
+                    }
                 }
                 catch ( Throwable t )
                 {