added waitDbsAvailable util

neo4j-contrib · Dec 6, 2022 · f25e0bb · f25e0bb
1 parent 4747507
commit f25e0bb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/core/src/test/java/apoc/trigger/TriggerNewProceduresTest.java b/core/src/test/java/apoc/trigger/TriggerNewProceduresTest.java
@@ -38,6 +38,7 @@
 import static apoc.util.TestUtil.testCallCount;
 import static apoc.util.TestUtil.testCallCountEventually;
 import static apoc.util.TestUtil.testCallEventually;
+import static apoc.util.TestUtil.waitDbsAvailable;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -81,6 +82,7 @@ public static void beforeClass() throws Exception {
                 .build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);
+        waitDbsAvailable(db, sysDb);
         TestUtil.registerProcedure(sysDb, TriggerNewProcedures.class, Nodes.class);
         TestUtil.registerProcedure(db, Trigger.class, Nodes.class);
 

diff --git a/core/src/test/java/apoc/trigger/TriggerRestartTest.java b/core/src/test/java/apoc/trigger/TriggerRestartTest.java
@@ -21,8 +21,8 @@
 import static apoc.ApocConfig.SUN_JAVA_COMMAND;
 import static apoc.trigger.TriggerTestUtil.TRIGGER_DEFAULT_REFRESH;
 import static apoc.trigger.TriggerTestUtil.awaitTriggerDiscovered;
+import static apoc.util.TestUtil.waitDbsAvailable;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 public class TriggerRestartTest {
 
@@ -44,6 +44,7 @@ public void setUp() throws IOException {
         databaseManagementService = new TestDatabaseManagementServiceBuilder(store_dir.getRoot().toPath()).build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);
+        waitDbsAvailable(db, sysDb);
         ApocConfig.apocConfig().setProperty("apoc.trigger.enabled", "true");
         TestUtil.registerProcedure(db, TriggerNewProcedures.class, Trigger.class);
     }
@@ -58,8 +59,7 @@ private void restartDb() {
         databaseManagementService = new TestDatabaseManagementServiceBuilder(store_dir.getRoot().toPath()).build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);
-        assertTrue(db.isAvailable(3000));
-        assertTrue(sysDb.isAvailable(3000));
+        waitDbsAvailable(db, sysDb);
     }
 
     @Test

diff --git a/full/src/test/java/apoc/trigger/TriggerNewProceduresExtendedTest.java b/full/src/test/java/apoc/trigger/TriggerNewProceduresExtendedTest.java
@@ -30,7 +30,7 @@
 import static apoc.trigger.TriggerTestUtil.TRIGGER_DEFAULT_REFRESH;
 import static apoc.trigger.TriggerTestUtil.awaitTriggerDiscovered;
 import static apoc.util.TestUtil.testCallCountEventually;
-import static apoc.util.TestUtil.testCallEventually;
+import static apoc.util.TestUtil.waitDbsAvailable;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.neo4j.configuration.GraphDatabaseSettings.procedure_unrestricted;
@@ -64,6 +64,7 @@ public static void beforeClass() throws Exception {
                 .build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);
+        waitDbsAvailable(db, sysDb);
         TestUtil.registerProcedure(sysDb, TriggerNewProcedures.class, Trigger.class, TriggerExtended.class,
                 Nodes.class, Create.class);
         TestUtil.registerProcedure(db, Trigger.class);

diff --git a/test-utils/src/main/java/apoc/util/TestUtil.java b/test-utils/src/main/java/apoc/util/TestUtil.java
@@ -28,6 +28,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeFalse;
@@ -251,4 +252,12 @@ public static <T> List<T> firstColumn(GraphDatabaseService db, String cypher, Ma
     public static <T> List<T> firstColumn(GraphDatabaseService db, String cypher) {
         return db.executeTransactionally(cypher , Collections.emptyMap(), result -> Iterators.asList(iteratorSingleColumn(result)));
     }
+
+    public static void waitDbsAvailable(GraphDatabaseService ...dbs) {
+        waitDbsAvailable(5000, dbs);
+    }
+
+    public static void waitDbsAvailable(long timeout, GraphDatabaseService ...dbs) {
+        Stream.of(dbs).forEach(db -> assertTrue(db.isAvailable(timeout)));
+    }
 }