Change the java driver to use neokit to manage server start

TODO:
Test on windows
Able to take args to change the server version used in the driver

Author: Zhen

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "neokit"]
+	path = neokit
+	url = https://github.com/neo-technology/neokit.git

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

@@ -87,7 +87,7 @@ public void shouldGetHelpfulErrorOnInvalidCredentials() throws Throwable
 
     private void enableAuth( String password ) throws Exception
     {
-        neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT
+        neo4j.restart( Neo4jSettings.TEST_SETTINGS
                 .updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
                 .updateWith( Neo4jSettings.DATA_DIR, tempDir.getRoot().getAbsolutePath().replace("\\", "/") ));
 

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

@@ -18,7 +18,6 @@
  */
 package org.neo4j.driver.v1.integration;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -39,7 +38,7 @@
 public class LoadCSVIT
 {
     @Rule
-    public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.DEFAULT.without( Neo4jSettings.IMPORT_DIR ));
+    public TestNeo4j neo4j = new TestNeo4j( Neo4jSettings.TEST_SETTINGS.without( Neo4jSettings.IMPORT_DIR ));
 
     @Test
     public void shouldLoadCSV() throws Throwable

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

@@ -138,7 +138,7 @@ public void shouldPerformTLSHandshakeWithTrustedCert() throws Throwable
         finally
         {
             // always restore the db default settings
-            neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT );
+            neo4j.restart();
         }
     }
 
@@ -197,8 +197,8 @@ private void createFakeServerCertPairInKnownCerts( String host, int port, File k
     public void shouldFailTLSHandshakeDueToServerCertNotSignedByKnownCA() throws Throwable
     {
         // Given
-        neo4j.restartServerOnEmptyDatabase(
-                Neo4jSettings.DEFAULT.updateWith(
+        neo4j.restart(
+                Neo4jSettings.TEST_SETTINGS.updateWith(
                         Neo4jSettings.CERT_DIR,
                         folder.getRoot().getAbsolutePath().replace("\\", "/") ) );
         SocketChannel channel = SocketChannel.open();

driver/src/test/java/org/neo4j/driver/v1/stress/DriverStresser.java

@@ -57,7 +57,7 @@ public static void main( String... args ) throws Throwable
     public static void setup() throws Exception
     {
         server = Neo4jRunner.getOrCreateGlobalRunner();
-        server.ensureRunning( Neo4jSettings.DEFAULT );
+        server.ensureRunning( Neo4jSettings.TEST_SETTINGS );
         driver = GraphDatabase.driver( "bolt://localhost" );
     }
 
@@ -88,7 +88,7 @@ public int operation()
     public static void tearDown() throws Exception
     {
         driver.close();
-        server.stop();
+        server.stopNeo4j();
     }
 
 

driver/src/test/java/org/neo4j/driver/v1/tck/DriverAuthSteps.java

@@ -63,7 +63,7 @@ public void reset()
             {
                 driver.close();
             }
-            neo4j.useDefaultEncryptionKeyAndCert();
+            neo4j.restart();
         }
         catch ( Exception e )
         {
@@ -121,7 +121,7 @@ public void aProtocolErrorIsRaised() throws Throwable
 
     private Driver configureCredentials( String name, String oldPassword, String newPassword ) throws Exception
     {
-        neo4j.restartServerOnEmptyDatabase( Neo4jSettings.DEFAULT
+        neo4j.restart( Neo4jSettings.TEST_SETTINGS
                 .updateWith( Neo4jSettings.AUTH_ENABLED, "true" )
                 .updateWith( Neo4jSettings.DATA_DIR, tempDir.getAbsolutePath().replace("\\", "/") ));
 

driver/src/test/java/org/neo4j/driver/v1/tck/DriverSecurityComplianceSteps.java

@@ -268,7 +268,7 @@ public void clearAfterEachScenario() throws Throwable
     @After("@modifies_db_config")
     public void resetDbWithDefaultSettings() throws Throwable
     {
-        neo4j.useDefaultEncryptionKeyAndCert();
+        neo4j.restart();
     }
 
     private File tempFile(String prefix, String suffix) throws Throwable