diff --git a/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java b/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java index a663cd4fbd..531ca7942c 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java +++ b/driver/src/test/java/org/neo4j/driver/internal/util/ImmediateSchedulingEventExecutor.java @@ -19,7 +19,6 @@ package org.neo4j.driver.internal.util; import static java.util.Collections.unmodifiableList; -import static org.mockito.Mockito.mock; import io.netty.util.concurrent.EventExecutor; import io.netty.util.concurrent.EventExecutorGroup; @@ -148,17 +147,24 @@ public Future submit(Callable task) { @Override public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { - scheduleDelays.add(unit.toMillis(delay)); - delegate.execute(command); - return mock(ScheduledFuture.class); + var delayMillis = unit.toMillis(delay); + scheduleDelays.add(delayMillis); + if (delayMillis > 100) { + // Ensure there is some delay to prevent Mono.delayElement going silent (reactor-core 3.5.7) + delayMillis = 100; + } + return delegate.schedule(command, delayMillis, TimeUnit.MILLISECONDS); } @Override - @SuppressWarnings("unchecked") public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { - scheduleDelays.add(unit.toMillis(delay)); - delegate.submit(callable); - return mock(ScheduledFuture.class); + var delayMillis = unit.toMillis(delay); + scheduleDelays.add(delayMillis); + if (delayMillis > 100) { + // Ensure there is some delay to prevent Mono.delayElement going silent (reactor-core 3.5.7) + delayMillis = 100; + } + return delegate.schedule(callable, delayMillis, TimeUnit.MILLISECONDS); } @Override