From 328f9928b9a6d01a9b022eb2a13005f7f691b108 Mon Sep 17 00:00:00 2001
From: Mattias Persson <mattias@neotechnology.com>
Date: Mon, 19 Sep 2016 22:11:30 +0200
Subject: [PATCH] Extracted cleanup method in TestDirectory

---
 .../org/neo4j/test/rule/TestDirectory.java    | 36 +++++++------------
 .../org/neo4j/kernel/NeoStoreDataSource.java  |  1 -
 .../neo4j/test/rule/EmbeddedDatabaseRule.java |  2 +-
 .../org/neo4j/test/rule/NeoStoresRule.java    |  6 ++--
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
index d43bc86ea38ec..f185b8c3c6c8d 100644
--- a/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
+++ b/community/io/src/test/java/org/neo4j/test/rule/TestDirectory.java
@@ -161,15 +161,14 @@ public File graphDbDir()
         return directory( "graph-db" );
     }
 
-    public File makeGraphDbDir()
+    public File makeGraphDbDir() throws IOException
     {
         return cleanDirectory( "graph-db" );
     }
 
     public void cleanup() throws IOException
     {
-        fileSystem.deleteRecursively( testClassBaseFolder );
-        fileSystem.mkdirs( testClassBaseFolder );
+        clean( fileSystem, testClassBaseFolder );
     }
 
     @Override
@@ -179,14 +178,18 @@ public String toString()
         return format( "%s[%s]", getClass().getSimpleName(), testDirectoryName );
     }
 
-    public File cleanDirectory( String name )
+    public File cleanDirectory( String name ) throws IOException
     {
-        File dir = new File( ensureBase(), name );
-        if ( fileSystem.fileExists( dir ) )
+        return clean( fileSystem, new File( ensureBase(), name ) );
+    }
+
+    private static File clean( FileSystemAbstraction fs, File dir ) throws IOException
+    {
+        if ( fs.fileExists( dir ) )
         {
-            deleteSilently( dir );
+            fs.deleteRecursively( dir );
         }
-        fileSystem.mkdir( dir );
+        fs.mkdirs( dir );
         return dir;
     }
 
@@ -211,19 +214,7 @@ private void complete( boolean success )
         testDirectory = null;
     }
 
-    private void deleteSilently( File dir )
-    {
-        try
-        {
-            fileSystem.deleteRecursively( dir );
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
-        }
-    }
-
-    private File directoryForDescription( Description description )
+    private File directoryForDescription( Description description ) throws IOException
     {
         if ( owningTest == null )
         {
@@ -267,8 +258,7 @@ public static File testDataDirectoryOf( FileSystemAbstraction fs, Class<?> ownin
         File result = new File( testData, owningTest.getName() ).getAbsoluteFile();
         if ( clean )
         {
-            fs.deleteRecursively( result );
-            fs.mkdirs( result );
+            clean( fs, result );
         }
         return result;
     }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
index 8aedec9826219..754696141ab7b 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -487,7 +487,6 @@ public void start() throws IOException
             dependencies.satisfyDependency( storageEngine.storeReadLayer() );
             dependencies.satisfyDependency( logEntryReader );
             dependencies.satisfyDependency( storageEngine );
-            dependencies.satisfyDependency( transactionLogModule.checkPointing() );
             satisfyDependencies( kernelModule );
         }
         catch ( Throwable e )
diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java
index e4398c36886d7..f9b632260897b 100644
--- a/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java
+++ b/community/kernel/src/test/java/org/neo4j/test/rule/EmbeddedDatabaseRule.java
@@ -89,7 +89,7 @@ public void delete() throws IOException
             }
 
             @Override
-            public void create()
+            public void create() throws IOException
             {
                 dbDir = testDirectory.makeGraphDbDir();
             }
diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java
index b5eddcbd948b3..6e1ea46ce3252 100644
--- a/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java
+++ b/community/kernel/src/test/java/org/neo4j/test/rule/NeoStoresRule.java
@@ -20,6 +20,7 @@
 package org.neo4j.test.rule;
 
 import java.io.File;
+import java.io.IOException;
 
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
@@ -58,14 +59,14 @@ public NeoStoresRule( Class<?> testClass, StoreType... stores )
         this.stores = stores;
     }
 
-    public NeoStores open( String... config )
+    public NeoStores open( String... config ) throws IOException
     {
         Config configuration = new Config( stringMap( config ) );
         RecordFormats formats = RecordFormatSelector.selectForConfig( configuration, NullLogProvider.getInstance() );
         return open( formats, config );
     }
 
-    public NeoStores open( RecordFormats format, String... config )
+    public NeoStores open( RecordFormats format, String... config ) throws IOException
     {
         efs = new EphemeralFileSystemAbstraction();
         Config conf = new Config( stringMap( config ) );
@@ -74,6 +75,7 @@ public NeoStores open( RecordFormats format, String... config )
     }
 
     public NeoStores open( FileSystemAbstraction fs, PageCache pageCache, RecordFormats format, String... config )
+            throws IOException
     {
         assert neoStores == null : "Already opened";
         TestDirectory testDirectory = TestDirectory.testDirectory( testClass, fs );