Skip to content

Commit daca111

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

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,12 @@ void setUp()
9999
System.setProperty( DRIVER_METRICS_ENABLED_KEY, "true" );
100100
logging = new LoggerNameTrackingLogging();
101101

102-
Config config = Config.builder()
103-
.withoutEncryption()
102+
Config.ConfigBuilder builder = Config.builder()
104103
.withLogging( logging )
105104
.withMaxConnectionPoolSize( 100 )
106-
.withConnectionAcquisitionTimeout( 1, MINUTES )
107-
.build();
105+
.withConnectionAcquisitionTimeout( 1, MINUTES );
108106

109-
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config );
107+
driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( builder ) );
110108
System.setProperty( DRIVER_METRICS_ENABLED_KEY, "false" );
111109

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

187185
abstract AuthToken authToken();
188186

187+
abstract Config config( Config.ConfigBuilder builder );
188+
189189
abstract C createContext();
190190

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
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;
3940
import org.neo4j.driver.v1.exceptions.SessionExpiredException;
4041
import org.neo4j.driver.v1.summary.ResultSummary;
@@ -66,6 +67,12 @@ AuthToken authToken()
6667
return clusterRule.getAuthToken();
6768
}
6869

70+
@Override
71+
Config config( Config.ConfigBuilder builder )
72+
{
73+
return clusterRule.getDriverConfig( builder );
74+
}
75+
6976
@Override
7077
Context createContext()
7178
{

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.concurrent.atomic.AtomicLong;
2727

2828
import org.neo4j.driver.v1.AuthToken;
29+
import org.neo4j.driver.v1.Config;
2930
import org.neo4j.driver.v1.summary.ResultSummary;
3031
import org.neo4j.driver.v1.util.DatabaseExtension;
3132
import org.neo4j.driver.v1.util.ParallelizableIT;
@@ -52,6 +53,12 @@ AuthToken authToken()
5253
return neo4j.authToken();
5354
}
5455

56+
@Override
57+
Config config( Config.ConfigBuilder builder )
58+
{
59+
return builder.build();
60+
}
61+
5562
@Override
5663
Context createContext()
5764
{

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
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;
3233
import org.neo4j.driver.v1.util.TestUtil;
3334

@@ -62,6 +63,20 @@ public AuthToken getAuthToken()
6263
return localClusterExtension.getDefaultAuthToken();
6364
}
6465

66+
public Config getDriverConfig( Config.ConfigBuilder builder )
67+
{
68+
if ( remoteClusterExists() )
69+
{
70+
builder.withEncryption();
71+
}
72+
else
73+
{
74+
builder.withoutEncryption();
75+
}
76+
77+
return builder.build();
78+
}
79+
6580
@Override
6681
public void beforeAll( ExtensionContext context ) throws Exception
6782
{

0 commit comments

Comments
 (0)