Skip to content

Commit e846007

Browse files
committed
Migrate RoutingExamplesIT to Testcontainers
1 parent 59600be commit e846007

18 files changed

+63
-1300
lines changed

driver/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@
8282
<artifactId>reactor-test</artifactId>
8383
<scope>test</scope>
8484
</dependency>
85+
<dependency>
86+
<groupId>org.testcontainers</groupId>
87+
<artifactId>junit-jupiter</artifactId>
88+
<scope>test</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.testcontainers</groupId>
92+
<artifactId>neo4j</artifactId>
93+
<scope>test</scope>
94+
</dependency>
8595
</dependencies>
8696

8797
<build>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.junit.jupiter.api.AfterEach;
2222
import org.junit.jupiter.api.BeforeEach;
2323
import org.junit.jupiter.api.Test;
24-
import org.junit.jupiter.api.extension.ExtendWith;
2524
import org.reactivestreams.Publisher;
2625
import reactor.core.publisher.Flux;
2726

@@ -88,7 +87,6 @@
8887
import static org.junit.jupiter.api.Assumptions.assumeTrue;
8988
import static org.neo4j.driver.SessionConfig.builder;
9089

91-
@ExtendWith( DumpLogsOnFailureWatcher.class )
9290
abstract class AbstractStressTestBase<C extends AbstractContext>
9391
{
9492
private static final int THREAD_COUNT = Integer.getInteger( "threadCount", 8 );
@@ -202,8 +200,6 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
202200
verifyResults( context, resourcesInfo );
203201
}
204202

205-
abstract void dumpLogs();
206-
207203
abstract URI databaseUri();
208204

209205
abstract AuthToken authToken();

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.neo4j.driver.stress;
2020

2121
import org.junit.jupiter.api.extension.RegisterExtension;
22+
import org.testcontainers.junit.jupiter.Testcontainers;
2223

2324
import java.net.URI;
2425
import java.util.Arrays;
@@ -30,6 +31,7 @@
3031
import org.neo4j.driver.exceptions.SessionExpiredException;
3132
import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension;
3233

34+
@Testcontainers( disabledWithoutDocker = true )
3335
class CausalClusteringStressIT extends AbstractStressTestBase<CausalClusteringStressIT.Context>
3436
{
3537
@RegisterExtension
@@ -84,12 +86,6 @@ void printStats( Context context )
8486
System.out.println( "Bookmark failures: " + context.getBookmarkFailures() );
8587
}
8688

87-
@Override
88-
void dumpLogs()
89-
{
90-
clusterRule.dumpClusterLogs();
91-
}
92-
9389
@Override
9490
List<BlockingCommand<Context>> createTestSpecificBlockingCommands()
9591
{
@@ -112,5 +108,4 @@ int getLeaderSwitchCount()
112108
return leaderSwitches.get();
113109
}
114110
}
115-
116111
}

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

Lines changed: 0 additions & 55 deletions
This file was deleted.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,4 @@ List<RxCommand<Context>> createTestSpecificRxCommands()
145145
static class Context extends AbstractContext
146146
{
147147
}
148-
149-
@Override
150-
void dumpLogs()
151-
{
152-
neo4j.dumpLogs();
153-
}
154148
}

0 commit comments

Comments
 (0)