Skip to content

Commit 14f0a60

Browse files
committed
Merge #3779 into 3.7.0-M2
2 parents ac2284c + c9fdc64 commit 14f0a60

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

reactor-core/src/test/java21/reactor/core/scheduler/BoundedElasticThreadPerTaskSchedulerTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void ensuresTasksScheduling() throws InterruptedException {
7575
Disposable disposable = scheduler.schedule(latch::countDown);
7676

7777
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
78-
Assertions.assertThat(disposable.isDisposed()).isTrue();
78+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
7979
}
8080

8181
@Test
@@ -108,7 +108,7 @@ public void ensuresTasksDelayedScheduling() throws InterruptedException {
108108
.until(() -> ((ScheduledThreadPoolExecutor) resource.sharedDelayedTasksScheduler).getQueue().isEmpty());
109109

110110
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
111-
Assertions.assertThat(disposable.isDisposed()).isTrue();
111+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
112112
}
113113

114114
@Test
@@ -135,7 +135,7 @@ public void ensuresTasksDelayedZeroDelayScheduling() throws InterruptedException
135135
Assertions.assertThat(((ScheduledThreadPoolExecutor) resource.sharedDelayedTasksScheduler).getQueue().size()).isZero();
136136

137137
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
138-
Assertions.assertThat(disposable.isDisposed()).isTrue();
138+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
139139

140140
// unblock scheduler
141141
awaiter.countDown();
@@ -153,7 +153,7 @@ public void ensuresTasksPeriodicScheduling() throws InterruptedException {
153153
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
154154
Assertions.assertThat(disposable.isDisposed()).isFalse();
155155
disposable.dispose();
156-
Assertions.assertThat(disposable.isDisposed()).isTrue();
156+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
157157
}
158158

159159
@Test
@@ -168,7 +168,7 @@ public void ensuresTasksPeriodicZeroInitialDelayScheduling() throws InterruptedE
168168
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
169169
Assertions.assertThat(disposable.isDisposed()).isFalse();
170170
disposable.dispose();
171-
Assertions.assertThat(disposable.isDisposed()).isTrue();
171+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
172172
}
173173

174174
@Test
@@ -183,7 +183,7 @@ public void ensuresTasksPeriodicWithInitialDelayAndInstantPeriodScheduling() thr
183183
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
184184
Assertions.assertThat(disposable.isDisposed()).isFalse();
185185
disposable.dispose();
186-
Assertions.assertThat(disposable.isDisposed()).isTrue();
186+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
187187
}
188188

189189
@Test
@@ -198,7 +198,7 @@ public void ensuresTasksPeriodicWithZeroInitialDelayAndInstantPeriodScheduling()
198198
Assertions.assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
199199
Assertions.assertThat(disposable.isDisposed()).isFalse();
200200
disposable.dispose();
201-
Assertions.assertThat(disposable.isDisposed()).isTrue();
201+
Awaitility.await().untilAsserted(() -> Assertions.assertThat(disposable.isDisposed()).isTrue());
202202
}
203203

204204
@Test

0 commit comments

Comments
 (0)