Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to make AbstractSchedulingTaskExecutorTests more robust

Browse Source
This commit is contained in:
Sam Brannen
2019-05-27 13:02:30 +02:00
parent bdf3960283
commit 30944ed2e2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java
View File

@@ -155,8 +155,7 @@ public abstract class AbstractSchedulingTaskExecutorTests {
.pollInterval(10, TimeUnit.MILLISECONDS)
.untilAsserted(() ->
assertThatExceptionOfType(CancellationException.class).isThrownBy(() ->
future2.get(1000, TimeUnit.MILLISECONDS)
));
future2.get(1000, TimeUnit.MILLISECONDS)));
}
@Test
@@ -181,10 +180,19 @@ public abstract class AbstractSchedulingTaskExecutorTests {
Future<?> future1 = executor.submit(new TestCallable(-1));
Future<?> future2 = executor.submit(new TestCallable(-1));
shutdownExecutor();
assertThatExceptionOfType(CancellationException.class).isThrownBy(() -> {
try {
future1.get(1000, TimeUnit.MILLISECONDS);
future2.get(1000, TimeUnit.MILLISECONDS);
});
}
catch (Exception ex) {
/* ignore */
}
Awaitility.await()
.atMost(4, TimeUnit.SECONDS)
.pollInterval(10, TimeUnit.MILLISECONDS)
.untilAsserted(() ->
assertThatExceptionOfType(CancellationException.class).isThrownBy(() ->
future2.get(1000, TimeUnit.MILLISECONDS)));
}
@Test