Merge branch '1.2' into 1.3

Author: Zhen

README.md

@@ -3,6 +3,9 @@
 This is the first official Neo4j java driver for connecting to Neo4j-the-database via the newly designed remoting
 protocol BOLT.
 
+For detailed information such as manual, driver API documentations, changelogs, please refer to 
+[wiki](https://github.com/neo4j/neo4j-java-driver/wiki).
+
 ## Minimum viable snippet
 
 Add the driver to your project:
@@ -30,8 +33,6 @@ Connect to a Neo4j 3.0.0+ database:
 
     driver.close();
 
-For more examples and details of usage, please refer to the [Driver Manual] (http://neo4j.com/docs/developer-manual/3.0/index.html#driver-manual-index).
-
 ## Binding
 
 The source code here reflects the current development status of a new driver version.
@@ -40,10 +41,8 @@ code with git tags instead.
 
 ### Java version
 
-To compile the code and run all tests, you first need to prepare the `neokit` submodule which is used for integration tests:
-
-    git submodule init
-    git submodule update
+The driver unit tests relies on latest [`boltkit`](https://github.com/neo4j-contrib/boltkit) installed on your local machine. 
+If `boltkit` is not installed, then all tests that requires `boltkit` will be ignored and not be executed.
 
 Then if you are running Java 8:
 
@@ -60,13 +59,5 @@ Java 8, because Neo4j-the-database needs it to run.
 
 ### Windows
 
-If you are building on windows, you need to have Python (v2.7) installed and have Python.exe to be added in your system `PATH` variables.
-Then run install as admin, so that Neo4j-the-database could be installed and started with Python scripts for integration tests.
-
-Or you could choose to ignore integration tests by running:
-
-    mvn clean install -DskipITs 
-
-Without integration tests, there is no need to install Python or run as admin.
-
-For more information such as manual, driver API documentations, changelogs, please refer to [wiki](https://github.com/neo4j/neo4j-java-driver/wiki).
+If you are building on windows, you need to run install as admin, so that Neo4j-the-database could be installed and 
+started for integration tests.

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

@@ -62,7 +62,8 @@ public void assumeBookmarkSupport()
         session = sessionRule;
 
         ServerVersion serverVersion = ServerVersion.version( driver );
-        assumeTrue( serverVersion.greaterThanOrEqual( v3_1_0 ) );
+        assumeTrue( "Server version `" + serverVersion + "` does not support bookmark",
+                serverVersion.greaterThanOrEqual( v3_1_0 ) );
     }
 
     @Test

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

@@ -32,8 +32,10 @@
 import org.neo4j.driver.v1.GraphDatabase;
 
 import static java.util.Arrays.asList;
+import static org.junit.Assume.assumeTrue;
 import static org.neo4j.driver.v1.ConfigTest.deleteDefaultKnownCertFileIfExists;
 import static org.neo4j.driver.v1.util.FileTools.updateProperties;
+import static org.neo4j.driver.v1.util.cc.CommandLineUtil.boltKitAvailable;
 import static org.neo4j.driver.v1.util.cc.CommandLineUtil.executeCommand;
 
 /**
@@ -44,21 +46,23 @@ public class Neo4jRunner
 {
     private static Neo4jRunner globalInstance;
 
-    private static final boolean debug = Boolean.getBoolean( "neo4j.runner.debug" );
+    private static final boolean debug = true;
 
     private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.1.2";
     public static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args", DEFAULT_NEOCTRL_ARGS );
     public static final URI DEFAULT_URI = URI.create( "bolt://localhost:7687" );
     public static final BoltServerAddress DEFAULT_ADDRESS = BoltServerAddress.from( DEFAULT_URI );
     private Driver driver;
-    private Neo4jSettings currentSettings = Neo4jSettings.DEFAULT_SETTINGS;
+    private Neo4jSettings currentSettings = Neo4jSettings.TEST_SETTINGS;
 
-    private static final String NEO4J_DIR = new File( "../target/neo4j" ).getAbsolutePath();
+    public static final String TARGET_DIR = new File( "../target" ).getAbsolutePath();
+    private static final String NEO4J_DIR = new File(  TARGET_DIR, "neo4j" ).getAbsolutePath();
     public static String NEO4J_HOME;
 
     /** Global runner controlling a single server, used to avoid having to restart the server between tests */
     public static synchronized Neo4jRunner getOrCreateGlobalRunner() throws IOException
     {
+        assumeTrue( "BoltKit support unavailable", boltKitAvailable() );
         if ( globalInstance == null )
         {
             globalInstance = new Neo4jRunner();
@@ -70,6 +74,7 @@ private Neo4jRunner() throws IOException
     {
         try
         {
+            installNeo4j();
             startNeo4j();
         }
         finally
@@ -115,30 +120,34 @@ private void installNeo4j() throws IOException
         commands.add( NEO4J_DIR );
 
         NEO4J_HOME = executeCommand( commands ).trim();
+        updateServerSettingsFile();
 
+        debug( "Installed server at `%s`.", NEO4J_HOME );
     }
 
     private void startNeo4j() throws IOException
     {
-        installNeo4j();
-        updateServerSettingsFile();
+        debug( "Starting server..." );
         executeCommand( "neoctrl-create-user", NEO4J_HOME, "neo4j", "neo4j" );
         executeCommand( "neoctrl-start", NEO4J_HOME );
+        debug( "Server started." );
     }
 
     public synchronized void stopNeo4j() throws IOException
     {
-        if(serverStatus() == ServerStatus.OFFLINE)
+        if( serverStatus() == ServerStatus.OFFLINE )
         {
             return;
         }
-        if(driver != null)
+        if( driver != null )
         {
             driver.close();
             driver = null;
         }
 
+        debug( "Stopping server..." );
         executeCommand( "neoctrl-stop", NEO4J_HOME );
+        debug( "Server stopped." );
     }
 
     public void forceToRestart() throws IOException
@@ -220,7 +229,7 @@ private void updateServerSettingsFile()
         File oldFile = new File( NEO4J_HOME, "conf/neo4j.conf" );
         try
         {
-            debug( "Changing server properties file (for next start): " + oldFile.getCanonicalPath() );
+            debug( "Changing server properties file (for next start): %s", oldFile.getCanonicalPath() );
             for ( Map.Entry<String, String> property : propertiesMap.entrySet() )
             {
                 String name = property.getKey();
@@ -261,7 +270,7 @@ static void debug( String text, Object... args )
     {
         if ( debug )
         {
-            System.err.println( "Neo4jRunner: " + String.format( text, args ) );
+            System.out.println( String.format( text, args ) );
         }
     }
 }

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

@@ -44,7 +44,6 @@ public class Neo4jSettings
     private final Map<String, String> settings;
     private final Set<String> excludes;
 
-    public static Neo4jSettings DEFAULT_SETTINGS = new Neo4jSettings( new HashMap<String, String>(), Collections.<String>emptySet() );
     public static Neo4jSettings TEST_SETTINGS = new Neo4jSettings( map(
             CERT_DIR, DEFAULT_CERT_DIR,
             DATA_DIR, DEFAULT_DATA_DIR,

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

@@ -33,7 +33,7 @@ public class ServerVersion
     private final int patch;
 
     private static final Pattern PATTERN =
-            Pattern.compile("Neo4j/(\\d+)\\.(\\d+)(?:\\.)?(\\d*)(\\.|-|\\+)?([0-9A-Za-z-.]*)?");
+            Pattern.compile("(Neo4j/)?(\\d+)\\.(\\d+)(?:\\.)?(\\d*)(\\.|-|\\+)?([0-9A-Za-z-.]*)?");
 
     private ServerVersion( int major, int minor, int patch )
     {
@@ -64,9 +64,9 @@ public static ServerVersion version( String server )
             Matcher matcher = PATTERN.matcher( server );
             if ( matcher.matches() )
             {
-                int major = Integer.valueOf( matcher.group( 1 ) );
-                int minor = Integer.valueOf( matcher.group( 2 ) );
-                String patchString = matcher.group( 3 );
+                int major = Integer.valueOf( matcher.group( 2 ) );
+                int minor = Integer.valueOf( matcher.group( 3 ) );
+                String patchString = matcher.group( 4 );
                 int patch = 0;
                 if ( patchString != null && !patchString.isEmpty() )
                 {
@@ -141,4 +141,10 @@ private int compareTo( ServerVersion o )
 
         return c;
     }
+
+    @Override
+    public String toString()
+    {
+        return String.format( "%s.%s.%s", major, minor, patch );
+    }
 }

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

@@ -114,8 +114,6 @@ public BoltServerAddress address()
 
     static void clearDatabaseContents( Session session, String reason )
     {
-        debug( "Clearing database contents for: %s", reason );
-
         // Note - this hangs for extended periods some times, because there are tests that leave sessions running.
         // Thus, we need to wait for open sessions and transactions to time out before this will go through.
         // This could be helped by an extension in the future.

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterControl.java

@@ -27,19 +27,6 @@ private ClusterControl()
     {
     }
 
-    static boolean boltKitClusterAvailable()
-    {
-        try
-        {
-            executeCommand( "neoctrl-cluster", "--help" );
-            return true;
-        }
-        catch ( CommandLineException e )
-        {
-            return false;
-        }
-    }
-
     static void installCluster( String neo4jVersion, int cores, int readReplicas, String password, int port,
             Path path )
     {

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterRule.java

@@ -34,10 +34,12 @@
 import org.neo4j.driver.v1.util.ServerVersion;
 
 import static org.junit.Assume.assumeTrue;
+import static org.neo4j.driver.v1.util.Neo4jRunner.TARGET_DIR;
+import static org.neo4j.driver.v1.util.cc.CommandLineUtil.boltKitAvailable;
 
 public class ClusterRule extends ExternalResource
 {
-    private static final Path CLUSTER_DIR = Paths.get( "target", "test-cluster" ).toAbsolutePath();
+    private static final Path CLUSTER_DIR = Paths.get( TARGET_DIR, "test-cluster" ).toAbsolutePath();
     private static final String PASSWORD = "test";
     private static final int INITIAL_PORT = 20_000;
 
@@ -58,7 +60,7 @@ public AuthToken getDefaultAuthToken()
     @Override
     protected void before() throws Throwable
     {
-        assumeTrue( "BoltKit cluster support unavailable", ClusterControl.boltKitClusterAvailable() );
+        assumeTrue( "BoltKit cluster support unavailable", boltKitAvailable() );
 
         if ( !SharedCluster.exists() )
         {
@@ -107,7 +109,8 @@ private static String parseNeo4jVersion()
         String[] split = Neo4jRunner.NEOCTRL_ARGS.split( "\\s+" );
         String version = split[split.length - 1];
         // if the server version is older than 3.1 series, then ignore the tests
-        assumeTrue( ServerVersion.version( "Neo4j/" + version ).greaterThanOrEqual( ServerVersion.v3_1_0 ) );
+        assumeTrue( "Server version `" + version + "` does not support Casual Cluster",
+                ServerVersion.version( version ).greaterThanOrEqual( ServerVersion.v3_1_0 ) );
         return version;
     }
 

driver/src/test/java/org/neo4j/driver/v1/util/cc/CommandLineUtil.java

@@ -31,6 +31,18 @@
 
 public class CommandLineUtil
 {
+    public static boolean boltKitAvailable()
+    {
+        try
+        {
+            executeCommand( "neoctrl-cluster", "--help" );
+            return true;
+        }
+        catch ( CommandLineException e )
+        {
+            return false;
+        }
+    }
 
     public static String executeCommand( List<String> commands )
     {