From a37df2c20b396611f36fde20cd9738330422e51b Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Wed, 11 Dec 2019 12:58:01 +0100
Subject: [PATCH] Fix test helper

---
 .../scm/repository/spi/SyncAsyncExecutor.java   |  4 +++-
 .../scm/repository/spi/SyncAsyncExecutors.java  | 17 +++++++++++++++--
 .../repository/DefaultSyncAsyncExecutor.java    |  4 ----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutor.java b/scm-core/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutor.java
index 8ba7af3155..55fdbcacdb 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutor.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutor.java
@@ -4,7 +4,9 @@ import java.util.function.Consumer;
 
 public interface SyncAsyncExecutor {
 
-  ExecutionType execute(Runnable runnable);
+  default ExecutionType execute(Runnable runnable) {
+    return execute(ignored -> runnable.run());
+  }
 
   ExecutionType execute(Consumer<ExecutionType> runnable);
 
diff --git a/scm-test/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutors.java b/scm-test/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutors.java
index 9f64a39474..15a1bef046 100644
--- a/scm-test/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutors.java
+++ b/scm-test/src/main/java/sonia/scm/repository/spi/SyncAsyncExecutors.java
@@ -1,10 +1,23 @@
 package sonia.scm.repository.spi;
 
-import java.time.Instant;
+import java.util.function.Consumer;
+
+import static sonia.scm.repository.spi.SyncAsyncExecutor.ExecutionType.SYNCHRONOUS;
 
 public final class SyncAsyncExecutors {
 
   public static SyncAsyncExecutor synchronousExecutor() {
-    return new SyncAsyncExecutor(Runnable::run, Instant.MAX);
+    return new SyncAsyncExecutor() {
+      @Override
+      public ExecutionType execute(Consumer<ExecutionType> runnable) {
+        runnable.accept(SYNCHRONOUS);
+        return SYNCHRONOUS;
+      }
+
+      @Override
+      public boolean hasExecutedAllSynchronously() {
+        return true;
+      }
+    };
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultSyncAsyncExecutor.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultSyncAsyncExecutor.java
index 232435aec5..326b329218 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultSyncAsyncExecutor.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultSyncAsyncExecutor.java
@@ -20,10 +20,6 @@ public class DefaultSyncAsyncExecutor implements SyncAsyncExecutor {
     this.switchToAsyncTime = switchToAsyncTime;
   }
 
-  public ExecutionType execute(Runnable runnable) {
-    return execute(ignored -> runnable.run());
-  }
-
   public ExecutionType execute(Consumer<ExecutionType> runnable) {
     if (Instant.now().isAfter(switchToAsyncTime)) {
       executor.execute(() -> runnable.accept(ASYNCHRONOUS));