Fix test failures

neo4j · Dec 18, 2017 · 7dbe20c · 7dbe20c
1 parent c236b30
commit 7dbe20c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...ty/kernel-api/src/test/java/org/neo4j/internal/kernel/api/CursorsClosedPostCondition.java b/...ty/kernel-api/src/test/java/org/neo4j/internal/kernel/api/CursorsClosedPostCondition.java
@@ -24,11 +24,13 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
+import java.util.function.Supplier;
+
 public class CursorsClosedPostCondition implements TestRule
 {
-    private ManagedTestCursors cursors;
+    private Supplier<ManagedTestCursors> cursors;
 
-    CursorsClosedPostCondition( ManagedTestCursors c )
+    CursorsClosedPostCondition( Supplier<ManagedTestCursors> c )
     {
         this.cursors = c;
     }
@@ -41,7 +43,7 @@ public Statement apply( Statement base, Description description )
             public void evaluate() throws Throwable
             {
                 base.evaluate();
-                cursors.assertAllClosedAndReset();  // only done if test succeeds
+                cursors.get().assertAllClosedAndReset();  // only done if test succeeds
             }
         };
     }

diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/KernelAPIReadTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/KernelAPIReadTestBase.java
@@ -91,7 +91,7 @@ public void setupGraph() throws IOException, KernelException
     }
 
     @Rule
-    public CursorsClosedPostCondition cursorsClosedPostCondition = new CursorsClosedPostCondition( cursors );
+    public CursorsClosedPostCondition cursorsClosedPostCondition = new CursorsClosedPostCondition( () -> cursors );
 
     @After
     public void closeTransaction() throws Exception

diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/KernelAPIWriteTestBase.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/KernelAPIWriteTestBase.java
@@ -54,7 +54,7 @@ public abstract class KernelAPIWriteTestBase<WriteSupport extends KernelAPIWrite
     protected static GraphDatabaseService graphDb;
 
     @Rule
-    public CursorsClosedPostCondition conditionalTeardown = new CursorsClosedPostCondition( cursors );
+    public CursorsClosedPostCondition conditionalTeardown = new CursorsClosedPostCondition( () -> cursors );
 
     /**
      * Creates a new instance of WriteSupport, which will be used to execute the concrete test