Skip to content

Make immediate-cancel task termination test deterministic #36967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
junhyeong9812 wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

Make immediate-cancel task termination test deterministic #36967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -153,17 +154,18 @@ void taskTerminationTimeout() throws InterruptedException{

@Test
void taskTerminationTimeoutWithImmediateCancel() {
AtomicBoolean finished = new AtomicBoolean();
AtomicReference<Runnable> captured = new AtomicReference<>();
Future<?> future;
try (SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor()) {
try (SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor() {
@Override
protected void doExecute(Runnable task) {
captured.set(task);
}
}) {
executor.setTaskTerminationTimeout(100);
future = executor.submit(() -> {
if (finished.get()) {
throw new IllegalStateException();
}
});
future = executor.submit(() -> {});
}
finished.set(true);
assertThatExceptionOfType(CancellationException.class).isThrownBy(captured.get()::run);
assertThatExceptionOfType(CancellationException.class).isThrownBy(future::get);
}

Expand Down