Migrate RoutingExamplesIT to Testcontainers (neo4j#1215)

injectives · Nov 22, 2022 · 6002b6e · 6002b6e
1 parent 5c394b9
commit 6002b6e
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 1,164 deletions.
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -86,6 +86,16 @@
       <artifactId>reactor-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>neo4j</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java b/driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java
@@ -59,7 +59,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.Bookmark;
 import org.neo4j.driver.Config;
@@ -86,7 +85,6 @@
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 
-@ExtendWith(DumpLogsOnFailureWatcher.class)
 abstract class AbstractStressTestBase<C extends AbstractContext> {
     private static final int THREAD_COUNT = Integer.getInteger("threadCount", 8);
     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
         verifyResults(context, resourcesInfo);
     }
 
-    abstract void dumpLogs();
-
     abstract URI databaseUri();
 
     abstract AuthToken authToken();

diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java
diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java
@@ -27,7 +27,9 @@
 import org.neo4j.driver.Config;
 import org.neo4j.driver.exceptions.SessionExpiredException;
 import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
+@Testcontainers(disabledWithoutDocker = true)
 class CausalClusteringStressIT extends AbstractStressTestBase<CausalClusteringStressIT.Context> {
     @RegisterExtension
     static final LocalOrRemoteClusterExtension clusterRule = new LocalOrRemoteClusterExtension();
@@ -73,11 +75,6 @@ void printStats(Context context) {
         System.out.println("Bookmark failures: " + context.getBookmarkFailures());
     }
 
-    @Override
-    void dumpLogs() {
-        clusterRule.dumpClusterLogs();
-    }
-
     @Override
     List<BlockingCommand<Context>> createTestSpecificBlockingCommands() {
         return Arrays.asList(

diff --git a/driver/src/test/java/org/neo4j/driver/stress/DumpLogsOnFailureWatcher.java b/driver/src/test/java/org/neo4j/driver/stress/DumpLogsOnFailureWatcher.java
diff --git a/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java
@@ -116,9 +116,4 @@ List<RxCommand<Context>> createTestSpecificRxCommands() {
     }
 
     static class Context extends AbstractContext {}
-
-    @Override
-    void dumpLogs() {
-        neo4j.dumpLogs();
-    }
 }