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

Fix some race conditions in tests

Browse Source 
* `SftpSessionFactoryTests.concurrentGetSessionDoesntCauseFailure()`
may not report properly into an `ArrayList` from another thread.
Use `asyncTaskExecutor.submitCompletable()` instead and deal with their result afterward.
* Use `CompletableFuture` for the `TcpListener` logic in the `FailoverClientConnectionFactoryTests.failoverAllDeadAfterSuccess()`
This commit is contained in:
Artem Bilan
2025-03-20 10:19:36 -04:00
parent d73ded52c9
commit 08400df280
3 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java
View File

@@ -24,6 +24,7 @@ import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -48,7 +49,6 @@ import org.apache.sshd.sftp.client.impl.AbstractSftpClient;
import org.apache.sshd.sftp.server.SftpSubsystemFactory;
import org.junit.jupiter.api.Test;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import static org.assertj.core.api.Assertions.assertThat;
@@ -133,20 +133,27 @@ public class SftpSessionFactoryTests {
sftpSessionFactory.setPassword("pass");
sftpSessionFactory.setAllowUnknownKeys(true);
List<SftpSession> concurrentSessions = new ArrayList<>();
List<CompletableFuture<SftpSession>> concurrentSessions = new ArrayList<>();
AsyncTaskExecutor asyncTaskExecutor = new SimpleAsyncTaskExecutor();
for (int i = 0; i < 3; i++) {
asyncTaskExecutor.execute(() -> concurrentSessions.add(sftpSessionFactory.getSession()));
try (var asyncTaskExecutor = new SimpleAsyncTaskExecutor()) {
for (int i = 0; i < 3; i++) {
concurrentSessions.add(asyncTaskExecutor.submitCompletable(sftpSessionFactory::getSession));
}
}
await().atMost(Duration.ofSeconds(30)).until(() -> concurrentSessions.size() == 3);
assertThat(CompletableFuture.allOf(concurrentSessions.toArray(CompletableFuture[]::new)))
.succeedsWithin(Duration.ofSeconds(10));
assertThat(concurrentSessions.get(0))
.isNotEqualTo(concurrentSessions.get(1))
.isNotEqualTo(concurrentSessions.get(2));
List<SftpSession> sftpSessions = concurrentSessions
.stream()
.map(CompletableFuture::join)
.toList();
assertThat(concurrentSessions.get(1)).isNotEqualTo(concurrentSessions.get(2));
assertThat(sftpSessions.get(0))
.isNotEqualTo(sftpSessions.get(1))
.isNotEqualTo(sftpSessions.get(2));
assertThat(sftpSessions.get(1)).isNotEqualTo(sftpSessions.get(2));
sftpSessionFactory.destroy();
}