Use TokenWrite in integration tests

neo4j · Mar 14, 2018 · d461196 · d461196
1 parent 9689e28
commit d461196
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 52 deletions.
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexIT.java
@@ -35,14 +35,14 @@
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.Iterators;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.index.PropertyAccessor;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor;
@@ -75,7 +75,7 @@ public class IndexIT extends KernelIntegrationTest
     @Before
     public void createLabelAndProperty() throws Exception
     {
-        TokenWriteOperations tokenWrites = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrites = tokenWriteInNewTransaction();
         labelId = tokenWrites.labelGetOrCreateForName( LABEL );
         propertyKeyId = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY );
         int propertyKeyId2 = tokenWrites.propertyKeyGetOrCreateForName( PROPERTY_KEY2 );
@@ -94,8 +94,8 @@ public void tearDown()
     @Test
     public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throws KernelException
     {
-        TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrite = tokenWriteInNewTransaction();
-        int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" );
+        int label2 = tokenWrite.labelGetOrCreateForName( "Label2" );
 
         DataWriteOperations dataWriteOperations = dataWriteOperationsInNewTransaction();
         long nodeId = dataWriteOperations.nodeCreate();
@@ -108,8 +108,8 @@ public void createIndexForAnotherLabelWhileHoldingSharedLockOnOtherLabel() throw
     @Test( timeout = 10_000 )
     public void createIndexesForDifferentLabelsConcurrently() throws Throwable
     {
-        TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrite = tokenWriteInNewTransaction();
-        int label2 = tokenWriteOperations.labelGetOrCreateForName( "Label2" );
+        int label2 = tokenWrite.labelGetOrCreateForName( "Label2" );
 
         LabelSchemaDescriptor anotherLabelDescriptor = SchemaDescriptorFactory.forLabel( label2, propertyKeyId );
         schemaWriteOperationsInNewTransaction().indexCreate( anotherLabelDescriptor );

diff --git a/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java b/...y/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltInProceduresIT.java
@@ -31,11 +31,11 @@
 import org.neo4j.collection.RawIterator;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.helpers.collection.MapUtil;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
 import org.neo4j.kernel.api.ResourceTracker;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.StubResourceManager;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.security.AnonymousContext;
 import org.neo4j.kernel.impl.api.index.inmemory.InMemoryIndexProviderFactory;
 import org.neo4j.kernel.internal.Version;
@@ -81,7 +81,7 @@ public void listAllLabels() throws Throwable
     public void listPropertyKeys() throws Throwable
     {
         // Given
-        TokenWriteOperations ops = tokenWriteOperationsInNewTransaction();
+        TokenWrite ops = tokenWriteInNewTransaction();
         ops.propertyKeyGetOrCreateForName( "MyProp" );
         commit();
 

diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/KernelIntegrationTest.java
@@ -27,6 +27,7 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
 import org.neo4j.internal.kernel.api.Procedures;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.DataWriteOperations;
@@ -35,7 +36,6 @@
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.dbms.DbmsOperations;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.security.AnonymousContext;
@@ -72,11 +72,10 @@ protected Statement statementInNewTransaction( LoginContext loginContext ) throw
         return statement;
     }
 
-    protected TokenWriteOperations tokenWriteOperationsInNewTransaction() throws KernelException
+    protected TokenWrite tokenWriteInNewTransaction() throws KernelException
     {
         transaction = kernel.newTransaction( KernelTransaction.Type.implicit, AnonymousContext.writeToken() );
-        statement = transaction.acquireStatement();
+        return transaction.tokenWrite();
-        return statement.tokenWriteOperations();
     }
 
     protected DataWriteOperations dataWriteOperationsInNewTransaction() throws KernelException

diff --git a/...src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java b/...src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeGetUniqueFromIndexSeekIT.java
@@ -23,14 +23,14 @@
 import org.junit.Test;
 
 import org.neo4j.graphdb.Transaction;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.internal.kernel.api.security.LoginContext;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.StatementConstants;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException;
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.schema.IndexBrokenKernelException;
@@ -52,10 +52,10 @@ public class NodeGetUniqueFromIndexSeekIT extends KernelIntegrationTest
     @Before
     public void createKeys() throws Exception
     {
-        TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrite = tokenWriteInNewTransaction();
-        this.labelId = tokenWriteOperations.labelGetOrCreateForName( "Person" );
+        this.labelId = tokenWrite.labelGetOrCreateForName( "Person" );
-        this.propertyId1 = tokenWriteOperations.propertyKeyGetOrCreateForName( "foo" );
+        this.propertyId1 = tokenWrite.propertyKeyGetOrCreateForName( "foo" );
-        this.propertyId2 = tokenWriteOperations.propertyKeyGetOrCreateForName( "bar" );
+        this.propertyId2 = tokenWrite.propertyKeyGetOrCreateForName( "bar" );
         commit();
     }
 

diff --git a/...test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java b/...test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintValidationIT.java
@@ -21,13 +21,13 @@
 
 import org.junit.Test;
 
+import org.neo4j.internal.kernel.api.TokenNameLookup;
+import org.neo4j.internal.kernel.api.TokenWrite;
+import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
 import org.neo4j.kernel.api.StatementTokenNameLookup;
-import org.neo4j.internal.kernel.api.TokenNameLookup;
-import org.neo4j.kernel.api.TokenWriteOperations;
-import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.exceptions.schema.UniquePropertyValueValidationException;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor;
@@ -392,9 +392,9 @@ private void createConstraint( String label, String propertyKey ) throws KernelE
     {
         int labelId;
         int propertyKeyId;
-        TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrite = tokenWriteInNewTransaction();
-        labelId = tokenWriteOperations.labelGetOrCreateForName( label );
+        labelId = tokenWrite.labelGetOrCreateForName( label );
-        propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( propertyKey );
+        propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( propertyKey );
         commit();
 
         SchemaWriteOperations schemaWriteOperations = schemaWriteOperationsInNewTransaction();

diff --git a/...src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java b/...src/test/java/org/neo4j/kernel/impl/api/integrationtest/AbstractConstraintCreationIT.java
@@ -38,13 +38,13 @@
 import org.neo4j.graphdb.schema.IndexDefinition;
 import org.neo4j.graphdb.schema.Schema;
 import org.neo4j.helpers.collection.Iterables;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.exceptions.schema.AlreadyConstrainedException;
@@ -75,7 +75,7 @@ public abstract class AbstractConstraintCreationIT<Constraint extends Constraint
     int propertyKeyId;
     DESCRIPTOR descriptor;
 
-    abstract int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name )
+    abstract int initializeLabelOrRelType( TokenWrite tokenWrite, String name )
             throws KernelException;
 
     abstract Constraint createConstraint( SchemaWriteOperations writeOps, DESCRIPTOR descriptor ) throws Exception;
@@ -95,9 +95,9 @@ abstract int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations
     @Before
     public void createKeys() throws Exception
     {
-        TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+        TokenWrite tokenWrite = tokenWriteInNewTransaction();
-        this.typeId = initializeLabelOrRelType( tokenWriteOperations, KEY );
+        this.typeId = initializeLabelOrRelType( tokenWrite, KEY );
-        this.propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( PROP );
+        this.propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( PROP );
         this.descriptor = makeDescriptor( typeId, propertyKeyId );
         commit();
     }

diff --git a/.../src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java b/.../src/test/java/org/neo4j/kernel/impl/api/integrationtest/NodeKeyConstraintCreationIT.java
@@ -24,20 +24,20 @@
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.ResourceIterator;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.kernel.api.SchemaWriteOperations;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
 import org.neo4j.kernel.api.schema.constaints.NodeKeyConstraintDescriptor;
 
 public class NodeKeyConstraintCreationIT extends AbstractConstraintCreationIT<NodeKeyConstraintDescriptor,LabelSchemaDescriptor>
 {
     @Override
-    int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
+    int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
     {
-        return tokenWriteOperations.labelGetOrCreateForName( name );
+        return tokenWrite.labelGetOrCreateForName( name );
     }
 
     @Override

diff --git a/.../org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java b/.../org/neo4j/kernel/impl/api/integrationtest/NodePropertyExistenceConstraintCreationIT.java
@@ -27,12 +27,12 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.ResourceIterator;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.internal.kernel.api.schema.constraints.ConstraintDescriptor;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException;
 import org.neo4j.kernel.api.exceptions.schema.NoSuchConstraintException;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
@@ -51,9 +51,9 @@ public class NodePropertyExistenceConstraintCreationIT
         extends AbstractConstraintCreationIT<NodeExistenceConstraintDescriptor,LabelSchemaDescriptor>
 {
     @Override
-    int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
+    int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
     {
-        return tokenWriteOperations.labelGetOrCreateForName( name );
+        return tokenWrite.labelGetOrCreateForName( name );
     }
 
     @Override

diff --git a/...c/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java b/...c/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyConstraintValidationIT.java
@@ -33,12 +33,12 @@
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.ReadOperations;
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.exceptions.ConstraintViolationTransactionFailureException;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
@@ -55,8 +55,10 @@
 import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forLabel;
 import static org.neo4j.kernel.api.schema.SchemaDescriptorFactory.forRelType;
 import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodeKeyConstraintValidationIT;
-import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.NodePropertyExistenceConstraintValidationIT;
+import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT
-import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT.RelationshipPropertyExistenceConstraintValidationIT;
+        .NodePropertyExistenceConstraintValidationIT;
+import static org.neo4j.kernel.impl.api.integrationtest.PropertyConstraintValidationIT
+        .RelationshipPropertyExistenceConstraintValidationIT;
 
 @RunWith( Suite.class )
 @SuiteClasses( {
@@ -71,9 +73,9 @@ public static class NodeKeyConstraintValidationIT extends NodePropertyExistenceC
         @Override
         void createConstraint( String key, String property ) throws KernelException
         {
-            TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+            TokenWrite tokenWrite = tokenWriteInNewTransaction();
-            int label = tokenWriteOperations.labelGetOrCreateForName( key );
+            int label = tokenWrite.labelGetOrCreateForName( key );
-            int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
+            int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property );
             commit();
 
             SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();
@@ -137,9 +139,9 @@ public void shouldAllowNoopLabelUpdate() throws Exception
         @Override
         void createConstraint( String key, String property ) throws KernelException
         {
-            TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+            TokenWrite tokenWrite = tokenWriteInNewTransaction();
-            int label = tokenWriteOperations.labelGetOrCreateForName( key );
+            int label = tokenWrite.labelGetOrCreateForName( key );
-            int propertyKey = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
+            int propertyKey = tokenWrite.propertyKeyGetOrCreateForName( property );
             commit();
 
             SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();
@@ -218,9 +220,9 @@ public static class RelationshipPropertyExistenceConstraintValidationIT
         @Override
         void createConstraint( String key, String property ) throws KernelException
         {
-            TokenWriteOperations tokenWriteOperations = tokenWriteOperationsInNewTransaction();
+            TokenWrite tokenWrite = tokenWriteInNewTransaction();
-            int relTypeId = tokenWriteOperations.relationshipTypeGetOrCreateForName( key );
+            int relTypeId = tokenWrite.relationshipTypeGetOrCreateForName( key );
-            int propertyKeyId = tokenWriteOperations.propertyKeyGetOrCreateForName( property );
+            int propertyKeyId = tokenWrite.propertyKeyGetOrCreateForName( property );
             commit();
 
             SchemaWriteOperations schemaWrite = schemaWriteOperationsInNewTransaction();

diff --git a/...4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java b/...4j/kernel/impl/api/integrationtest/RelationshipPropertyExistenceConstraintCreationIT.java
@@ -23,10 +23,10 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.schema.RelationTypeSchemaDescriptor;
 import org.neo4j.kernel.api.SchemaWriteOperations;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
 import org.neo4j.kernel.api.schema.constaints.RelExistenceConstraintDescriptor;
@@ -37,9 +37,9 @@ public class RelationshipPropertyExistenceConstraintCreationIT
         extends AbstractConstraintCreationIT<RelExistenceConstraintDescriptor,RelationTypeSchemaDescriptor>
 {
     @Override
-    int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
+    int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
     {
-        return tokenWriteOperations.relationshipTypeGetOrCreateForName( name );
+        return tokenWrite.relationshipTypeGetOrCreateForName( name );
     }
 
     @Override

diff --git a/...c/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java b/...c/test/java/org/neo4j/kernel/impl/api/integrationtest/UniquenessConstraintCreationIT.java
@@ -28,6 +28,7 @@
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.internal.kernel.api.TokenNameLookup;
+import org.neo4j.internal.kernel.api.TokenWrite;
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.exceptions.schema.ConstraintValidationException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
@@ -38,7 +39,6 @@
 import org.neo4j.kernel.api.SchemaWriteOperations;
 import org.neo4j.kernel.api.SilentTokenNameLookup;
 import org.neo4j.kernel.api.Statement;
-import org.neo4j.kernel.api.TokenWriteOperations;
 import org.neo4j.kernel.api.exceptions.TransactionFailureException;
 import org.neo4j.kernel.api.exceptions.schema.CreateConstraintFailureException;
 import org.neo4j.kernel.api.exceptions.schema.DropConstraintFailureException;
@@ -72,9 +72,9 @@ public class UniquenessConstraintCreationIT
     private SchemaIndexDescriptor uniqueIndex;
 
     @Override
-    int initializeLabelOrRelType( TokenWriteOperations tokenWriteOperations, String name ) throws KernelException
+    int initializeLabelOrRelType( TokenWrite tokenWrite, String name ) throws KernelException
     {
-        return tokenWriteOperations.labelGetOrCreateForName( KEY );
+        return tokenWrite.labelGetOrCreateForName( KEY );
     }
 
     @Override