Fix FTP sample tests to use bigger idle
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2059/ Fix `JmsMockTests` stubbing via making endpoint stopped before mocking Force SI and SF versions via their BOMs imports Regenerate POMs including `dependencyManagement` for BOMs customization
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.integration.samples</groupId>
|
||||
<artifactId>ftp</artifactId>
|
||||
@@ -56,7 +55,6 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.integration</groupId>
|
||||
<artifactId>spring-integration-ftp</artifactId>
|
||||
<version>5.0.0.M3</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -116,7 +114,6 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
<version>5.0.0.BUILD-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -128,7 +125,6 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.integration</groupId>
|
||||
<artifactId>spring-integration-test</artifactId>
|
||||
<version>5.0.0.M3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@@ -138,5 +134,28 @@
|
||||
<name>Spring Framework Maven Milestone Repository</name>
|
||||
<url>https://repo.spring.io/libs-milestone</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>repo.spring.io.snapshot</id>
|
||||
<name>Spring Framework Maven Snapshot Repository</name>
|
||||
<url>https://repo.spring.io/libs-snapshot</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.integration</groupId>
|
||||
<artifactId>spring-integration-bom</artifactId>
|
||||
<version>5.0.0.BUILD-SNAPSHOT</version>
|
||||
<scope>import</scope>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-framework-bom</artifactId>
|
||||
<version>5.0.0.BUILD-SNAPSHOT</version>
|
||||
<scope>import</scope>
|
||||
<type>pom</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
</project>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
* Copyright 2002-2017 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.
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.samples.ftp;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
@@ -44,8 +45,8 @@ public class FtpInboundChannelAdapterSample {
|
||||
|
||||
PollableChannel ftpChannel = ctx.getBean("ftpChannel", PollableChannel.class);
|
||||
|
||||
Message<?> message1 = ftpChannel.receive(2000);
|
||||
Message<?> message2 = ftpChannel.receive(2000);
|
||||
Message<?> message1 = ftpChannel.receive(10000);
|
||||
Message<?> message2 = ftpChannel.receive(10000);
|
||||
Message<?> message3 = ftpChannel.receive(1000);
|
||||
|
||||
LOGGER.info(String.format("Received first file message: %s.", message1));
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
* Copyright 2002-2017 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.
|
||||
@@ -13,6 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.integration.samples.ftp;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
@@ -76,7 +77,7 @@ public class FtpOutboundChannelAdapterSample {
|
||||
assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "a.txt").exists());
|
||||
assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "b.txt").exists());
|
||||
|
||||
LOGGER.info("Successfully transfered file 'a.txt' and 'b.txt' to a remote FTP location.");
|
||||
LOGGER.info("Successfully transferred file 'a.txt' and 'b.txt' to a remote FTP location.");
|
||||
ctx.close();
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ public class TestSuite {
|
||||
ListenerFactory factory = new ListenerFactory();
|
||||
|
||||
factory.setPort(availableServerSocket);
|
||||
|
||||
factory.setIdleTimeout(600);
|
||||
serverFactory.addListener("default", factory.createListener());
|
||||
|
||||
server = serverFactory.createServer();
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
expression="payload"
|
||||
reply-channel="toSplitter">
|
||||
<int-ftp:request-handler-advice-chain>
|
||||
<int:retry-advice />
|
||||
<int:retry-advice/>
|
||||
</int-ftp:request-handler-advice-chain>
|
||||
</int-ftp:outbound-gateway>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user