Skip to content

Commit 6002b6e

Browse files
committed
Migrate RoutingExamplesIT to Testcontainers (#1215)
1 parent 5c394b9 commit 6002b6e

19 files changed

+67
-1164
lines changed

driver/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@
8686
<artifactId>reactor-test</artifactId>
8787
<scope>test</scope>
8888
</dependency>
89+
<dependency>
90+
<groupId>org.testcontainers</groupId>
91+
<artifactId>junit-jupiter</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.testcontainers</groupId>
96+
<artifactId>neo4j</artifactId>
97+
<scope>test</scope>
98+
</dependency>
8999
</dependencies>
90100

91101
<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
@@ -59,7 +59,6 @@
5959
import org.junit.jupiter.api.AfterEach;
6060
import org.junit.jupiter.api.BeforeEach;
6161
import org.junit.jupiter.api.Test;
62-
import org.junit.jupiter.api.extension.ExtendWith;
6362
import org.neo4j.driver.AuthToken;
6463
import org.neo4j.driver.Bookmark;
6564
import org.neo4j.driver.Config;
@@ -86,7 +85,6 @@
8685
import org.reactivestreams.Publisher;
8786
import reactor.core.publisher.Flux;
8887

89-
@ExtendWith(DumpLogsOnFailureWatcher.class)
9088
abstract class AbstractStressTestBase<C extends AbstractContext> {
9189
private static final int THREAD_COUNT = Integer.getInteger("threadCount", 8);
9290
private static final int ASYNC_BATCH_SIZE = Integer.getInteger("asyncBatchSize", 10);
@@ -183,8 +181,6 @@ private void runStressTest(Function<C, List<Future<?>>> threadLauncher) throws T
183181
verifyResults(context, resourcesInfo);
184182
}
185183

186-
abstract void dumpLogs();
187-
188184
abstract URI databaseUri();
189185

190186
abstract AuthToken authToken();

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

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

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import org.neo4j.driver.Config;
2828
import org.neo4j.driver.exceptions.SessionExpiredException;
2929
import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension;
30+
import org.testcontainers.junit.jupiter.Testcontainers;
3031

32+
@Testcontainers(disabledWithoutDocker = true)
3133
class CausalClusteringStressIT extends AbstractStressTestBase<CausalClusteringStressIT.Context> {
3234
@RegisterExtension
3335
static final LocalOrRemoteClusterExtension clusterRule = new LocalOrRemoteClusterExtension();
@@ -73,11 +75,6 @@ void printStats(Context context) {
7375
System.out.println("Bookmark failures: " + context.getBookmarkFailures());
7476
}
7577

76-
@Override
77-
void dumpLogs() {
78-
clusterRule.dumpClusterLogs();
79-
}
80-
8178
@Override
8279
List<BlockingCommand<Context>> createTestSpecificBlockingCommands() {
8380
return Arrays.asList(

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

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

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,4 @@ List<RxCommand<Context>> createTestSpecificRxCommands() {
116116
}
117117

118118
static class Context extends AbstractContext {}
119-
120-
@Override
121-
void dumpLogs() {
122-
neo4j.dumpLogs();
123-
}
124119
}

0 commit comments

Comments
 (0)