Migrate RoutingExamplesIT to Testcontainers (#1215)

neo4j · May 10, 2022 · dfb609a · dfb609a
1 parent 59600be
commit dfb609a
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 1,300 deletions.
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -82,6 +82,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
@@ -21,7 +21,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.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 
@@ -88,7 +87,6 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.neo4j.driver.SessionConfig.builder;
 
-@ExtendWith( DumpLogsOnFailureWatcher.class )
 abstract class AbstractStressTestBase<C extends AbstractContext>
 {
     private static final int THREAD_COUNT = Integer.getInteger( "threadCount", 8 );
@@ -202,8 +200,6 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
         verifyResults( context, resourcesInfo );
     }
 
-    abstract void dumpLogs();
-
     abstract URI databaseUri();
 
     abstract AuthToken authToken();

diff --git a/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java b/driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java
@@ -19,6 +19,7 @@
 package org.neo4j.driver.stress;
 
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -30,6 +31,7 @@
 import org.neo4j.driver.exceptions.SessionExpiredException;
 import org.neo4j.driver.util.cc.LocalOrRemoteClusterExtension;
 
+@Testcontainers( disabledWithoutDocker = true )
 class CausalClusteringStressIT extends AbstractStressTestBase<CausalClusteringStressIT.Context>
 {
     @RegisterExtension
@@ -84,12 +86,6 @@ void printStats( Context context )
         System.out.println( "Bookmark failures: " + context.getBookmarkFailures() );
     }
 
-    @Override
-    void dumpLogs()
-    {
-        clusterRule.dumpClusterLogs();
-    }
-
     @Override
     List<BlockingCommand<Context>> createTestSpecificBlockingCommands()
     {
@@ -112,5 +108,4 @@ int getLeaderSwitchCount()
             return leaderSwitches.get();
         }
     }
-
 }
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
@@ -145,10 +145,4 @@ List<RxCommand<Context>> createTestSpecificRxCommands()
     static class Context extends AbstractContext
     {
     }
-
-    @Override
-    void dumpLogs()
-    {
-        neo4j.dumpLogs();
-    }
 }