Fix broken tests

neo4j · Jan 5, 2017 · 1be09a7 · 1be09a7
1 parent 9b3752a
commit 1be09a7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 27 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java b/community/kernel/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java
@@ -751,7 +751,7 @@ public GraphDatabaseService newDatabase( @Nonnull Config config )
                             @Override
                             protected void create(
                                     File storeDir,
-                                    Map<String,String> params,
+                                    Config config,
                                     GraphDatabaseFacadeFactory.Dependencies dependencies )
                             {
                                 Function<PlatformModule,EditionModule> factory =
@@ -775,7 +775,7 @@ protected PlatformModule createPlatform( File storeDir, Config config,
                                         return new ImpermanentPlatformModule( storeDir, config, databaseInfo,
                                                 dependencies, graphDatabaseFacade );
                                     }
-                                }.initFacade( storeDir, params, dependencies, this );
+                                }.initFacade( storeDir, config, dependencies, this );
                             }
                         };
                     }

diff --git a/community/kernel/src/test/java/org/neo4j/test/AdversarialPageCacheGraphDatabaseFactory.java b/community/kernel/src/test/java/org/neo4j/test/AdversarialPageCacheGraphDatabaseFactory.java
@@ -51,10 +51,11 @@ public static GraphDatabaseFactory create( FileSystemAbstraction fs, Adversary a
         return new TestGraphDatabaseFactory()
         {
             @Override
-            protected GraphDatabaseService newDatabase( File dir, Map<String,String> config, Dependencies dependencies )
+            protected GraphDatabaseService newDatabase( File dir, Config config, Dependencies dependencies )
             {
                 return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, CommunityEditionModule::new )
                 {
+
                     @Override
                     protected PlatformModule createPlatform( File storeDir, Config config,
                             Dependencies dependencies, GraphDatabaseFacade facade )
@@ -76,7 +77,7 @@ protected PageCache createPageCache( FileSystemAbstraction fileSystem, Config co
                             }
                         };
                     }
-                }.newFacade( dir, Config.embeddedDefaults().with( config ), dependencies );
+                }.newFacade( dir, config, dependencies );
             }
         };
     }

diff --git a/community/neo4j/src/test/java/db/DatabaseShutdownTest.java b/community/neo4j/src/test/java/db/DatabaseShutdownTest.java
@@ -41,6 +41,7 @@
 import org.neo4j.kernel.impl.factory.EditionModule;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
+import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Dependencies;
 import org.neo4j.kernel.impl.factory.PlatformModule;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
@@ -85,7 +86,7 @@ private static class TestGraphDatabaseFactoryWithFailingPageCacheFlush extends T
         private NeoStoreDataSource neoStoreDataSource;
 
         @Override
-        protected GraphDatabaseService newDatabase( File storeDir, Map<String,String> config,
+        protected GraphDatabaseService newDatabase( File storeDir, Config config,
                 GraphDatabaseFacadeFactory.Dependencies dependencies )
         {
             return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, CommunityEditionModule::new )
@@ -124,7 +125,7 @@ public void flushAndForce( IOLimiter ioLimiter ) throws IOException
                         }
                     };
                 }
-            }.newFacade( storeDir, Config.embeddedDefaults().with( config ), dependencies );
+            }.newFacade( storeDir, config, dependencies );
         }
 
         LifecycleStatus getNeoStoreDataSourceStatus() throws NoSuchFieldException, IllegalAccessException

diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java b/enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java
@@ -625,7 +625,7 @@ private GraphDatabaseService startGraphDatabase( File storeDir, boolean withOnli
         GraphDatabaseFactory dbFactory = new TestGraphDatabaseFactory()
         {
             @Override
-            protected GraphDatabaseService newDatabase( File storeDir, Map<String,String> config,
+            protected GraphDatabaseService newDatabase( File storeDir, Config config,
                     GraphDatabaseFacadeFactory.Dependencies dependencies )
             {
                 Function<PlatformModule,EditionModule> factory =
@@ -646,7 +646,7 @@ protected TransactionHeaderInformation createUsing( byte[] additionalHeader )
                             }
                         };
                 return new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, factory )
-                        .newFacade( storeDir, Config.embeddedDefaults().with( config ), dependencies );
+                        .newFacade( storeDir, config, dependencies );
             }
         };
         return dbFactory.newEmbeddedDatabaseBuilder( storeDir )

diff --git a/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java b/enterprise/com/src/main/java/org/neo4j/com/storecopy/ExternallyManagedPageCache.java
@@ -39,6 +39,7 @@
 import org.neo4j.kernel.impl.factory.DatabaseInfo;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
+import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Dependencies;
 import org.neo4j.kernel.impl.factory.PlatformModule;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.monitoring.tracing.Tracers;
@@ -124,7 +125,7 @@ public static class GraphDatabaseFactoryWithPageCacheFactory extends GraphDataba
         }
 
         @Override
-        protected GraphDatabaseService newDatabase( File storeDir, Map<String,String> config,
+        protected GraphDatabaseService newDatabase( File storeDir, Config config,
                 GraphDatabaseFacadeFactory.Dependencies dependencies )
         {
             return new GraphDatabaseFacadeFactory( DatabaseInfo.ENTERPRISE, EnterpriseEditionModule::new )
@@ -143,7 +144,7 @@ protected PageCache createPageCache( FileSystemAbstraction fileSystem, Config co
                         }
                     };
                 }
-            }.newFacade( storeDir, Config.embeddedDefaults().with( config ), dependencies );
+            }.newFacade( storeDir, config, dependencies );
         }
 
         public GraphDatabaseFactoryWithPageCacheFactory setKernelExtensions( Iterable<KernelExtensionFactory<?>> newKernelExtensions )

diff --git a/...tests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java b/...tests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java
@@ -59,12 +59,6 @@ protected GraphDatabaseService newDatabase( File storeDir, Config config, Depend
         return factory.newFacade( storeDir, config, dependencies );
     }
 
-    @Override
-    protected GraphDatabaseService newDatabase( File storeDir, Map<String,String> config, Dependencies dependencies )
-    {
-        return newDatabase( storeDir, Config.embeddedDefaults( config ), dependencies );
-    }
-
     private static class CustomBoltKernelExtensionFacadeFactory extends GraphDatabaseFacadeFactory
     {
         final BoltKernelExtension customExtension;

diff --git a/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java b/tools/src/main/java/org/neo4j/tools/rebuild/RebuildFromLogs.java
@@ -24,7 +24,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 
 import org.neo4j.com.storecopy.ExternallyManagedPageCache;
 import org.neo4j.consistency.ConsistencyCheckService;
@@ -66,7 +65,6 @@
 import org.neo4j.logging.NullLog;
 
 import static java.lang.String.format;
-import static org.neo4j.helpers.collection.MapUtil.stringMap;
 import static org.neo4j.kernel.impl.transaction.log.LogVersionBridge.NO_MORE_CHANNELS;
 import static org.neo4j.kernel.impl.transaction.log.PhysicalLogFile.openForVersion;
 import static org.neo4j.kernel.impl.transaction.log.TransactionIdStore.BASE_TX_ID;
@@ -168,14 +166,17 @@ public void rebuild( File source, File target, long txId ) throws Exception
                 progress = ProgressMonitorFactory.textual( System.err );
             }
             progress.singlePart( format( "Rebuilding store from %s transactions ", txCount ), txCount );
+
+            long lastTxId;
             try ( TransactionApplier applier = new TransactionApplier( fs, target, pageCache ) )
             {
-                long lastTxId = applier.applyTransactionsFrom( source, txId );
-                // set last tx id in neostore otherwise the db is not usable
-                MetaDataStore.setRecord( pageCache, new File( target, MetaDataStore.DEFAULT_NAME ),
-                        MetaDataStore.Position.LAST_TRANSACTION_ID, lastTxId );
+                lastTxId = applier.applyTransactionsFrom( source, txId );
             }
 
+            // set last tx id in neostore otherwise the db is not usable
+            MetaDataStore.setRecord( pageCache, new File( target, MetaDataStore.DEFAULT_NAME ),
+                    MetaDataStore.Position.LAST_TRANSACTION_ID, lastTxId );
+
             try ( ConsistencyChecker checker = new ConsistencyChecker( target, pageCache ) )
             {
                 checker.checkConsistency();
@@ -224,7 +225,7 @@ private static class TransactionApplier implements AutoCloseable
         TransactionApplier( FileSystemAbstraction fs, File dbDirectory, PageCache pageCache )
         {
             this.fs = fs;
-            this.graphdb = startTemporaryDb( dbDirectory.getAbsoluteFile(), pageCache, stringMap() );
+            this.graphdb = startTemporaryDb( dbDirectory.getAbsoluteFile(), pageCache );
             this.commitProcess = graphdb.getDependencyResolver().resolveDependency( TransactionCommitProcess.class );
         }
 
@@ -273,7 +274,7 @@ private static class ConsistencyChecker implements AutoCloseable
 
         ConsistencyChecker( File dbDirectory, PageCache pageCache )
         {
-            this.graphdb = startTemporaryDb( dbDirectory.getAbsoluteFile(), pageCache, stringMap() );
+            this.graphdb = startTemporaryDb( dbDirectory.getAbsoluteFile(), pageCache );
             DependencyResolver resolver = graphdb.getDependencyResolver();
             this.labelScanStore = resolver.resolveDependency( LabelScanStore.class );
             this.indexes = resolver.resolveDependency( SchemaIndexProvider.class );
@@ -297,10 +298,9 @@ public void close() throws Exception
         }
     }
 
-    static GraphDatabaseAPI startTemporaryDb( File targetDirectory, PageCache pageCache, Map<String,String> config )
+    static GraphDatabaseAPI startTemporaryDb( File targetDirectory, PageCache pageCache )
     {
         GraphDatabaseFactory factory = ExternallyManagedPageCache.graphDatabaseFactoryWithPageCache( pageCache );
-        return (GraphDatabaseAPI) factory.newEmbeddedDatabaseBuilder( targetDirectory ).setConfig( config )
-                .newGraphDatabase();
+        return (GraphDatabaseAPI) factory.newEmbeddedDatabaseBuilder( targetDirectory ).newGraphDatabase();
     }
 }