Skip to content

Commit 99c3d88

Browse files
committed
Move PreemptiveTimeoutUtils to org.junit.jupiter.api.timeout package
Context: #5142 (comment)
1 parent 048c482 commit 99c3d88

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

junit-jupiter-api/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
exports org.junit.jupiter.api.function;
3131
exports org.junit.jupiter.api.io;
3232
exports org.junit.jupiter.api.parallel;
33-
exports org.junit.jupiter.api.util to org.junit.jupiter.engine;
33+
exports org.junit.jupiter.api.timeout to org.junit.jupiter.engine;
3434

3535
opens org.junit.jupiter.api.condition to org.junit.platform.commons;
3636
}

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertTimeoutPreemptively.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
package org.junit.jupiter.api;
1212

1313
import static org.junit.jupiter.api.AssertionFailureBuilder.assertionFailure;
14-
import static org.junit.jupiter.api.util.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
14+
import static org.junit.jupiter.api.timeout.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
1515

1616
import java.time.Duration;
1717
import java.util.function.Supplier;

junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/PreemptiveTimeoutUtils.java renamed to junit-jupiter-api/src/main/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11-
package org.junit.jupiter.api.util;
11+
package org.junit.jupiter.api.timeout;
1212

1313
import static java.util.Objects.requireNonNullElse;
1414
import static org.apiguardian.api.API.Status.INTERNAL;
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Internal JUnit Jupiter utilities.
2+
* Internal JUnit Jupiter timeout utilities.
33
*
44
* <h2>DISCLAIMER</h2>
55
*
@@ -9,6 +9,6 @@
99
*/
1010

1111
@NullMarked
12-
package org.junit.jupiter.api.util;
12+
package org.junit.jupiter.api.timeout;
1313

1414
import org.jspecify.annotations.NullMarked;

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/SeparateThreadTimeoutInvocation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
package org.junit.jupiter.engine.extension;
1212

13-
import static org.junit.jupiter.api.util.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
13+
import static org.junit.jupiter.api.timeout.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
1414

1515
import java.util.concurrent.TimeoutException;
1616
import java.util.function.Supplier;

jupiter-tests/src/test/java/org/junit/jupiter/api/util/PreemptiveTimeoutUtilsTest.java renamed to jupiter-tests/src/test/java/org/junit/jupiter/api/timeout/PreemptiveTimeoutUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* https://www.eclipse.org/legal/epl-v20.html
99
*/
1010

11-
package org.junit.jupiter.api.util;
11+
package org.junit.jupiter.api.timeout;
1212

1313
import static java.time.Duration.ofMillis;
1414
import static org.assertj.core.api.Assertions.assertThat;
1515
import static org.junit.jupiter.api.Assertions.assertFalse;
1616
import static org.junit.jupiter.api.Assertions.assertThrows;
1717
import static org.junit.jupiter.api.Assertions.fail;
1818
import static org.junit.jupiter.api.condition.OS.WINDOWS;
19-
import static org.junit.jupiter.api.util.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
19+
import static org.junit.jupiter.api.timeout.PreemptiveTimeoutUtils.executeWithPreemptiveTimeout;
2020

2121
import java.time.Duration;
2222
import java.util.concurrent.CountDownLatch;

platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ requires org.apiguardian.api static transitive
1212
requires org.jspecify static transitive
1313
requires org.junit.platform.commons transitive
1414
requires org.opentest4j transitive
15-
qualified exports org.junit.jupiter.api.util to org.junit.jupiter.engine
15+
qualified exports org.junit.jupiter.api.timeout to org.junit.jupiter.engine
1616
qualified opens org.junit.jupiter.api.condition to org.junit.platform.commons

0 commit comments

Comments
 (0)