Cluster also read the same Neo4j version from env var.

Cluster tests are skipped if the server version is older than 3.1

Author: Zhen

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

@@ -47,14 +47,13 @@ public class Neo4jRunner
     private static final boolean debug = Boolean.getBoolean( "neo4j.runner.debug" );
 
     private static final String DEFAULT_NEOCTRL_ARGS = "-e 3.1.2";
-    private static final String NEOCTRL_ARGS = System.getProperty( "neoctrl.args" ) == null?
-                                               DEFAULT_NEOCTRL_ARGS : System.getProperty( "neoctrl.args" );
+    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 static final String NEO4J_PATH = new File( "../target/neo4j" ).getAbsolutePath();
+    private static final String NEO4J_DIR = new File( "../target/neo4j" ).getAbsolutePath();
     public static String NEO4J_HOME;
 
     /** Global runner controlling a single server, used to avoid having to restart the server between tests */
@@ -111,12 +110,9 @@ private void installNeo4j() throws IOException
 
         List<String> commands = new ArrayList<>();
         commands.add( "neoctrl-install" );
-        if( NEOCTRL_ARGS != null )
-        {
-            String[] split = NEOCTRL_ARGS.trim().split( "\\s+" );
-            commands.addAll( asList( split ) );
-        }
-        commands.add( NEO4J_PATH );
+        String[] split = NEOCTRL_ARGS.trim().split( "\\s+" );
+        commands.addAll( asList( split ) );
+        commands.add( NEO4J_DIR );
 
         NEO4J_HOME = executeCommand( commands ).trim();
 

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

@@ -30,6 +30,8 @@
 
 import org.neo4j.driver.v1.AuthToken;
 import org.neo4j.driver.v1.AuthTokens;
+import org.neo4j.driver.v1.util.Neo4jRunner;
+import org.neo4j.driver.v1.util.ServerVersion;
 
 import static org.junit.Assume.assumeTrue;
 
@@ -39,8 +41,6 @@ public class ClusterRule extends ExternalResource
     private static final String PASSWORD = "test";
     private static final int INITIAL_PORT = 20_000;
 
-    // todo: neo4j version should come from environment variables
-    private static final String NEO4J_VERSION = "3.1.0";
     // todo: should be possible to configure (dynamically add/remove) cores and read replicas
     private static final int CORE_COUNT = 3;
     private static final int READ_REPLICA_COUNT = 2;
@@ -64,7 +64,8 @@ protected void before() throws Throwable
         {
             deleteClusterDir();
 
-            SharedCluster.install( NEO4J_VERSION, CORE_COUNT, READ_REPLICA_COUNT, PASSWORD, INITIAL_PORT, CLUSTER_DIR );
+            SharedCluster.install( parseNeo4jVersion(),
+                    CORE_COUNT, READ_REPLICA_COUNT, PASSWORD, INITIAL_PORT, CLUSTER_DIR );
 
             try
             {
@@ -101,6 +102,15 @@ protected void after()
         cluster.deleteData();
     }
 
+    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 ) );
+        return version;
+    }
+
     private static void addShutdownHookToStopCluster()
     {
         Runtime.getRuntime().addShutdownHook( new Thread()