Repository: camel Updated Branches: refs/heads/camel-2.12.x 1a239078b -> bc3bf37c6
CAMEL-7930 Reenable the test of SpringFtpEndpointTest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc3bf37c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc3bf37c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc3bf37c Branch: refs/heads/camel-2.12.x Commit: bc3bf37c6898b6ff2313b8eaf536e43f14676c62 Parents: 1a23907 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon Oct 20 09:42:37 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon Oct 20 09:42:37 2014 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bc3bf37c/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java index 251a58b..76636b9 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/SpringFtpEndpointTest.java @@ -33,7 +33,6 @@ import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; @@ -43,12 +42,11 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; * Unit testing FTP configured using spring bean */ @ContextConfiguration -@Ignore public class SpringFtpEndpointTest extends AbstractJUnit4SpringContextTests { private static int ftpPort = AvailablePortFinder.getNextAvailable(20125); static { //set them as system properties so Spring can use the property placeholder - //things to set them into the URL's in the spring contexts + //things to set them into the URL's in the spring contexts System.setProperty("SpringFtpEndpointTest.ftpPort", Integer.toString(ftpPort)); } protected FtpServer ftpServer; @@ -102,4 +100,4 @@ public class SpringFtpEndpointTest extends AbstractJUnit4SpringContextTests { ftpServer = serverFactory.createServer(); } -} \ No newline at end of file +}
