Post merge adaptations

neo4j · Nov 28, 2017 · d3aeb85 · d3aeb85
1 parent 0c76083
commit d3aeb85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdContainerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/id/IdContainerTest.java
@@ -29,6 +29,7 @@
 
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
+import org.neo4j.io.fs.OpenMode;
 import org.neo4j.io.fs.StoreFileChannel;
 import org.neo4j.kernel.impl.store.InvalidIdGeneratorException;
 import org.neo4j.test.rule.TestDirectory;
@@ -197,7 +198,7 @@ private void createEmptyFile()
     private static class SingleByteFileSystemAbstraction extends DefaultFileSystemAbstraction
     {
         @Override
-        public StoreFileChannel open( File fileName, String mode ) throws IOException
+        public StoreFileChannel open( File fileName, OpenMode mode ) throws IOException
         {
             return new SingleByteBufferChannel( super.open( fileName, mode ) );
         }

diff --git a/...va/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigratorTest.java b/...va/org/neo4j/kernel/impl/storemigration/participant/NativeLabelScanStoreMigratorTest.java
@@ -120,7 +120,7 @@ public void failMigrationWhenNodeIdFileIsBroken() throws Exception
         File nodeIdFile = new File( storeDir, StoreFile.NODE_STORE.storeFileName() + ".id" );
         writeFile( nodeIdFile, new byte[]{1, 2, 3} );
 
-        indexMigrator.migrate( storeDir, migrationDir, progressMonitor, StandardV3_2.STORE_VERSION, StandardV3_2.STORE_VERSION );
+        indexMigrator.migrate( storeDir, migrationDir, progressReporter, StandardV3_2.STORE_VERSION, StandardV3_2.STORE_VERSION );
     }
 
     @Test