svn commit: r1812956 - /jmeter/trunk/bin/testfiles/FTP_TESTS.jmx

[pm...@apache.org]

Author: pmouawad
Date: Sun Oct 22 21:32:58 2017
New Revision: 1812956

URL: http://svn.apache.org/viewvc?rev=1812956&view=rev
Log:
Bug 61642 - Improve FTP test coverage
Fix test failure due to non declared passive port usage
Bugzilla Id: 61642

Modified:
    jmeter/trunk/bin/testfiles/FTP_TESTS.jmx

Modified: jmeter/trunk/bin/testfiles/FTP_TESTS.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/FTP_TESTS.jmx?rev=1812956&r1=1812955&r2=1812956&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/FTP_TESTS.jmx (original)
+++ jmeter/trunk/bin/testfiles/FTP_TESTS.jmx Sun Oct 22 21:32:58 2017
@@ -29,6 +29,11 @@
             <stringProp name="Argument.value">2222</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="passivePort" elementType="Argument">
+            <stringProp name="Argument.name">passivePort</stringProp>
+            <stringProp name="Argument.value">2223</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
         </collectionProp>
       </Arguments>
       <hashTree/>
@@ -70,11 +75,17 @@ import org.apache.ftpserver.ftplet.Autho
 import java.util.List;
 import java.util.ArrayList;
 import org.apache.commons.io.FileUtils;
-
+import org.apache.ftpserver.DataConnectionConfiguration;
+import org.apache.ftpserver.DataConnectionConfigurationFactory;
 
 FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin/ftp_test&quot;));
 new File(JMeterUtils.getJMeterHome(), &quot;bin/ftp_test&quot;).mkdir();
 
+DataConnectionConfigurationFactory dataConnectionConfigurationFactory = 
+	new DataConnectionConfigurationFactory();
+dataConnectionConfigurationFactory.setPassivePorts(vars.get(&quot;passivePort&quot;));	
+DataConnectionConfiguration dataConnectionConfiguration = dataConnectionConfigurationFactory.createDataConnectionConfiguration();
+
 PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
 UserManager userManager = userManagerFactory.createUserManager();
 BaseUser user = new BaseUser();
@@ -86,12 +97,13 @@ user.setAuthorities(authorities);
 user.setHomeDirectory(new File(JMeterUtils.getJMeterHome(), &quot;bin&quot;).getAbsolutePath());
 userManager.save(user);
 ListenerFactory listenerFactory = new ListenerFactory();
-listenerFactory.setPort(Integer.parseInt(vars.get(&quot;port&quot;)));
 
+listenerFactory.setDataConnectionConfiguration(dataConnectionConfiguration);
+listenerFactory.setPort(Integer.parseInt(vars.get(&quot;port&quot;)));
 FtpServerFactory factory = new FtpServerFactory();
 factory.setUserManager(userManager);
 factory.addListener(&quot;default&quot;, listenerFactory.createListener());
-         
+ 
 FtpServer server = factory.createServer();
 server.start();