Feedback and test fix.

Author: sherfert

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

@@ -14,6 +14,7 @@
 import static org.junit.Assume.assumeTrue;
 import static org.neo4j.shell.DatabaseManager.ABSENT_DB_NAME;
 import static org.neo4j.shell.util.Versions.majorVersion;
+import static org.neo4j.shell.util.Versions.minorVersion;
 
 public class CypherShellProtocolIntegrationTest{
 
@@ -35,28 +36,29 @@ public void shouldConnectWithNeo4jProtocol() throws Exception {
     @Test
     public void shouldConnectWithBoltSSCProtocol() throws Exception {
         CypherShell shell = new CypherShell( new StringLinePrinter(), new PrettyConfig( Format.PLAIN, true, 1000), false, new ShellParameterMap());
-        // Given 3.X series, where SSC are the default. Hard to test in 4.0 sadly.
-        onlyIn3x(shell);
+        // Given 3.X series where X > 1, where SSC are the default. Hard to test in 4.0 sadly.
+        onlyIn3_2to3_6( shell);
         shell.connect( new ConnectionConfig( "bolt+ssc://", "localhost", 7687, "neo4j", "neo", Encryption.DEFAULT, ABSENT_DB_NAME ) );
         assertTrue(shell.isConnected());
     }
 
     @Test
     public void shouldConnectWithNeo4jSSCProtocol() throws Exception {
         CypherShell shell = new CypherShell( new StringLinePrinter(), new PrettyConfig( Format.PLAIN, true, 1000), false, new ShellParameterMap());
-        // Given 3.X series, where SSC are the default. Hard to test in 4.0 sadly.
-        onlyIn3x(shell);
+        // Given 3.X series where X > 1, where SSC are the default. Hard to test in 4.0 sadly.
+        onlyIn3_2to3_6( shell);
         // This should work by falling back to bolt+ssc
         shell.connect( new ConnectionConfig( "neo4j+ssc://", "localhost", 7687, "neo4j", "neo", Encryption.DEFAULT, ABSENT_DB_NAME ) );
         assertTrue(shell.isConnected());
     }
 
     // Here should be tests for "neo4j+s" and "bolt+s", but we don't have the infrastructure for those.
 
-    private void onlyIn3x(CypherShell shell) throws Exception {
+    private void onlyIn3_2to3_6( CypherShell shell) throws Exception {
         // Default connection settings
         shell.connect( new ConnectionConfig( "bolt://", "localhost", 7687, "neo4j", "neo", Encryption.DEFAULT, ABSENT_DB_NAME ) );
-        assumeTrue( majorVersion( shell.getServerVersion() ) < 4 );
+        assumeTrue( majorVersion( shell.getServerVersion() ) == 3 );
+        assumeTrue( minorVersion( shell.getServerVersion() )  > 1 );
         shell.disconnect();
     }
 }

cypher-shell/src/main/java/org/neo4j/shell/cli/CliArgHelper.java

@@ -162,8 +162,8 @@ private static ArgumentParser setupParser(ParameterMap parameterMap)
                 .help("password to connect with. Can also be specified using environment variable " + ConnectionConfig.PASSWORD_ENV_VAR);
         connGroup.addArgument("--encryption")
                 .help("whether the connection to Neo4j should be encrypted. This must be consistent with Neo4j's " +
-                      "configuration. If choosing " + Encryption.DEFAULT.name().toLowerCase() +
-                      " the encryption setting is deduced from the specified address. " +
+                      "configuration. If choosing '" + Encryption.DEFAULT.name().toLowerCase() +
+                      "' the encryption setting is deduced from the specified address. " +
                       "For example the 'neo4j+ssc' protocol would use encryption.")
                  .choices(new CollectionArgumentChoice<>(
                          Encryption.TRUE.name().toLowerCase(),

cypher-shell/src/test/java/org/neo4j/shell/cli/CliArgHelperTest.java

@@ -195,6 +195,13 @@ public void allowsEncryptionToBeTurnedOnOrOff() {
         assertEquals(Encryption.FALSE, CliArgHelper.parse("--encryption", "false").getEncryption());
     }
 
+    @Test
+    public void shouldNotAcceptInvalidEncryption() throws Exception  {
+        thrown.expect( ArgumentParserException.class );
+        thrown.expectMessage( containsString("argument --encryption: invalid choice: 'bugaluga' (choose from {true,false,default})"));
+        CliArgHelper.parseAndThrow("--encryption", "bugaluga");
+    }
+
     @Test
     public void shouldParseSingleIntegerArgWithAddition() {
         CliArgs cliArgs = CliArgHelper.parse( "-P", "foo=>3+5" );