Skip to content

Commit db4a0ab

Browse files
authored
Update cluster stress tests to assume unencrypted cluster (#883)
1 parent 2fb303c commit db4a0ab

File tree

4 files changed

+6
-36
lines changed

4 files changed

+6
-36
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,13 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
208208

209209
abstract AuthToken authToken();
210210

211-
abstract Config.ConfigBuilder config( Config.ConfigBuilder builder );
212-
213211
Config config()
214212
{
215-
Config.ConfigBuilder builder = Config.builder()
216-
.withLogging( logging )
217-
.withMaxConnectionPoolSize( 100 )
218-
.withConnectionAcquisitionTimeout( 1, MINUTES );
219-
return config( builder ).build();
213+
return Config.builder()
214+
.withLogging( logging )
215+
.withMaxConnectionPoolSize( 100 )
216+
.withConnectionAcquisitionTimeout( 1, MINUTES )
217+
.build();
220218
}
221219

222220
abstract C createContext();

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

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

2828
import org.neo4j.driver.AuthToken;
29-
import org.neo4j.driver.Config;
3029
import org.neo4j.driver.exceptions.SessionExpiredException;
3130
import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension;
3231

@@ -47,12 +46,6 @@ AuthToken authToken()
4746
return clusterRule.getAuthToken();
4847
}
4948

50-
@Override
51-
Config.ConfigBuilder config( Config.ConfigBuilder builder )
52-
{
53-
return clusterRule.config( builder );
54-
}
55-
5649
@Override
5750
Context createContext()
5851
{

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.List;
2626

2727
import org.neo4j.driver.AuthToken;
28-
import org.neo4j.driver.Config;
2928
import org.neo4j.driver.util.DatabaseExtension;
3029
import org.neo4j.driver.util.ParallelizableIT;
3130

@@ -47,12 +46,6 @@ AuthToken authToken()
4746
return neo4j.authToken();
4847
}
4948

50-
@Override
51-
Config.ConfigBuilder config( Config.ConfigBuilder builder )
52-
{
53-
return builder.withoutEncryption();
54-
}
55-
5649
@Override
5750
Context createContext()
5851
{

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,6 @@ public AuthToken getAuthToken()
6161
return localClusterExtension.getDefaultAuthToken();
6262
}
6363

64-
public Config.ConfigBuilder config( Config.ConfigBuilder builder )
65-
{
66-
if ( remoteClusterExists() )
67-
{
68-
builder.withEncryption();
69-
}
70-
else
71-
{
72-
builder.withoutEncryption();
73-
}
74-
75-
return builder;
76-
}
77-
7864
@Override
7965
public void beforeAll( ExtensionContext context ) throws Exception
8066
{
@@ -126,7 +112,7 @@ private void deleteDataInRemoteCluster()
126112
Config.ConfigBuilder builder = Config.builder();
127113
builder.withEventLoopThreads( 1 );
128114

129-
try ( Driver driver = GraphDatabase.driver( getClusterUri(), getAuthToken(), config( builder ).build() ) )
115+
try ( Driver driver = GraphDatabase.driver( getClusterUri(), getAuthToken(), builder.build() ) )
130116
{
131117
TestUtil.cleanDb( driver );
132118
}

0 commit comments

Comments
 (0)