From e450dbaf1d7f48b42dd699d76898d8fd90a64b8c Mon Sep 17 00:00:00 2001
From: Davide Grohmann <davide.grohmann@neotechnology.com>
Date: Thu, 23 Jun 2016 11:00:18 +0200
Subject: [PATCH] Rename TestSessions to SessionRule

---
 .../neo4j/bolt/v1/runtime/integration/SessionAuthIT.java | 2 +-
 .../org/neo4j/bolt/v1/runtime/integration/SessionIT.java | 2 +-
 .../integration/{TestSessions.java => SessionRule.java}  | 9 +++++++--
 .../neo4j/bolt/v1/runtime/integration/TransactionIT.java | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/{TestSessions.java => SessionRule.java} (96%)

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java
index 760d5ce7f38b1..714da1b784fc7 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionAuthIT.java
@@ -37,7 +37,7 @@
 public class SessionAuthIT
 {
     @Rule
-    public TestSessions env = new TestSessions().withAuthEnabled( true );
+    public SessionRule env = new SessionRule().withAuthEnabled( true );
 
     @Test
     public void shouldGiveCredentialsExpiredStatusOnExpiredCredentials() throws Throwable
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionIT.java
index f5115abb96cff..5cc7087209b66 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionIT.java
@@ -56,7 +56,7 @@ public class SessionIT
     private static final Map<String,Object> EMPTY_PARAMS = emptyMap();
 
     @Rule
-    public TestSessions env = new TestSessions();
+    public SessionRule env = new SessionRule();
     private final RecordingCallback responses = new RecordingCallback<>();
     private final RecordingCallback<RecordStream, ?> pulling = new RecordingCallback<>();
     private final RecordingCallback<Void, ?> discarding = new RecordingCallback<>();
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionRule.java
similarity index 96%
rename from community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java
rename to community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionRule.java
index c237242ea0073..009c60c57e11f 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TestSessions.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/SessionRule.java
@@ -48,7 +48,7 @@
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.udc.UsageData;
 
-class TestSessions implements TestRule, Sessions
+class SessionRule implements TestRule, Sessions
 {
     private GraphDatabaseAPI gdb;
     private Sessions actual;
@@ -109,7 +109,7 @@ public Session newSession( String connectionDescriptor, boolean isEncrypted )
         return session;
     }
 
-    TestSessions withAuthEnabled( boolean authEnabled )
+    SessionRule withAuthEnabled( boolean authEnabled )
     {
         this.authEnabled = authEnabled;
         return this;
@@ -126,6 +126,11 @@ URL putTmpFile( String prefix, String suffix, String contents ) throws IOExcepti
         return tmpFile.toURI().toURL();
     }
 
+    public GraphDatabaseAPI graph()
+    {
+        return gdb;
+    }
+
     long lastClosedTxId()
     {
         return gdb.getDependencyResolver().resolveDependency( TransactionIdStore.class ).getLastClosedTransactionId();
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java
index 548d1e2472055..be655510c7c8c 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/TransactionIT.java
@@ -35,7 +35,7 @@ public class TransactionIT
     private static final Map<String, Object> EMPTY_PARAMS = Collections.emptyMap();
 
     @Rule
-    public TestSessions env = new TestSessions();
+    public SessionRule env = new SessionRule();
 
     @Test
     public void shouldHandleBeginCommit() throws Throwable