Merge pull request neo4j#692 from zhenlineo/1.7-stop-db

Stop database properly in tests

Author: zhenlineo

driver/src/test/java/org/neo4j/driver/v1/integration/SessionAsyncIT.java

@@ -192,7 +192,7 @@ void shouldFailWhenServerIsRestarted()
 
                 if ( i == 0 )
                 {
-                    neo4j.killDb();
+                    neo4j.stopDb();
                 }
 
                 List<Record> records = await( cursor.listAsync() );
@@ -583,7 +583,7 @@ void shouldConsumeNonEmptyCursor()
     @Test
     void shouldRunAfterRunFailureToAcquireConnection()
     {
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () ->
         {
@@ -633,7 +633,7 @@ void shouldNotRunAfterBeginTxFailureOnBookmark()
     @Test
     void shouldBeginTxAfterRunFailureToAcquireConnection()
     {
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () ->
         {

driver/src/test/java/org/neo4j/driver/v1/integration/TransactionAsyncIT.java

@@ -575,7 +575,7 @@ void shouldFailToCommitWhenServerIsRestarted()
 
         await( tx.runAsync( "CREATE ()" ) );
 
-        neo4j.killDb();
+        neo4j.stopDb();
 
         assertThrows( ServiceUnavailableException.class, () -> await( tx.commitAsync() ) );
     }

driver/src/test/java/org/neo4j/driver/v1/util/DatabaseExtension.java

@@ -163,11 +163,6 @@ public void stopDb()
         runner.stopNeo4j();
     }
 
-    public void killDb()
-    {
-        runner.killNeo4j();
-    }
-
     public ServerVersion version()
     {
         return ServerVersion.version( driver() );