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

Fix race in PollingLifecycleTests

Browse Source
This commit is contained in:
Gary Russell
2018-10-19 15:42:31 -04:00
parent 23ebe56838
commit 7aa8489279
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java
View File

@@ -52,6 +52,7 @@ import org.springframework.scheduling.support.PeriodicTrigger;
* @author Oleg Zhurakousky
* @author Gunnar Hillert
* @author Artem Bilan
* @author Gary Russell
*/
public class PollingLifecycleTests {
@@ -144,16 +145,18 @@ public class PollingLifecycleTests {
pollerMetadata.setTrigger(new PeriodicTrigger(2000));
adapterFactory.setPollerMetadata(pollerMetadata);
final Runnable caughtInterrupted = mock(Runnable.class);
final CountDownLatch interruptedLatch = new CountDownLatch(1);
MessageSource<String> source = () -> {
try {
for (int i = 0; i < 10; i++) {
Thread.sleep(10);
Thread.sleep(latch.getCount() > 0 ? 10 : 1000);
latch.countDown();
}
}
catch (InterruptedException e) {
caughtInterrupted.run();
interruptedLatch.countDown();
}
return new GenericMessage<>("hello");
@@ -165,10 +168,10 @@ public class PollingLifecycleTests {
adapter.setTaskScheduler(taskScheduler);
adapter.afterPropertiesSet();
adapter.start();
assertTrue(latch.await(3000, TimeUnit.SECONDS));
assertTrue(latch.await(10_000, TimeUnit.SECONDS));
//
adapter.stop();
Thread.sleep(10);
assertTrue(interruptedLatch.await(10_000, TimeUnit.SECONDS));
Mockito.verify(caughtInterrupted, times(1)).run();
}