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

Fix FileTailingMessProducerTests for tail events

Browse Source 
The `OSDelegatingFileTailingMessageProducer` publishes event from scheduled task

* Modify `FileTailingMessageProducerTests.testGuts()` to use `CountDownLatch`
to wait for those asynchronous events

**Cherry-pick to `6.1.x`**
This commit is contained in:
Artem Bilan
2023-12-06 12:56:07 -05:00
parent 9db838eaee
commit a3d347eddd
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -188,17 +188,15 @@ public class FileTailingMessageProducerTests {
file.delete();
}
private void testGuts(FileTailingMessageProducerSupport adapter, String field)
throws Exception {
private void testGuts(FileTailingMessageProducerSupport adapter, String field) throws Exception {
this.adapter = adapter;
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
taskScheduler.afterPropertiesSet();
adapter.setTaskScheduler(taskScheduler);
final List<FileTailingEvent> events = new ArrayList<>();
CountDownLatch tailEventLatch = new CountDownLatch(1);
adapter.setApplicationEventPublisher(event -> {
FileTailingEvent tailEvent = (FileTailingEvent) event;
logger.debug(event);
events.add(tailEvent);
tailEventLatch.countDown();
});
adapter.setFile(new File(testDir, "foo"));
QueueChannel outputChannel = new QueueChannel();
@@ -242,7 +240,7 @@ public class FileTailingMessageProducerTests {
assertThat(message.getHeaders().get(FileHeaders.FILENAME)).isEqualTo(file.getName());
}
assertThat(events.size()).isGreaterThanOrEqualTo(1);
assertThat(tailEventLatch.await(20, TimeUnit.SECONDS)).isTrue();
taskScheduler.destroy();
}