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

Fix FtpServerOutboundTests.allEvents test

Browse Source 
Spurious events captured from other tests.
Only capture events for the test's session.
This commit is contained in:
Gary Russell
2019-09-13 16:59:06 -04:00
parent 185d370415
commit 3e30625ac9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
View File

@@ -30,6 +30,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -808,6 +809,8 @@ public class FtpServerOutboundTests extends FtpTestSupport {
private volatile CountDownLatch latch;
private volatile InetSocketAddress clientAddress;
@Bean
public SessionFactory<FTPFile> ftpSessionFactory(ApplicationContext context) {
FtpServerOutboundTests.ftplet().setApplicationEventPublisher(context);
@@ -827,7 +830,13 @@ public class FtpServerOutboundTests extends FtpTestSupport {
public void handleEvent(ApacheMinaFtpEvent event) {
if (this.latch != null) {
if (this.events.size() > 0 || event instanceof SessionOpenedEvent) {
this.events.add(event);
if (event instanceof SessionOpenedEvent) {
this.clientAddress = event.getSession().getClientAddress();
this.events.add(event);
}
else if (event.getSession().getClientAddress().equals(this.clientAddress)) {
this.events.add(event);
}
if (event instanceof SessionClosedEvent) {
this.latch.countDown();
}