Fix failing test

neo4j · Dec 7, 2017 · 87fd406 · 87fd406
1 parent 443ab0b
commit 87fd406
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -334,6 +334,7 @@ public Node getNodeById( long id )
         }
 
         KernelTransaction ktx = spi.currentTransaction();
+        assertTransactionOpen( ktx );
         try ( Statement ignore = ktx.acquireStatement() )
         {
             if ( !ktx.dataRead().nodeExists( id ) )
@@ -460,10 +461,10 @@ public Result execute( InternalTransaction transaction, String query, MapValue p
     @Override
     public ResourceIterable<Node> getAllNodes()
     {
-        assertTransactionOpen();
+        KernelTransaction ktx = spi.currentTransaction();
+        assertTransactionOpen( ktx );
         return () ->
         {
-            KernelTransaction ktx = spi.currentTransaction();
             Statement statement = ktx.acquireStatement();
             NodeCursor cursor = ktx.cursors().allocateNodeCursor();
             ktx.dataRead().allNodesScan( cursor );
@@ -813,7 +814,12 @@ protected boolean fetchNext()
 
     private void assertTransactionOpen()
     {
-        Optional<Status> terminationReason = spi.currentTransaction().getReasonIfTerminated();
+        assertTransactionOpen( spi.currentTransaction() );
+    }
+
+    private void assertTransactionOpen( KernelTransaction transaction )
+    {
+        Optional<Status> terminationReason = transaction.getReasonIfTerminated();
         if ( terminationReason.isPresent() )
         {
             throw new TransactionTerminatedException( terminationReason.get() );

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/OperationsLockTest.java
@@ -30,24 +30,29 @@
 import org.neo4j.internal.kernel.api.Write;
 import org.neo4j.internal.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.internal.kernel.api.exceptions.explicitindex.AutoIndexingKernelException;
+import org.neo4j.kernel.api.AssertOpen;
 import org.neo4j.kernel.api.exceptions.EntityNotFoundException;
 import org.neo4j.kernel.api.explicitindex.AutoIndexOperations;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
 import org.neo4j.kernel.impl.api.state.TxState;
+import org.neo4j.kernel.impl.index.ExplicitIndexStore;
 import org.neo4j.kernel.impl.locking.LockTracer;
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.kernel.impl.locking.ResourceTypes;
 import org.neo4j.kernel.impl.locking.SimpleStatementLocks;
+import org.neo4j.storageengine.api.StorageEngine;
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.StorageStatement;
+import org.neo4j.storageengine.api.StoreReadLayer;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -81,9 +86,15 @@ public void setUp() throws InvalidTransactionTypeKernelException
         when( cursors.allocatePropertyCursor() ).thenReturn( propertyCursor );
         AutoIndexing autoindexing = mock( AutoIndexing.class );
         when( autoindexing.nodes() ).thenReturn( mock( AutoIndexOperations.class ) );
-        allStoreHolder = mock( AllStoreHolder.class );
+        StorageStatement storageStatement = mock( StorageStatement.class );
+        StorageEngine engine = mock( StorageEngine.class );
+        StoreReadLayer storeReadLayer = mock( StoreReadLayer.class );
+        when( storeReadLayer.nodeExists( anyLong() ) ).thenReturn( true );
+        when( engine.storeReadLayer() ).thenReturn( storeReadLayer );
+        allStoreHolder = new AllStoreHolder( engine, storageStatement,  transaction, cursors, mock(
+                ExplicitIndexStore.class ), AssertOpen.ALWAYS_OPEN );
         operations = new Operations( allStoreHolder, mock( IndexTxStateUpdater.class ),
-                mock( StorageStatement.class ), transaction, cursors, autoindexing );
+                storageStatement, transaction, cursors, autoindexing );
         operations.initialize();
     }