More fixed tests

neo4j · Aug 21, 2018 · 48abee2 · 48abee2
1 parent f634326
commit 48abee2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/OnlineBackupExtensionFactoryTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/OnlineBackupExtensionFactoryTest.java
@@ -92,7 +92,7 @@ private static class TestBackDependencies implements OnlineBackupExtensionFactor
         @Override
         public Config getConfig()
         {
-            return null;
+            return Config.defaults();
         }
 
         @Override

diff --git a/...ering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecovery.java b/...ering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecovery.java
@@ -28,6 +28,7 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.Exceptions;
 import org.neo4j.io.fs.FileUtils;
+import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.configuration.Settings;
@@ -62,7 +63,7 @@ public synchronized void shutdown()
         shutdown = true;
     }
 
-    public synchronized void recoverCopiedStore( File tempStore ) throws DatabaseShutdownException
+    public synchronized void recoverCopiedStore( DatabaseLayout databaseLayout ) throws DatabaseShutdownException
     {
         if ( shutdown )
         {
@@ -71,10 +72,10 @@ public synchronized void recoverCopiedStore( File tempStore ) throws DatabaseShu
 
         try
         {
-            GraphDatabaseService graphDatabaseService = newTempDatabase( tempStore );
+            GraphDatabaseService graphDatabaseService = newTempDatabase( databaseLayout.databaseDirectory() );
             graphDatabaseService.shutdown();
             // as soon as recovery will be extracted we will not gonna need this
-            File lockFile = new File( tempStore, StoreLocker.STORE_LOCK_FILENAME );
+            File lockFile = new File( databaseLayout.getDatabasesDirectory(), StoreLocker.STORE_LOCK_FILENAME );
             if ( lockFile.exists() )
             {
                 FileUtils.deleteFile( lockFile );

diff --git a/...ustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyProcess.java b/...ustering/src/main/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyProcess.java
@@ -58,7 +58,7 @@ public void replaceWithStoreFrom( CatchupAddressProvider addressProvider, StoreI
         {
             remoteStore.copy( addressProvider, expectedStoreId, tempStore.databaseLayout(),
                     false );
-            copiedStoreRecovery.recoverCopiedStore( tempStore.storeDir() );
+            copiedStoreRecovery.recoverCopiedStore( tempStore.databaseLayout() );
             localDatabase.replaceWith( tempStore.databaseLayout().databaseDirectory() );
         }
         log.info( "Replaced store successfully" );

diff --git a/...lustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CatchupServerIT.java b/...lustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CatchupServerIT.java
@@ -96,7 +96,7 @@ public class CatchupServerIT
     public void startDb() throws Throwable
     {
         temporaryDirectory = testDirectory.directory( "temp" );
-        graphDb = (GraphDatabaseAPI) new TestGraphDatabaseFactory().setFileSystem( fsa ).newEmbeddedDatabase( testDirectory.storeDir() );
+        graphDb = (GraphDatabaseAPI) new TestGraphDatabaseFactory().setFileSystem( fsa ).newEmbeddedDatabase( testDirectory.databaseDir() );
         createLegacyIndex();
         createPropertyIndex();
         addData( graphDb );

diff --git a/...g/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java b/...g/src/test/java/org/neo4j/causalclustering/catchup/storecopy/CopiedStoreRecoveryTest.java
@@ -27,6 +27,7 @@
 import java.io.File;
 
 import org.neo4j.helpers.collection.Iterables;
+import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.io.pagecache.PageCache;
 import org.neo4j.kernel.configuration.Config;
 
@@ -47,7 +48,7 @@ public void shouldThrowIfAlreadyShutdown()
         try
         {
             // when
-            copiedStoreRecovery.recoverCopiedStore( new File( "nowhere" ) );
+            copiedStoreRecovery.recoverCopiedStore( new DatabaseLayout( new File( "nowhere" ) ) );
             fail( "should have thrown" );
         }
         catch ( DatabaseShutdownException ex )

diff --git a/...prise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java b/...prise/causal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/RestartIT.java
@@ -41,6 +41,7 @@
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
+import org.neo4j.io.layout.DatabaseLayout;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.storageengine.api.lock.AcquireLockTimeoutException;
@@ -171,7 +172,7 @@ public void readReplicaTest() throws Exception
             for ( CoreClusterMember core : cluster.coreMembers() )
             {
                 ConsistencyCheckService.Result result = new ConsistencyCheckService()
-                        .runFullConsistencyCheck( core.database().databaseLayout(), Config.defaults(), ProgressMonitorFactory.NONE,
+                        .runFullConsistencyCheck( new DatabaseLayout( core.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE,
                                 NullLogProvider.getInstance(), fileSystem, false,
                                 new ConsistencyFlags( true, true, true, false ) );
                 assertTrue( "Inconsistent: " + core, result.isSuccessful() );
@@ -180,7 +181,7 @@ public void readReplicaTest() throws Exception
             for ( ReadReplica readReplica : cluster.readReplicas() )
             {
                 ConsistencyCheckService.Result result = new ConsistencyCheckService()
-                        .runFullConsistencyCheck( readReplica.database().databaseLayout(), Config.defaults(), ProgressMonitorFactory.NONE,
+                        .runFullConsistencyCheck( new DatabaseLayout( readReplica.databaseDirectory() ), Config.defaults(), ProgressMonitorFactory.NONE,
                                 NullLogProvider.getInstance(), fileSystem, false,
                                 new ConsistencyFlags( true, true, true, false ) );
                 assertTrue( "Inconsistent: " + readReplica, result.isSuccessful() );

diff --git a/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/StartStopRandomCore.java b/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/StartStopRandomCore.java
@@ -73,7 +73,7 @@ private void assertStoreConsistent( File storeDir )
         {
             fs.copyRecursively( storeDir, storeDirectory.storeDir() );
             new CopiedStoreRecovery( Config.defaults(), GraphDatabaseDependencies.newDependencies().kernelExtensions(),  pageCache )
-                    .recoverCopiedStore( storeDirectory.storeDir() );
+                    .recoverCopiedStore( storeDirectory.databaseLayout() );
             ConsistencyCheckService.Result result = runConsistencyCheckTool( new String[]{storeDir.getAbsolutePath()},
                     new PrintStream( NULL_OUTPUT_STREAM ), new PrintStream( NULL_OUTPUT_STREAM ) );
             if ( !result.isSuccessful() )

diff --git a/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/StartStopRandomMember.java b/stresstests/src/test/java/org/neo4j/causalclustering/stresstests/StartStopRandomMember.java
@@ -73,7 +73,7 @@ private void assertStoreConsistent( File storeDir )
         {
             fs.copyRecursively( storeDir, storeDirectory.storeDir() );
             new CopiedStoreRecovery( Config.defaults(), GraphDatabaseDependencies.newDependencies().kernelExtensions(),  pageCache )
-                    .recoverCopiedStore( storeDirectory.storeDir() );
+                    .recoverCopiedStore( storeDirectory.databaseLayout() );
             ConsistencyCheckService.Result result = runConsistencyCheckTool( new String[]{storeDir.getAbsolutePath()},
                     new PrintStream( NULL_OUTPUT_STREAM ), new PrintStream( NULL_OUTPUT_STREAM ) );
             if ( !result.isSuccessful() )