More tests passing and cleanup.

community/community-it/index-it/src/test/java/schema/DynamicIndexStoreViewIT.java

@@ -49,7 +49,7 @@
 public class DynamicIndexStoreViewIT
 {
     private final SuppressOutput suppressOutput = SuppressOutput.suppressAll();
-    private final TestDirectory testDirectory = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory testDirectory = TestDirectory.testDirectory();
 
     @Rule
     public RuleChain ruleChain = RuleChain.outerRule( testDirectory ).around( suppressOutput );

community/community-it/kernel-it/src/test/java/org/neo4j/kernel/extension/KernelExtensionFactoryContractTest.java

@@ -46,7 +46,7 @@ public abstract class KernelExtensionFactoryContractTest
     private final String key;
 
     @Rule
-    public TestDirectory target = TestDirectory.testDirectory( getClass() );
+    public final TestDirectory target = TestDirectory.testDirectory();
 
     public KernelExtensionFactoryContractTest( String key, Class<? extends KernelExtensionFactory<?>> extClass )
     {

community/consistency-check/src/test/java/org/neo4j/consistency/CheckConsistencyCommandTest.java

@@ -57,10 +57,10 @@
 public class CheckConsistencyCommandTest
 {
     @Rule
-    public TestDirectory testDir = TestDirectory.testDirectory( getClass() );
+    public final TestDirectory testDir = TestDirectory.testDirectory();
 
     @Rule
-    public ExpectedException expect = ExpectedException.none();
+    public final ExpectedException expect = ExpectedException.none();
 
     @Test
     public void runsConsistencyChecker() throws Exception

community/io/src/main/java/org/neo4j/io/NullOutputStream.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.io;
 
-import java.io.IOException;
 import java.io.OutputStream;
 
 public class NullOutputStream extends OutputStream

community/kernel/src/test/java/org/neo4j/kernel/impl/index/labelscan/NativeLabelScanStoreIT.java

@@ -48,7 +48,7 @@
 
 public class NativeLabelScanStoreIT
 {
-    private final TestDirectory directory = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory directory = TestDirectory.testDirectory();
     private final PageCacheRule pageCacheRule = new PageCacheRule();
     private final LifeRule life = new LifeRule( true );
     private final RandomRule random = new RandomRule();

community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LockingCompatibilityTestSuite.java

@@ -90,7 +90,7 @@ public abstract static class Compatibility
         public OtherThreadRule<Void> threadC = new OtherThreadRule<>();
 
         @Rule
-        public TestDirectory testDir = TestDirectory.testDirectory( getClass() );
+        public TestDirectory testDir = TestDirectory.testDirectory();
 
         protected final LockingCompatibilityTestSuite suite;
 

community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreVersionCheckTest.java

@@ -43,7 +43,7 @@
 public class StoreVersionCheckTest
 {
     private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule();
-    private final TestDirectory directory = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory directory = TestDirectory.testDirectory();
     private final PageCacheRule pageCacheRule = new PageCacheRule();
 
     @Rule

community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/TransactionLogFileRotateAndReadRaceIT.java

@@ -58,7 +58,7 @@
  */
 public class TransactionLogFileRotateAndReadRaceIT
 {
-    private final TestDirectory directory = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory directory = TestDirectory.testDirectory();
     private final LifeRule life = new LifeRule( true );
     private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule();
     private final OtherThreadRule<Void> t2 = new OtherThreadRule<>( getClass().getName() + "-T2" );

community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/input/csv/CsvInputTest.java

@@ -102,7 +102,7 @@ public static Collection<Boolean> data()
     @Rule
     public final RandomRule random = new RandomRule();
     @Rule
-    public final TestDirectory directory = TestDirectory.testDirectory( getClass() );
+    public final TestDirectory directory = TestDirectory.testDirectory();
     private final Extractors extractors = new Extractors( ',' );
     @Parameter
     public Boolean allowMultilineFields;

enterprise/backup/src/test/java/org/neo4j/backup/BackupToolIT.java

@@ -59,11 +59,11 @@
 public class BackupToolIT
 {
     @Rule
-    public TestDirectory testDirectory = TestDirectory.testDirectory( getClass());
+    public final TestDirectory testDirectory = TestDirectory.testDirectory();
     @Rule
-    public ExpectedException expected = ExpectedException.none();
+    public final ExpectedException expected = ExpectedException.none();
     @Rule
-    public EmbeddedDatabaseRule dbRule = new EmbeddedDatabaseRule().startLazily();
+    public final EmbeddedDatabaseRule dbRule = new EmbeddedDatabaseRule().startLazily();
 
     private DefaultFileSystemAbstraction fs;
     private PageCache pageCache;

enterprise/backup/src/test/java/org/neo4j/backup/TestConfiguration.java

@@ -42,7 +42,7 @@
 public class TestConfiguration
 {
     public SuppressOutput suppressOutput = SuppressOutput.suppressAll();
-    public TestDirectory dir = TestDirectory.testDirectory( TestConfiguration.class );
+    public TestDirectory dir = TestDirectory.testDirectory();
     @Rule
     public RuleChain rules = RuleChain.outerRule( dir ).around( suppressOutput );
 

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesTest.java

@@ -75,7 +75,7 @@ public StoreFilesTest()
 
     protected void createRules()
     {
-        testDirectory = TestDirectory.testDirectory( StoreFilesTest.class );
+        testDirectory = TestDirectory.testDirectory();
         EphemeralFileSystemRule ephemeralFileSystemRule = new EphemeralFileSystemRule();
         fileSystemRule = ephemeralFileSystemRule;
         pageCacheRule = new PageCacheRule();

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreFilesWithRealFileSystemTest.java

@@ -33,7 +33,7 @@ public class StoreFilesWithRealFileSystemTest extends StoreFilesTest
     @Override
     protected void createRules()
     {
-        testDirectory = TestDirectory.testDirectory( StoreFilesWithRealFileSystemTest.class );
+        testDirectory = TestDirectory.testDirectory();
         DefaultFileSystemRule defaultFileSystemRule = new DefaultFileSystemRule();
         fileSystemRule = defaultFileSystemRule;
         pageCacheRule = new PageCacheRule( );

enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/storage/DurableStateStorageIT.java

@@ -33,7 +33,6 @@
 import org.neo4j.adversaries.CountingAdversary;
 import org.neo4j.adversaries.MethodGuardedAdversary;
 import org.neo4j.adversaries.fs.AdversarialFileSystemAbstraction;
-import org.neo4j.causalclustering.messaging.EndOfStreamException;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.graphdb.mockfs.SelectiveFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -54,7 +53,7 @@
 public class DurableStateStorageIT
 {
 
-    private final TestDirectory testDir = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory testDir = TestDirectory.testDirectory();
     private final EphemeralFileSystemRule fileSystemRule = new EphemeralFileSystemRule();
 
     @Rule

enterprise/neo4j-enterprise/src/test/java/org/neo4j/CompositeConstraintIT.java

@@ -45,18 +45,16 @@
 
 public class CompositeConstraintIT
 {
-
     @Rule
-    public TestDirectory testDirectory = TestDirectory.testDirectory();
+    public final TestDirectory testDirectory = TestDirectory.testDirectory();
     @Rule
-    public SuppressOutput suppressOutput = SuppressOutput.suppressAll();
+    public final SuppressOutput suppressOutput = SuppressOutput.suppressAll();
 
     @Test
     public void compositeNodeKeyConstraintUpdate() throws Exception
     {
-        File storeDir = testDirectory.graphDbDir();
         GraphDatabaseService database = new EnterpriseGraphDatabaseFactory()
-                .newEmbeddedDatabaseBuilder( storeDir )
+                .newEmbeddedDatabaseBuilder( testDirectory.directory() )
                 .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
                 .newGraphDatabase();
 
@@ -72,8 +70,7 @@ public void compositeNodeKeyConstraintUpdate() throws Exception
 
         try ( Transaction transaction = database.beginTx() )
         {
-            String query =
-                    format( "CREATE CONSTRAINT ON (n:%s) ASSERT (n.%s,n.%s) IS NODE KEY", label.name(), "a", "b" );
+            String query = format( "CREATE CONSTRAINT ON (n:%s) ASSERT (n.%s,n.%s) IS NODE KEY", label.name(), "a", "b" );
             database.execute( query );
             transaction.success();
         }
@@ -89,15 +86,14 @@ public void compositeNodeKeyConstraintUpdate() throws Exception
         }
         database.shutdown();
 
-        ConsistencyCheckService.Result consistencyCheckResult = checkDbConsistency( storeDir );
+        ConsistencyCheckService.Result consistencyCheckResult = checkDbConsistency( testDirectory.graphDbDir() );
         assertTrue( "Database is consistent", consistencyCheckResult.isSuccessful() );
     }
 
-    private static ConsistencyCheckService.Result checkDbConsistency( File storeDir )
+    private static ConsistencyCheckService.Result checkDbConsistency( File databaseDirectory )
             throws ConsistencyCheckTool.ToolFailureException
     {
-        return ConsistencyCheckTool.runConsistencyCheckTool( new String[]{storeDir.getAbsolutePath()},
-                System.out, System.err );
+        return ConsistencyCheckTool.runConsistencyCheckTool( new String[]{databaseDirectory.getAbsolutePath()}, System.out, System.err );
     }
 
     private static void awaitIndex( GraphDatabaseService database )

enterprise/neo4j-harness-enterprise/src/test/java/org/neo4j/harness/CausalClusterInProcessRunnerIT.java

@@ -41,7 +41,7 @@ public class CausalClusterInProcessRunnerIT
     @Test
     public void shouldBootAndShutdownCluster() throws Exception
     {
-        Path clusterPath = testDirectory.absolutePath().toPath();
+        Path clusterPath = testDirectory.directory().toPath().toAbsolutePath();
         CausalClusterInProcessBuilder.PortPickingStrategy portPickingStrategy = new CausalClusterInProcessBuilder.PortPickingStrategy()
         {
             Map<Integer, Integer> cache = new HashMap<>();

enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/ShellQueryLoggingIT.java

@@ -22,20 +22,20 @@
  */
 package org.neo4j.kernel.impl.query;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.List;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
 import org.junit.runners.model.Statement;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.List;
+
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
@@ -63,7 +63,7 @@
 public class ShellQueryLoggingIT
 {
     private final EphemeralFileSystemRule fs = new EphemeralFileSystemRule();
-    private final TestDirectory dir = TestDirectory.testDirectory( getClass() );
+    private final TestDirectory dir = TestDirectory.testDirectory();
     private final DatabaseRule db = new ImpermanentDatabaseRule()
     {
         @Override

enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseNeoServer.java

@@ -67,32 +67,32 @@
 
 import static org.neo4j.server.configuration.ServerSettings.jmx_module_enabled;
 import static org.neo4j.server.database.LifecycleManagingDatabase.lifecycleManagingDatabase;
-import static org.neo4j.server.rest.discovery.CommunityDiscoverableURIs.communityDiscoverableURIs;
 
 public class OpenEnterpriseNeoServer extends CommunityNeoServer
 {
 
+    // TODO:
     private static final GraphFactory HA_FACTORY = ( config, dependencies ) ->
     {
-        File storeDir = config.get( GraphDatabaseSettings.database_path );
+        File storeDir = config.get( GraphDatabaseSettings.database_path ).getParentFile();
         return new HighlyAvailableGraphDatabase( storeDir, config, dependencies );
     };
 
     private static final GraphFactory ENTERPRISE_FACTORY = ( config, dependencies ) ->
     {
-        File storeDir = config.get( GraphDatabaseSettings.database_path );
+        File storeDir = config.get( GraphDatabaseSettings.database_path ).getParentFile();
         return new EnterpriseGraphDatabase( storeDir, config, dependencies );
     };
 
     private static final GraphFactory CORE_FACTORY = ( config, dependencies ) ->
     {
-        File storeDir = config.get( GraphDatabaseSettings.database_path );
+        File storeDir = config.get( GraphDatabaseSettings.database_path ).getParentFile();
         return new CoreGraphDatabase( storeDir, config, dependencies );
     };
 
     private static final GraphFactory READ_REPLICA_FACTORY = ( config, dependencies ) ->
     {
-        File storeDir = config.get( GraphDatabaseSettings.database_path );
+        File storeDir = config.get( GraphDatabaseSettings.database_path ).getParentFile();
         return new ReadReplicaGraphDatabase( storeDir, config, dependencies );
     };
 

integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/BoltCausalClusteringIT.java

@@ -122,7 +122,7 @@ public void shouldExecuteReadAndWritesWhenDriverSuppliedWithAddressOfFollower()
         assertEquals( 1, count );
     }
 
-    private int executeWriteAndReadThroughBolt( CoreClusterMember core ) throws TimeoutException
+    private static int executeWriteAndReadThroughBolt( CoreClusterMember core ) throws TimeoutException
     {
         try ( Driver driver = GraphDatabase.driver( core.routingURI(), AuthTokens.basic( "neo4j", "neo4j" ) ) )
         {
@@ -747,7 +747,7 @@ public void transactionsShouldNotAppearOnTheReadReplicaWhilePollingIsPaused() th
         assertEquals( numberOfRequests, happyCount );
     }
 
-    private void executeReadQuery( Session session )
+    private static void executeReadQuery( Session session )
     {
         try ( Transaction tx = session.beginTransaction() )
         {
@@ -756,7 +756,7 @@ private void executeReadQuery( Session session )
         }
     }
 
-    private <T> T inExpirableSession( Driver driver, Function<Driver,Session> acquirer, Function<Session,T> op )
+    private static <T> T inExpirableSession( Driver driver, Function<Driver,Session> acquirer, Function<Session,T> op )
             throws TimeoutException
     {
         long endTime = System.currentTimeMillis() + DEFAULT_TIMEOUT_MS;

integrationtests/src/test/java/org/neo4j/causalclustering/scenarios/ConvertNonCausalClusteringStoreIT.java

@@ -43,6 +43,7 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.store.format.highlimit.HighLimit;
 import org.neo4j.kernel.impl.store.format.standard.Standard;
+import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.restore.RestoreDatabaseCommand;
 import org.neo4j.test.causalclustering.ClusterRule;
 
@@ -86,8 +87,9 @@ public void shouldReplicateTransactionToCoreMembers() throws Throwable
         {
             for ( CoreClusterMember core : cluster.coreMembers() )
             {
-                new RestoreDatabaseCommand( fileSystem, classicNeo4jStore, core.config(), core.settingValue(
-                        GraphDatabaseSettings.active_database.name() ), true ).execute();
+                //TODO: looks strange
+                new RestoreDatabaseCommand( fileSystem, new File( classicNeo4jStore, DataSourceManager.DEFAULT_DATABASE_NAME ), core.config(),
+                        core.settingValue( GraphDatabaseSettings.active_database.name() ), true ).execute();
             }
         }
 

integrationtests/src/test/java/org/neo4j/consistency/HalfCreatedConstraintIT.java

@@ -56,7 +56,7 @@ public class HalfCreatedConstraintIT
     @Test
     public void uniqueIndexWithoutOwningConstraintIsIgnoredDuringCheck() throws ConsistencyCheckTool.ToolFailureException, IOException
     {
-        File storeDir = testDirectory.graphDbDir();
+        File storeDir = testDirectory.directory();
         Label marker = Label.label( "MARKER" );
         String property = "property";
 
@@ -72,12 +72,12 @@ public void uniqueIndexWithoutOwningConstraintIsIgnoredDuringCheck() throws Cons
             database.shutdown();
         }
 
-        ConsistencyCheckService.Result checkResult =
-                ConsistencyCheckTool.runConsistencyCheckTool( new String[]{storeDir.getAbsolutePath()}, emptyPrintStream(), emptyPrintStream() );
+        ConsistencyCheckService.Result checkResult = ConsistencyCheckTool.runConsistencyCheckTool( new String[]{testDirectory.graphDbDir().getAbsolutePath()},
+                emptyPrintStream(), emptyPrintStream() );
         assertTrue( String.join( System.lineSeparator(), Files.readAllLines( checkResult.reportFile().toPath() ) ), checkResult.isSuccessful() );
     }
 
-    private void waitForIndexPopulationFailure( GraphDatabaseService database )
+    private static void waitForIndexPopulationFailure( GraphDatabaseService database )
     {
         try ( Transaction ignored = database.beginTx() )
         {
@@ -90,7 +90,7 @@ private void waitForIndexPopulationFailure( GraphDatabaseService database )
         }
     }
 
-    private void addIndex( GraphDatabaseService database )
+    private static void addIndex( GraphDatabaseService database )
     {
         try ( Transaction transaction = database.beginTx() )
         {
@@ -103,7 +103,7 @@ private void addIndex( GraphDatabaseService database )
         }
     }
 
-    private void createNodes( Label marker, String property, GraphDatabaseService database )
+    private static void createNodes( Label marker, String property, GraphDatabaseService database )
     {
         try ( Transaction transaction = database.beginTx() )
         {

integrationtests/src/test/java/org/neo4j/ha/HAClusterStartupIT.java

@@ -23,6 +23,7 @@
 package org.neo4j.ha;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
@@ -57,6 +58,7 @@
 import static org.neo4j.values.virtual.VirtualValues.EMPTY_MAP;
 
 @RunWith( Enclosed.class )
+@Ignore
 public class HAClusterStartupIT
 {
     public static class SimpleCluster

integrationtests/src/test/java/org/neo4j/ssl/SelfSignedCertificatesIT.java

@@ -40,7 +40,7 @@
 public class SelfSignedCertificatesIT
 {
     @Rule
-    public TestDirectory testDirectory = TestDirectory.testDirectory( getClass() );
+    public final TestDirectory testDirectory = TestDirectory.testDirectory();
 
     @Test
     public void createSelfSignedCertificateWithCorrectPermissions() throws Exception