Skip to content

Commit fa3150f

Browse files
author
Zhen Li
committed
Enable encryption for cluster stress test if test with a remote cluster.
1 parent 53f567b commit fa3150f

File tree

3 files changed

+34
-9
lines changed

3 files changed

+34
-9
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import static java.util.Collections.nCopies;
6868
import static java.util.Collections.singletonMap;
6969
import static java.util.concurrent.CompletableFuture.completedFuture;
70-
import static java.util.concurrent.TimeUnit.MINUTES;
7170
import static java.util.concurrent.TimeUnit.NANOSECONDS;
7271
import static java.util.concurrent.TimeUnit.SECONDS;
7372
import static org.hamcrest.Matchers.equalTo;
@@ -99,14 +98,7 @@ void setUp()
9998
System.setProperty( DRIVER_METRICS_ENABLED_KEY, "true" );
10099
logging = new LoggerNameTrackingLogging();
101100

102-
Config config = Config.builder()
103-
.withoutEncryption()
104-
.withLogging( logging )
105-
.withMaxConnectionPoolSize( 100 )
106-
.withConnectionAcquisitionTimeout( 1, MINUTES )
107-
.build();
108-
109-
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config );
101+
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( logging ) );
110102
System.setProperty( DRIVER_METRICS_ENABLED_KEY, "false" );
111103

112104
ThreadFactory threadFactory = new DaemonThreadFactory( getClass().getSimpleName() + "-worker-" );
@@ -186,6 +178,8 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
186178

187179
abstract AuthToken authToken();
188180

181+
abstract Config config( Logging logging );
182+
189183
abstract C createContext();
190184

191185
abstract List<BlockingCommand<C>> createTestSpecificBlockingCommands();

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
import org.neo4j.driver.internal.BoltServerAddress;
3636
import org.neo4j.driver.internal.util.ServerVersion;
3737
import org.neo4j.driver.v1.AuthToken;
38+
import org.neo4j.driver.v1.Config;
3839
import org.neo4j.driver.v1.Driver;
40+
import org.neo4j.driver.v1.Logging;
3941
import org.neo4j.driver.v1.exceptions.SessionExpiredException;
4042
import org.neo4j.driver.v1.summary.ResultSummary;
4143
import org.neo4j.driver.v1.util.cc.ClusterMemberRole;
@@ -66,6 +68,12 @@ AuthToken authToken()
6668
return clusterRule.getAuthToken();
6769
}
6870

71+
@Override
72+
Config config( Logging logging )
73+
{
74+
return clusterRule.getDriverConfig( logging );
75+
}
76+
6977
@Override
7078
Context createContext()
7179
{

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828
import org.neo4j.driver.internal.util.DriverFactoryWithOneEventLoopThread;
2929
import org.neo4j.driver.v1.AuthToken;
3030
import org.neo4j.driver.v1.AuthTokens;
31+
import org.neo4j.driver.v1.Config;
3132
import org.neo4j.driver.v1.Driver;
33+
import org.neo4j.driver.v1.Logging;
3234
import org.neo4j.driver.v1.util.TestUtil;
3335

36+
import static java.util.concurrent.TimeUnit.MINUTES;
3437
import static org.neo4j.driver.internal.DriverFactory.BOLT_ROUTING_URI_SCHEME;
3538
import static org.neo4j.driver.internal.DriverFactory.NEO4J_URI_SCHEME;
3639
import static org.neo4j.driver.v1.Config.defaultConfig;
@@ -62,6 +65,26 @@ public AuthToken getAuthToken()
6265
return localClusterExtension.getDefaultAuthToken();
6366
}
6467

68+
69+
public Config getDriverConfig( Logging logging )
70+
{
71+
Config.ConfigBuilder builder = Config.builder()
72+
.withLogging( logging )
73+
.withMaxConnectionPoolSize( 100 )
74+
.withConnectionAcquisitionTimeout( 1, MINUTES );
75+
76+
if ( remoteClusterExists() )
77+
{
78+
builder.withEncryption();
79+
}
80+
else
81+
{
82+
builder.withoutEncryption();
83+
}
84+
85+
return builder.build();
86+
}
87+
6588
@Override
6689
public void beforeAll( ExtensionContext context ) throws Exception
6790
{

0 commit comments

Comments
 (0)