Review comments: styling, update test parameters.

neo4j · Oct 2, 2018 · f7efa48 · f7efa48
1 parent 7254f8b
commit f7efa48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 32 deletions.
diff --git a/...community-it/index-it/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java b/...community-it/index-it/src/test/java/org/neo4j/index/recovery/UniqueIndexRecoveryTest.java
@@ -28,23 +28,17 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import java.util.Random;
 
+import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
+import org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex;
 import org.neo4j.graphdb.schema.ConstraintDefinition;
-import org.neo4j.internal.kernel.api.schema.IndexProviderDescriptor;
 import org.neo4j.io.fs.FileUtils;
 import org.neo4j.io.pagecache.IOLimiter;
-import org.neo4j.kernel.api.impl.schema.LuceneIndexProviderFactory;
-import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory10;
-import org.neo4j.kernel.api.impl.schema.NativeLuceneFusionIndexProviderFactory20;
-import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo;
 import org.neo4j.kernel.impl.transaction.log.rotation.LogRotation;
@@ -53,7 +47,6 @@
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.test.rule.TestDirectory;
 
-import static java.util.Arrays.asList;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertFalse;
@@ -73,33 +66,18 @@ public class UniqueIndexRecoveryTest
     private GraphDatabaseAPI db;
 
     @Parameterized.Parameters( name = "{0}" )
-    public static Collection<Object[]> parameters()
+    public static SchemaIndex[] parameters()
     {
-        return asList( new Object[]{new LuceneIndexProviderFactory(), LuceneIndexProviderFactory.PROVIDER_DESCRIPTOR},
+        return SchemaIndex.values();
-                new Object[]{new NativeLuceneFusionIndexProviderFactory10(), NativeLuceneFusionIndexProviderFactory10.DESCRIPTOR},
-                new Object[]{new NativeLuceneFusionIndexProviderFactory20(), NativeLuceneFusionIndexProviderFactory20.DESCRIPTOR} );
     }
 
-    @Parameterized.Parameter( 0 )
+    @Parameterized.Parameter
-    public KernelExtensionFactory<?> kernelExtensionFactory;
+    public SchemaIndex schemaIndex;
-    @Parameterized.Parameter( 1 )
-    public IndexProviderDescriptor descriptor;
 
     @Before
     public void before()
     {
-        List<KernelExtensionFactory<?>> extensionFactories = new ArrayList<>();
+        db = (GraphDatabaseAPI) newDb();
-        extensionFactories.add( kernelExtensionFactory );
-        factory.setKernelExtensions( extensionFactories );
-        db = newDb();
-    }
-
-    private GraphDatabaseAPI newDb()
-    {
-        return (GraphDatabaseAPI) factory
-                .newEmbeddedDatabaseBuilder( storeDir.absolutePath() )
-                .setConfig( GraphDatabaseSettings.default_schema_provider, descriptor.name() )
-                .newGraphDatabase();
     }
 
     @After
@@ -156,10 +134,16 @@ public void shouldRecoverWhenCommandsTemporarilyViolateConstraints() throws Exce
     private void restart( File newStore )
     {
         db.shutdown();
-        db = newDb();
+        db = (GraphDatabaseAPI) newDb();
+    }
+
+    private GraphDatabaseService newDb()
+    {
+        return factory.newEmbeddedDatabaseBuilder( storeDir.absolutePath() ).setConfig( GraphDatabaseSettings.default_schema_provider,
+                schemaIndex.providerIdentifier() ).newGraphDatabase();
     }
 
-    private File snapshot( final File path ) throws IOException
+    private static File snapshot( final File path ) throws IOException
     {
         File snapshotDir = new File( path, "snapshot-" + new Random().nextInt() );
         FileUtils.copyRecursively( path, snapshotDir, pathName ->

diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/...unity/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -232,7 +232,8 @@ public KernelTransactionImplementation( Config config, StatementOperationParts s
                         autoIndexing,
                         constraintIndexCreator,
                         constraintSemantics,
-                        indexProviders, config );
+                        indexProviders,
+                        config );
         this.collectionsFactory = collectionsFactorySupplier.create();
     }