Merge remote-tracking branch 'origin/1.1' into 1.2

Author: sherfert

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellFailureIntegrationTest.java

@@ -1,13 +1,11 @@
 package org.neo4j.shell.commands;
 
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import org.neo4j.driver.exceptions.AuthenticationException;
-import org.neo4j.shell.ConnectionConfig;
 import org.neo4j.shell.CypherShell;
 import org.neo4j.shell.StringLinePrinter;
 import org.neo4j.shell.cli.Format;
@@ -16,15 +14,14 @@
 
 import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
 
-public class CypherShellFailureIntegrationTest {
+public class CypherShellFailureIntegrationTest extends CypherShellIntegrationTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
     private StringLinePrinter linePrinter = new StringLinePrinter();
-    private CypherShell shell;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         linePrinter.clear();
         shell = new CypherShell(linePrinter, new PrettyConfig(Format.VERBOSE, true, 1000), false);
     }
@@ -34,6 +31,6 @@ public void cypherWithNoPasswordShouldReturnValidError() throws CommandException
         thrown.expect(AuthenticationException.class);
         thrown.expectMessage("The client is unauthorized due to authentication failure.");
 
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "", false, ABSENT_DB_NAME));
+        connect("");
     }
 }

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellIntegrationTest.java

@@ -0,0 +1,26 @@
+package org.neo4j.shell.commands;
+
+import org.neo4j.driver.exceptions.ServiceUnavailableException;
+import org.neo4j.shell.ConnectionConfig;
+import org.neo4j.shell.CypherShell;
+import org.neo4j.shell.exception.CommandException;
+
+import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
+
+abstract class CypherShellIntegrationTest
+{
+    CypherShell shell;
+
+    void connect(String password) throws CommandException {
+        // Try with encryption off first, which is the default for 4.X
+        try
+        {
+            shell.connect( new ConnectionConfig( "bolt://", "localhost", 7687, "neo4j", password, false, ABSENT_DB_NAME ) );
+        }
+        catch ( ServiceUnavailableException e )
+        {
+            // This means we are probably in 3.X, let's retry with encryption on
+            shell.connect( new ConnectionConfig( "bolt://", "localhost", 7687, "neo4j", password, true, ABSENT_DB_NAME ) );
+        }
+    }
+}

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellPlainIntegrationTest.java

@@ -18,18 +18,17 @@
 import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
 import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
 
-public class CypherShellPlainIntegrationTest {
+public class CypherShellPlainIntegrationTest extends CypherShellIntegrationTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
     private StringLinePrinter linePrinter = new StringLinePrinter();
-    private CypherShell shell;
 
     @Before
     public void setUp() throws Exception {
         linePrinter.clear();
         shell = new CypherShell(linePrinter, new PrettyConfig(Format.PLAIN, true, 1000), false);
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", false, ABSENT_DB_NAME));
+        connect( "neo" );
     }
 
     @After

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java

@@ -21,15 +21,14 @@
 import static org.neo4j.shell.Versions.majorVersion;
 import static org.neo4j.shell.Versions.minorVersion;
 
-public class CypherShellVerboseIntegrationTest {
+public class CypherShellVerboseIntegrationTest extends CypherShellIntegrationTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
 
     private StringLinePrinter linePrinter = new StringLinePrinter();
     private Command rollbackCommand;
     private Command commitCommand;
     private Command beginCommand;
-    private CypherShell shell;
 
     @Before
     public void setUp() throws Exception {
@@ -39,7 +38,7 @@ public void setUp() throws Exception {
         commitCommand = new Commit(shell);
         beginCommand = new Begin(shell);
 
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", false, ABSENT_DB_NAME));
+        connect( "neo" );
     }
 
     @After
@@ -73,9 +72,8 @@ public void connectTwiceThrows() throws CommandException {
         thrown.expect(CommandException.class);
         thrown.expectMessage("Already connected");
 
-        ConnectionConfig config = new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", false, ABSENT_DB_NAME);
         assertTrue("Shell should already be connected", shell.isConnected());
-        shell.connect(config);
+        connect( "neo" );
     }
 
     @Test
@@ -194,6 +192,7 @@ public void cypherWithOrder() throws CommandException {
         assumeTrue(minorVersion(serverVersion) == 6 || majorVersion(serverVersion) == 4);
 
         shell.execute( "CREATE INDEX ON :Person(age)" );
+        shell.execute( "CALL db.awaitIndexes()" );
 
         //when
         shell.execute("CYPHER RUNTIME=INTERPRETED EXPLAIN MATCH (n:Person) WHERE n.age >= 18 RETURN n.name, n.age");

tyrekicking.sh

@@ -11,7 +11,10 @@ function prepare-bundle {
 }
 
 function testscript {
-  if cypher-shell/cypher-shell -u neo4j -p neo "RETURN 1;"; then
+  # first try with encryption off (4.X series), if that fails with encryption on (3.X series)
+  if cypher-shell/cypher-shell -u neo4j -p neo --encryption false "RETURN 1;"; then
+    echo "$1 Success!"
+  elif cypher-shell/cypher-shell -u neo4j -p neo --encryption true "RETURN 1;"; then
     echo "$1 Success!"
   else
     echo "$1 Failure!"