Skip to content

Commit 8771b65

Browse files
committed
Simplify condition
1 parent 6f3981e commit 8771b65

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Diff for: junit-jupiter-engine/src/test/java/org/junit/jupiter/api/AssertTimeoutAssertionsTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.concurrent.atomic.AtomicBoolean;
2929
import java.util.concurrent.atomic.AtomicReference;
3030

31-
import org.junit.jupiter.api.condition.OS;
3231
import org.junit.jupiter.api.function.Executable;
3332
import org.junit.platform.commons.util.ExceptionUtils;
3433
import org.opentest4j.AssertionFailedError;
@@ -40,7 +39,7 @@
4039
*/
4140
class AssertTimeoutAssertionsTests {
4241

43-
private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(OS.current() == WINDOWS ? 1000 : 100);
42+
private static final Duration PREEMPTIVE_TIMEOUT = ofMillis(WINDOWS.isCurrentOs() ? 1000 : 100);
4443

4544
private static ThreadLocal<AtomicBoolean> changed = ThreadLocal.withInitial(() -> new AtomicBoolean(false));
4645

Diff for: junit-jupiter-engine/src/test/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocationTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.junit.jupiter.api.DisplayName;
2222
import org.junit.jupiter.api.Test;
2323
import org.junit.jupiter.api.Timeout.ThreadMode;
24-
import org.junit.jupiter.api.condition.OS;
2524
import org.junit.jupiter.api.extension.ExtensionContext;
2625
import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation;
2726
import org.junit.jupiter.engine.execution.ExtensionValuesStore;
@@ -34,7 +33,7 @@
3433
@DisplayName("SeparateThreadTimeoutInvocation")
3534
class SeparateThreadTimeoutInvocationTest {
3635

37-
private static final long PREEMPTIVE_TIMEOUT_MILLIS = OS.current() == WINDOWS ? 1000 : 100;
36+
private static final long PREEMPTIVE_TIMEOUT_MILLIS = WINDOWS.isCurrentOs() ? 1000 : 100;
3837

3938
@Test
4039
@DisplayName("throws timeout exception when timeout duration is exceeded")

0 commit comments

Comments
 (0)