Merge pull request #74 from praveenag/master

empty password will give relevant error.

Author: praveenag

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

@@ -0,0 +1,37 @@
+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.shell.ConnectionConfig;
+import org.neo4j.shell.CypherShell;
+import org.neo4j.shell.cli.Format;
+import org.neo4j.shell.exception.CommandException;
+import org.neo4j.shell.log.Logger;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+public class CypherShellFailureIntegrationTest {
+    @Rule
+    public final ExpectedException thrown = ExpectedException.none();
+
+    private Logger logger = mock(Logger.class);
+    private CypherShell shell;
+
+    @Before
+    public void setUp() throws Exception {
+        doReturn(Format.VERBOSE).when(logger).getFormat();
+
+        shell = new CypherShell(logger);
+    }
+
+    @Test
+    public void cypherWithNoPasswordShouldReturnValidError() throws CommandException {
+        thrown.expectMessage("The client is unauthorized due to authentication failure.");
+
+        shell.connect(new ConnectionConfig(logger, "bolt://", "localhost", 7687, "neo4j", "", true));
+    }
+}

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

@@ -93,12 +93,7 @@ public void connect(@Nonnull ConnectionConfig connectionConfig) throws CommandEx
             throw new CommandException("Already connected");
         }
 
-        final AuthToken authToken;
-        if (!connectionConfig.username().isEmpty() && !connectionConfig.password().isEmpty()) {
-            authToken = AuthTokens.basic(connectionConfig.username(), connectionConfig.password());
-        } else {
-            authToken = null;
-        }
+        final AuthToken authToken = AuthTokens.basic(connectionConfig.username(), connectionConfig.password());
 
         try {
             driver = getDriver(connectionConfig, authToken);

cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java

@@ -86,15 +86,6 @@ public void versionIsNotEmptyAfterConnect() throws CommandException {
         assertEquals("9.4.1-ALPHA", handler.getServerVersion());
     }
 
-    private void stubVersion(StatementResult resultMock, String value) {
-        ResultSummary resultSummary = mock(ResultSummary.class);
-        ServerInfo serverInfo = mock(ServerInfo.class);
-
-        when(resultSummary.server()).thenReturn(serverInfo);
-        when(serverInfo.version()).thenReturn(value);
-        when(resultMock.summary()).thenReturn(resultSummary);
-    }
-
     @Test
     public void closeTransactionAfterRollback() throws CommandException {
         boltStateHandler.connect();
@@ -290,6 +281,15 @@ public void turnOnEncryptionIfRequested() throws CommandException {
     /**
      * Bolt state with faked bolt interactions
      */
+    private void stubVersion(StatementResult resultMock, String value) {
+        ResultSummary resultSummary = mock(ResultSummary.class);
+        ServerInfo serverInfo = mock(ServerInfo.class);
+
+        when(resultSummary.server()).thenReturn(serverInfo);
+        when(serverInfo.version()).thenReturn(value);
+        when(resultMock.summary()).thenReturn(resultSummary);
+    }
+
     private static class OfflineBoltStateHandler extends BoltStateHandler {
 
         public OfflineBoltStateHandler(Driver driver) {