Fix failure in Auth test where the encryption is not set following the choice of test platform.

Author: Zhen Li

driver/src/test/java/org/neo4j/driver/v1/stress/AbstractStressTestBase.java

@@ -99,12 +99,7 @@ void setUp()
         System.setProperty( DRIVER_METRICS_ENABLED_KEY, "true" );
         logging = new LoggerNameTrackingLogging();
 
-        Config.ConfigBuilder builder = Config.builder()
-                .withLogging( logging )
-                .withMaxConnectionPoolSize( 100 )
-                .withConnectionAcquisitionTimeout( 1, MINUTES );
-
-        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( builder ) );
+        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config() );
         System.setProperty( DRIVER_METRICS_ENABLED_KEY, "false" );
 
         ThreadFactory threadFactory = new DaemonThreadFactory( getClass().getSimpleName() + "-worker-" );
@@ -184,7 +179,16 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
 
     abstract AuthToken authToken();
 
-    abstract Config config( Config.ConfigBuilder builder );
+    abstract Config.ConfigBuilder config( Config.ConfigBuilder builder );
+
+    Config config()
+    {
+        Config.ConfigBuilder builder = Config.builder()
+                .withLogging( logging )
+                .withMaxConnectionPoolSize( 100 )
+                .withConnectionAcquisitionTimeout( 1, MINUTES );
+        return config( builder ).build();
+    }
 
     abstract C createContext();
 
@@ -232,7 +236,7 @@ private List<BlockingCommand<C>> createBlockingCommands()
         commands.add( new BlockingFailingQuery<>( driver ) );
         commands.add( new BlockingFailingQueryInTx<>( driver ) );
 
-        commands.add( new FailedAuth<>( databaseUri(), logging ) );
+        commands.add( new FailedAuth<>( databaseUri(), config() ) );
 
         commands.addAll( createTestSpecificBlockingCommands() );
 

driver/src/test/java/org/neo4j/driver/v1/stress/CausalClusteringStressIT.java

@@ -68,9 +68,9 @@ AuthToken authToken()
     }
 
     @Override
-    Config config( Config.ConfigBuilder builder )
+    Config.ConfigBuilder config( Config.ConfigBuilder builder )
     {
-        return clusterRule.getDriverConfig( builder );
+        return clusterRule.config( builder );
     }
 
     @Override

driver/src/test/java/org/neo4j/driver/v1/stress/FailedAuth.java

@@ -22,7 +22,6 @@
 
 import org.neo4j.driver.v1.Config;
 import org.neo4j.driver.v1.GraphDatabase;
-import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.exceptions.SecurityException;
 
 import static org.hamcrest.Matchers.containsString;
@@ -33,19 +32,17 @@
 public class FailedAuth<C extends AbstractContext> implements BlockingCommand<C>
 {
     private final URI clusterUri;
-    private final Logging logging;
+    private final Config config;
 
-    public FailedAuth( URI clusterUri, Logging logging )
+    public FailedAuth( URI clusterUri, Config config )
     {
         this.clusterUri = clusterUri;
-        this.logging = logging;
+        this.config = config;
     }
 
     @Override
     public void execute( C context )
     {
-        Config config = Config.builder().withLogging( logging ).withoutEncryption().build();
-
         SecurityException e = assertThrows( SecurityException.class,
                 () -> GraphDatabase.driver( clusterUri, basic( "wrongUsername", "wrongPassword" ), config ) );
         assertThat( e.getMessage(), containsString( "authentication failure" ) );

driver/src/test/java/org/neo4j/driver/v1/stress/SingleInstanceStressIT.java

@@ -54,9 +54,9 @@ AuthToken authToken()
     }
 
     @Override
-    Config config( Config.ConfigBuilder builder )
+    Config.ConfigBuilder config( Config.ConfigBuilder builder )
     {
-        return builder.build();
+        return builder.withoutEncryption();
     }
 
     @Override

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

@@ -63,7 +63,7 @@ public AuthToken getAuthToken()
         return localClusterExtension.getDefaultAuthToken();
     }
 
-    public Config getDriverConfig( Config.ConfigBuilder builder )
+    public Config.ConfigBuilder config( Config.ConfigBuilder builder )
     {
         if ( remoteClusterExists() )
         {
@@ -74,7 +74,7 @@ public Config getDriverConfig( Config.ConfigBuilder builder )
             builder.withoutEncryption();
         }
 
-        return builder.build();
+        return builder;
     }
 
     @Override