[camel] 01/02: CAMEL-13853: fix tests

[janbednar]

This is an automated email from the ASF dual-hosted git repository.

janbednar pushed a commit to branch CAMEL-13853
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 43b594c319db44bd688ea08b8d35bc083076195a
Author: Jan Bednář <m...@janbednar.eu>
AuthorDate: Sat Aug 17 13:51:38 2019 +0200

    CAMEL-13853: fix tests
---
 .../file/remote/BaseServerTestSupport.java         | 13 ++++++++----
 .../file/remote/FtpServerTestSupport.java          | 24 ++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
index cfb6525..2043b93 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/BaseServerTestSupport.java
@@ -23,11 +23,16 @@ import org.junit.Before;
 public class BaseServerTestSupport extends CamelTestSupport {
     protected int port;
 
+    private boolean portInitialized = false;
+
     @Before
-    @Override
-    public void setUp() throws Exception {
-        port = AvailablePortFinder.getNextAvailable();
-        super.setUp();
+    public void initPort() throws Exception {
+        if (!portInitialized) {
+            // call only once per test method (Some tests can call this method 
manually in setUp method,
+            // which is called before this if setUp method is overridden)
+            port = AvailablePortFinder.getNextAvailable();
+            portInitialized = true;
+        }
     }
 
     protected int getPort() {
diff --git 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
index 2fd2c30..c7006bf 100644
--- 
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
+++ 
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
@@ -52,6 +52,15 @@ public abstract class FtpServerTestSupport extends 
BaseServerTestSupport {
         deleteDirectory(FTP_ROOT_DIR);
 
         canTest = false;
+        initPort();
+        FtpServerFactory factory = createFtpServerFactory();
+        if (factory != null) {
+            ftpServer = factory.createServer();
+            if (ftpServer != null) {
+                ftpServer.start();
+                canTest = true;
+            }
+        }
 
         try {
             super.setUp();
@@ -69,17 +78,6 @@ public abstract class FtpServerTestSupport extends 
BaseServerTestSupport {
                 throw e;
             }
         }
-
-        FtpServerFactory factory = createFtpServerFactory();
-        if (factory != null) {
-            ftpServer = factory.createServer();
-            if (ftpServer != null) {
-                ftpServer.start();
-                canTest = true;
-            }
-        }
-
-
     }
 
     @Override
@@ -115,10 +113,10 @@ public abstract class FtpServerTestSupport extends 
BaseServerTestSupport {
         pumf.setPasswordEncryptor(new ClearTextPasswordEncryptor());
         pumf.setFile(USERS_FILE);
         UserManager userMgr = pumf.createUserManager();
-        
+
         ListenerFactory factory = new ListenerFactory();
         factory.setPort(getPort());
-        
+
         FtpServerFactory serverFactory = new FtpServerFactory();
         serverFactory.setUserManager(userMgr);
         serverFactory.setFileSystem(fsf);