Fix failing tests

Author: henriknyman

cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

@@ -34,6 +34,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.neo4j.shell.util.Versions.majorVersion;
 
 public class MainIntegrationTest
 {
@@ -84,10 +85,21 @@ public void setup() {
     }
 
     private void ensureUser() throws Exception {
-        shell.execute(":use " + DatabaseManager.SYSTEM_DB_NAME);
-        shell.execute("CREATE OR REPLACE USER foo SET PASSWORD 'pass';");
-        shell.execute("GRANT ROLE reader TO foo;");
-        shell.execute(":use");
+        if (majorVersion(shell.getServerVersion() ) >= 4) {
+            shell.execute(":use " + DatabaseManager.SYSTEM_DB_NAME);
+            shell.execute("CREATE OR REPLACE USER foo SET PASSWORD 'pass';");
+            shell.execute("GRANT ROLE reader TO foo;");
+            shell.execute(":use");
+        } else {
+            try {
+                shell.execute("CALL dbms.security.createUser('foo', 'pass', true)");
+            } catch (ClientException e) {
+                if (e.code().equalsIgnoreCase("Neo.ClientError.General.InvalidArguments") && e.getMessage().contains("already exists")) {
+                    shell.execute("CALL dbms.security.deleteUser('foo')");
+                    shell.execute("CALL dbms.security.createUser('foo', 'pass', true)");
+                }
+            }
+        }
     }
 
     @Test
@@ -140,12 +152,28 @@ public void promptsOnPasswordChangeRequired() throws Exception {
 
         // then
         assertTrue(shell.isConnected());
-        // should have prompted to change the password
-        String expectedChangePasswordOutput = format( "username: foo%npassword: ****%nPassword change required%nnew password: *******%n" );
-        assertEquals(expectedLoginOutput + expectedChangePasswordOutput, baos.toString());
-        assertEquals("foo", connectionConfig.username());
-        assertEquals("newpass", connectionConfig.password());
-        assertNull(connectionConfig.newPassword());
+        if (majorVersion(shell.getServerVersion() ) >= 4) {
+            // should have prompted to change the password
+            String expectedChangePasswordOutput = format( "username: foo%npassword: ****%nPassword change required%nnew password: *******%n" );
+            assertEquals(expectedLoginOutput + expectedChangePasswordOutput, baos.toString());
+            assertEquals("foo", connectionConfig.username());
+            assertEquals("newpass", connectionConfig.password());
+            assertNull(connectionConfig.newPassword());
+
+            // Should be able to execute read query
+            shell.execute("MATCH (n) RETURN count(n)");
+        } else {
+            // in 3.x we do not get credentials expired exception on connection, but when we try to access data
+            String expectedChangePasswordOutput = format( "username: foo%npassword: ****%n" );
+            assertEquals(expectedLoginOutput + expectedChangePasswordOutput, baos.toString());
+            assertEquals("foo", connectionConfig.username());
+            assertEquals("pass", connectionConfig.password());
+
+            // Should get exception with instructions on how to change password using procedure
+            exception.expect(ClientException.class);
+            exception.expectMessage("CALL dbms.changePassword");
+            shell.execute("MATCH (n) RETURN count(n)");
+        }
     }
 
     @Test

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

@@ -23,7 +23,7 @@
 import static org.neo4j.shell.DatabaseManager.ABSENT_DB_NAME;
 import static org.neo4j.shell.DatabaseManager.DEFAULT_DEFAULT_DB_NAME;
 import static org.neo4j.shell.DatabaseManager.SYSTEM_DB_NAME;
-import static org.neo4j.shell.Versions.majorVersion;
+import static org.neo4j.shell.util.Versions.majorVersion;
 
 public class CypherShellMultiDatabaseIntegrationTest
 {

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

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
-import static org.neo4j.shell.Versions.majorVersion;
-import static org.neo4j.shell.Versions.minorVersion;
+import static org.neo4j.shell.util.Versions.majorVersion;
+import static org.neo4j.shell.util.Versions.minorVersion;
 
 public class CypherShellVerboseIntegrationTest extends CypherShellIntegrationTest {
     @Rule

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -22,6 +22,8 @@
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.log.NullLogging;
 
+import static org.neo4j.shell.util.Versions.majorVersion;
+
 /**
  * Handles interactions with the driver
  */
@@ -253,8 +255,15 @@ public void changePassword(@Nonnull ConnectionConfig connectionConfig) {
                     .withDatabase(SYSTEM_DB_NAME);
             session = driver.session(builder.build());
 
-            String command = "ALTER CURRENT USER SET PASSWORD FROM $o TO $n";
-            Value parameters = Values.parameters("o", connectionConfig.password(), "n", connectionConfig.newPassword());
+            String command;
+            Value parameters;
+            if (majorVersion(getServerVersion()) >= 4) {
+                command = "ALTER CURRENT USER SET PASSWORD FROM $o TO $n";
+                parameters = Values.parameters("o", connectionConfig.password(), "n", connectionConfig.newPassword());
+            } else {
+                command = "CALL dbms.security.changePassword($n)";
+                parameters = Values.parameters("n", connectionConfig.newPassword());
+            }
 
             StatementResult run = session.run(command, parameters);
             run.consume();
@@ -364,7 +373,10 @@ private Optional<List<BoltResult>> captureResults(@Nonnull List<Statement> trans
         List<BoltResult> results = executeWithRetry(transactionStatements, (statement, transaction) -> {
             // calling list() is what actually executes cypher on the server
             StatementResult sr = transaction.run(statement);
-            BoltResult singleResult = new ListBoltResult(sr.list(), sr.consume(), sr.keys());
+            List<Record> list = sr.list();
+            List<String> keys = sr.keys();
+            ResultSummary summary = sr.consume();
+            BoltResult singleResult = new ListBoltResult(list, summary, keys );
             updateActualDbName(singleResult.getSummary());
             return singleResult;
         });

cypher-shell/src/integration-test/java/org/neo4j/shell/Version.java renamed to cypher-shell/src/main/java/org/neo4j/shell/util/Version.java

@@ -1,4 +1,4 @@
-package org.neo4j.shell;
+package org.neo4j.shell.util;
 
 import static java.lang.String.format;
 

cypher-shell/src/integration-test/java/org/neo4j/shell/Versions.java renamed to cypher-shell/src/main/java/org/neo4j/shell/util/Versions.java

@@ -1,4 +1,4 @@
-package org.neo4j.shell;
+package org.neo4j.shell.util;
 
 import static java.lang.Integer.parseInt;
 import static java.lang.String.format;