From 1563cd63148e73b42a360e45ef9514268d4eaacb Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 27 May 2020 13:19:42 +0200 Subject: [PATCH] increased timeout for ConcurrencyTest from 3 to 5 minutes --- .../src/com/sap/sailing/domain/test/ConcurrencyTest.java | 8 ++++++++ .../sap/sailing/domain/test/OnlineTracTracBasedTest.java | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java index c7bce133734..56d105f2aef 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ConcurrencyTest.java @@ -11,7 +11,10 @@ import java.util.List; import java.util.logging.Logger; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.rules.Timeout; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.impl.DouglasPeucker; @@ -36,6 +39,11 @@ public class ConcurrencyTest extends OnlineTracTracBasedTest { super(); } + @Rule + public TestRule getTimeoutRule() { + return Timeout.millis(5 * 60 * 1000); // five instead of three minutes timeout for this test + } + @Before public void setUp() throws Exception { super.setUp(); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 42889becb59..7ec56ede3bf 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -91,7 +91,6 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest i super(); } - @Before public void setUp() throws Exception { domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl(DomainFactory.TEST_RACE_LOG_RESOLVER));