Rename test directory and databases rules methods to better represent

what they providing, introduce database directory helper methods.

community/community-it/community-it/src/test/java/db/DatabaseShutdownTest.java

@@ -72,7 +72,7 @@ public void shouldShutdownCorrectlyWhenCheckPointingOnShutdownFails() throws Exc
 
         try
         {
-            factory.newEmbeddedDatabase( testDirectory.graphDbDir() ).shutdown();
+            factory.newEmbeddedDatabase( testDirectory.databaseDir() ).shutdown();
             fail( "Should have thrown" );
         }
         catch ( LifecycleException ex )

community/community-it/community-it/src/test/java/db/DatabaseStartupTest.java

@@ -51,7 +51,7 @@ public void startTheDatabaseWithWrongVersionShouldFailWithUpgradeNotAllowed() th
     {
         // given
         // create a store
-        File storeDir = testDirectory.directory();
+        File storeDir = testDirectory.storeDir();
         GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabase( storeDir );
         try ( Transaction tx = db.beginTx() )
         {
@@ -64,7 +64,7 @@ public void startTheDatabaseWithWrongVersionShouldFailWithUpgradeNotAllowed() th
         try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
                 PageCache pageCache = StandalonePageCacheFactory.createPageCache( fileSystem ) )
         {
-            MetaDataStore.setRecord( pageCache, new File( testDirectory.graphDbDir(), MetaDataStore.DEFAULT_NAME ),
+            MetaDataStore.setRecord( pageCache, new File( testDirectory.databaseDir(), MetaDataStore.DEFAULT_NAME ),
                     MetaDataStore.Position.STORE_VERSION, MetaDataStore.versionStringToLong( "bad" ));
         }
 
@@ -88,7 +88,7 @@ public void startTheDatabaseWithWrongVersionShouldFailAlsoWhenUpgradeIsAllowed()
     {
         // given
         // create a store
-        File storeDir = testDirectory.directory();
+        File storeDir = testDirectory.storeDir();
         GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabase( storeDir );
         try ( Transaction tx = db.beginTx() )
         {
@@ -102,7 +102,7 @@ public void startTheDatabaseWithWrongVersionShouldFailAlsoWhenUpgradeIsAllowed()
         try ( FileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction();
               PageCache pageCache = StandalonePageCacheFactory.createPageCache( fileSystem ) )
         {
-            MetaDataStore.setRecord( pageCache, new File( testDirectory.graphDbDir(), MetaDataStore.DEFAULT_NAME ),
+            MetaDataStore.setRecord( pageCache, new File( testDirectory.databaseDir(), MetaDataStore.DEFAULT_NAME ),
                     MetaDataStore.Position.STORE_VERSION, MetaDataStore.versionStringToLong( badStoreVersion ) );
         }
 

community/community-it/community-it/src/test/java/upgrade/StoreUpgradeOnStartupTest.java

@@ -41,7 +41,6 @@
 import org.neo4j.kernel.impl.store.format.standard.StandardV2_3;
 import org.neo4j.kernel.impl.storemigration.StoreUpgrader;
 import org.neo4j.kernel.impl.storemigration.StoreVersionCheck;
-import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.test.rule.PageCacheRule;
 import org.neo4j.test.rule.TestDirectory;
@@ -87,8 +86,8 @@ public void setup() throws IOException
     {
         fileSystem = fileSystemRule.get();
         PageCache pageCache = pageCacheRule.getPageCache( fileSystem );
-        workingStoreDir = testDir.directory( "working_" + version );
-        workingDatabaseDirectory = new File( workingStoreDir, DataSourceManager.DEFAULT_DATABASE_NAME );
+        workingStoreDir = testDir.storeDir( "working_" + version );
+        workingDatabaseDirectory = testDir.databaseDir( workingStoreDir );
         check = new StoreVersionCheck( pageCache );
         File prepareDirectory = testDir.directory( "prepare_" + version );
         prepareSampleLegacyDatabase( version, fileSystem, workingDatabaseDirectory, prepareDirectory );

community/community-it/community-it/src/test/java/upgrade/StoreUpgraderInterruptionTestIT.java

@@ -55,7 +55,6 @@
 import org.neo4j.kernel.impl.transaction.log.entry.VersionAwareLogEntryReader;
 import org.neo4j.kernel.impl.transaction.log.files.LogFiles;
 import org.neo4j.kernel.impl.transaction.log.files.LogFilesBuilder;
-import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
 import org.neo4j.kernel.impl.util.monitoring.ProgressReporter;
 import org.neo4j.kernel.monitoring.Monitors;
 import org.neo4j.kernel.recovery.LogTailScanner;
@@ -102,8 +101,8 @@ public static Collection<String> versions()
     @Before
     public void setUpLabelScanStore()
     {
-        workingDirectory = directory.directory( "working" );
-        workingDatabaseDirectory = new File( workingDirectory, DataSourceManager.DEFAULT_DATABASE_NAME );
+        workingDirectory = directory.storeDir( "working" );
+        workingDatabaseDirectory = directory.databaseDir( workingDirectory );
         prepareDirectory = directory.directory( "prepare" );
     }
 

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java

@@ -160,7 +160,7 @@ public void shouldNotReportDuplicateForHugeLongValues() throws Exception
         // given
         ConsistencyCheckService service = new ConsistencyCheckService();
         Config configuration = Config.defaults( settings() );
-        GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.graphDbDir() )
+        GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.databaseDir() )
                 .setConfig( GraphDatabaseSettings.record_format, getRecordFormatName() )
                 .setConfig( "dbms.backup.enabled", "false" )
                 .newGraphDatabase();
@@ -215,7 +215,7 @@ public void shouldAllowGraphCheckDisabled() throws ConsistencyCheckIncompleteExc
     public void shouldReportMissingSchemaIndex() throws Exception
     {
         // given
-        File databaseDirectory = testDirectory.graphDbDir();
+        File databaseDirectory = testDirectory.databaseDir();
         GraphDatabaseService gds = getGraphDatabaseService( testDirectory.directory() );
 
         Label label = Label.label( "label" );
@@ -246,7 +246,7 @@ public void shouldReportMissingSchemaIndex() throws Exception
     @Test
     public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider() throws Exception
     {
-        File storeDir = testDirectory.graphDbDir();
+        File storeDir = testDirectory.databaseDir();
         String defaultSchemaProvider = GraphDatabaseSettings.default_schema_provider.name();
         Label label = Label.label( "label" );
         String propKey = "propKey";

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java

@@ -218,7 +218,7 @@ public void failWhenStoreWasNonCleanlyShutdown() throws Exception
     {
         createGraphDbAndKillIt( Config.defaults() );
 
-        runConsistencyCheckToolWith( fs.get(), testDirectory.graphDbDir().getAbsolutePath() );
+        runConsistencyCheckToolWith( fs.get(), testDirectory.databaseDir().getAbsolutePath() );
     }
 
     @Test( expected = ToolFailureException.class )
@@ -228,7 +228,7 @@ public void failOnNotCleanlyShutdownStoreWithLogsInCustomRelativeLocation() thro
         Config customConfig = Config.defaults( logical_logs_location, "otherLocation" );
         createGraphDbAndKillIt( customConfig );
         MapUtil.store( customConfig.getRaw(), customConfigFile );
-        String[] args = {testDirectory.graphDbDir().getPath(), "-config", customConfigFile.getPath()};
+        String[] args = {testDirectory.databaseDir().getPath(), "-config", customConfigFile.getPath()};
 
         runConsistencyCheckToolWith( fs.get(), args );
     }
@@ -241,7 +241,7 @@ public void failOnNotCleanlyShutdownStoreWithLogsInCustomAbsoluteLocation() thro
         Config customConfig = Config.defaults( logical_logs_location, otherLocation.getAbsolutePath() );
         createGraphDbAndKillIt( customConfig );
         MapUtil.store( customConfig.getRaw(), customConfigFile );
-        String[] args = {testDirectory.graphDbDir().getPath(), "-config", customConfigFile.getPath()};
+        String[] args = {testDirectory.databaseDir().getPath(), "-config", customConfigFile.getPath()};
 
         runConsistencyCheckToolWith( fs.get(), args );
     }

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/AllNodesInStoreExistInLabelIndexTest.java

@@ -88,7 +88,7 @@ public void mustReportSuccessfulForConsistentLabelScanStore() throws Exception
     @Test
     public void reportNotCleanLabelIndex() throws IOException, ConsistencyCheckIncompleteException
     {
-        File databaseDirectory = db.getTestDirectory().graphDbDir();
+        File databaseDirectory = db.databaseDirectory();
         someData();
         db.resolveDependency( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) );
         File labelIndexFileCopy = new File( databaseDirectory, "label_index_copy" );
@@ -113,7 +113,7 @@ public void reportNotCleanLabelIndex() throws IOException, ConsistencyCheckIncom
     @Test
     public void reportNotCleanLabelIndexWithCorrectData() throws IOException, ConsistencyCheckIncompleteException
     {
-        File databaseDirectory = db.getTestDirectory().graphDbDir();
+        File databaseDirectory = db.databaseDirectory();
         someData();
         db.resolveDependency( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) );
         File labelIndexFileCopy = new File( databaseDirectory, "label_index_copy" );
@@ -268,15 +268,15 @@ private void replaceLabelIndexWithCopy( File labelIndexFileCopy ) throws IOExcep
     {
         db.restartDatabase( ( fs, directory ) ->
         {
-            File databaseDirectory = db.getTestDirectory().graphDbDir();
+            File databaseDirectory = db.databaseDirectory();
             fs.deleteFile( new File( databaseDirectory, NativeLabelScanStore.FILE_NAME ) );
             fs.copyFile( labelIndexFileCopy, new File( databaseDirectory, NativeLabelScanStore.FILE_NAME ) );
         } );
     }
 
     private File copyLabelIndexFile() throws IOException
     {
-        File databaseDirectory = db.getTestDirectory().graphDbDir();
+        File databaseDirectory = db.databaseDirectory();
         File labelIndexFileCopy = new File( databaseDirectory, "label_index_copy" );
         db.restartDatabase( ( fs, directory ) ->
                 fs.copyFile( new File( databaseDirectory, NativeLabelScanStore.FILE_NAME ), labelIndexFileCopy ) );
@@ -373,7 +373,7 @@ private ConsistencyCheckService.Result fullConsistencyCheck()
         {
             ConsistencyCheckService service = new ConsistencyCheckService();
             Config config = Config.defaults();
-            return service.runFullConsistencyCheck( db.getTestDirectory().graphDbDir(), config, NONE, log, fsa, true,
+            return service.runFullConsistencyCheck( db.databaseDirectory(), config, NONE, log, fsa, true,
                     new ConsistencyFlags( config ) );
         }
     }

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java

@@ -165,7 +165,7 @@ public DirectStoreAccess directStoreAccess()
             Config config = Config.defaults();
             DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fileSystem );
             StoreFactory storeFactory = new StoreFactory(
-                    directory.graphDbDir(), config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY );
+                    directory.databaseDir(), config, idGeneratorFactory, pageCache, fileSystem, logProvider, EmptyVersionContextSupplier.EMPTY );
             neoStore = storeFactory.openAllNeoStores();
             StoreAccess nativeStores;
             if ( keepStatistics )
@@ -187,7 +187,7 @@ public DirectStoreAccess directStoreAccess()
 
             Monitors monitors = new Monitors();
             LabelScanStore labelScanStore = startLabelScanStore( pageCache, indexStoreView, monitors );
-            IndexProviderMap indexes = createIndexes( pageCache, fileSystem, directory.graphDbDir(), config, logProvider, monitors);
+            IndexProviderMap indexes = createIndexes( pageCache, fileSystem, directory.databaseDir(), config, logProvider, monitors);
             directStoreAccess = new DirectStoreAccess( nativeStores, labelScanStore, indexes );
         }
         return directStoreAccess;
@@ -196,7 +196,7 @@ public DirectStoreAccess directStoreAccess()
     private LabelScanStore startLabelScanStore( PageCache pageCache, IndexStoreView indexStoreView, Monitors monitors )
     {
         NativeLabelScanStore labelScanStore =
-                new NativeLabelScanStore( pageCache, directory.graphDbDir(), fileSystem, new FullLabelStream( indexStoreView ), false, monitors,
+                new NativeLabelScanStore( pageCache, directory.databaseDir(), fileSystem, new FullLabelStream( indexStoreView ), false, monitors,
                         RecoveryCleanupWorkCollector.IMMEDIATE );
         try
         {
@@ -221,7 +221,7 @@ private IndexProviderMap createIndexes( PageCache pageCache, FileSystemAbstracti
 
     public File databaseDirectory()
     {
-        return directory.graphDbDir();
+        return directory.databaseDir();
     }
 
     public Statistics getAccessStatistics()
@@ -571,7 +571,7 @@ public void evaluate() throws Throwable
                 try
                 {
                     generateInitialData();
-                    start( GraphStoreFixture.this.directory.graphDbDir() );
+                    start( GraphStoreFixture.this.directory.databaseDir() );
                     try
                     {
                         base.evaluate();

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java

@@ -76,7 +76,7 @@ public class IndexConsistencyIT
     @Test
     public void reportNotCleanNativeIndex() throws IOException, ConsistencyCheckIncompleteException
     {
-        File databaseDirectory = db.getTestDirectory().graphDbDir();
+        File databaseDirectory = db.databaseDirectory();
         someData();
         resolveComponent( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) );
         File indexesCopy = new File( databaseDirectory, "indexesCopy" );
@@ -238,7 +238,7 @@ private ConsistencyCheckService.Result fullConsistencyCheck()
         {
             ConsistencyCheckService service = new ConsistencyCheckService();
             Config config = Config.defaults();
-            return service.runFullConsistencyCheck( db.getTestDirectory().graphDbDir(), config, NONE, log, fsa, true );
+            return service.runFullConsistencyCheck( db.databaseDirectory(), config, NONE, log, fsa, true );
         }
     }
 }

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java

@@ -149,7 +149,7 @@ public void shouldDetectSabotagedRelationshipWhereEverItIs() throws Exception
     private StoreFactory newStoreFactory( PageCache pageCache )
     {
         FileSystemAbstraction fileSystem = fileSystemRule.get();
-        return new StoreFactory( directory.graphDbDir(), getTuningConfiguration(),
+        return new StoreFactory( directory.databaseDir(), getTuningConfiguration(),
                 new DefaultIdGeneratorFactory( fileSystem ), pageCache, fileSystem, NullLogProvider.getInstance(),
                 EmptyVersionContextSupplier.EMPTY );
     }

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java

@@ -148,7 +148,7 @@ private StoreAccess createStoreWithOneHighDegreeNodeAndSeveralDegreeTwoNodes( in
         }
         database.shutdown();
         PageCache pageCache = pageCacheRule.getPageCache( fileSystemRule.get() );
-        StoreAccess storeAccess = new StoreAccess( fileSystemRule.get(), pageCache, testDirectory.graphDbDir(),
+        StoreAccess storeAccess = new StoreAccess( fileSystemRule.get(), pageCache, testDirectory.databaseDir(),
                 Config.defaults() );
         return storeAccess.initialize();
     }

community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/DatabaseImporterTest.java

@@ -113,7 +113,7 @@ public void removesOldMessagesLog() throws Exception
 
         assertTrue( oldMessagesLog.createNewFile() );
 
-        File destination = testDir.graphDbDir();
+        File destination = testDir.databaseDir();
 
         String[] arguments = {"--mode=database", "--database=bar", "--from=" + from.getAbsolutePath()};
         DatabaseImporter importer =

community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/DiagnosticsReportCommandIT.java

@@ -60,7 +60,7 @@ public class DiagnosticsReportCommandIT
     @Before
     public void setUp()
     {
-        database = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.graphDbDir() )
+        database = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.databaseDir() )
                 .newGraphDatabase();
     }