You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/10/22 21:06:58 UTC
svn commit: r1812953 - in /jmeter/trunk: bin/testfiles/FTP_TESTS.csv
bin/testfiles/FTP_TESTS.jmx bin/testfiles/FTP_TESTS.xml build.properties
build.xml test/src/org/apache/jmeter/JMeterVersionTest.java
Author: pmouawad
Date: Sun Oct 22 21:06:58 2017
New Revision: 1812953
URL: http://svn.apache.org/viewvc?rev=1812953&view=rev
Log:
Bug 61642 - Improve FTP test coverage
Bugzilla Id: 61642
Added:
jmeter/trunk/bin/testfiles/FTP_TESTS.csv
jmeter/trunk/bin/testfiles/FTP_TESTS.jmx (with props)
jmeter/trunk/bin/testfiles/FTP_TESTS.xml (with props)
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
Added: jmeter/trunk/bin/testfiles/FTP_TESTS.csv
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/FTP_TESTS.csv?rev=1812953&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/FTP_TESTS.csv (added)
+++ jmeter/trunk/bin/testfiles/FTP_TESTS.csv Sun Oct 22 21:06:58 2017
@@ -0,0 +1,7 @@
+label,responseCode,responseMessage,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount
+BSS_startFtpServer,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0
+FTP Request-get-binary,200,OK,TG-FTP 1-1,,true,1,1,1,0
+FTP Request-get-text,200,OK,TG-FTP 1-1,text,true,1,1,1,0
+FTP Request-put-text,200,OK,TG-FTP 1-1,,true,1,1,1,0
+FTP Request-check-upload,200,OK,TG-FTP 1-1,text,true,1,1,1,0
+BSS_stopFtpServer,200,OK,tearDown Thread Group 1-1,text,true,1,1,1,0
Added: jmeter/trunk/bin/testfiles/FTP_TESTS.jmx
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/FTP_TESTS.jmx?rev=1812953&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/FTP_TESTS.jmx (added)
+++ jmeter/trunk/bin/testfiles/FTP_TESTS.jmx Sun Oct 22 21:06:58 2017
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="3.4" jmeter="3.4-SNAPSHOT.20171022">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Test Plan" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">true</boolProp>
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath"></stringProp>
+ <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>
+ </TestPlan>
+ <hashTree>
+ <Arguments guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="login" elementType="Argument">
+ <stringProp name="Argument.name">login</stringProp>
+ <stringProp name="Argument.value">admin</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="password" elementType="Argument">
+ <stringProp name="Argument.name">password</stringProp>
+ <stringProp name="Argument.value">password1234</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="port" elementType="Argument">
+ <stringProp name="Argument.name">port</stringProp>
+ <stringProp name="Argument.value">2222</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </Arguments>
+ <hashTree/>
+ <ConfigTestElement guiclass="FtpConfigGui" testclass="ConfigTestElement" testname="FTP Request Defaults" enabled="true">
+ <stringProp name="FTPSampler.server">localhost</stringProp>
+ <stringProp name="FTPSampler.port">2222</stringProp>
+ <stringProp name="FTPSampler.filename"></stringProp>
+ <stringProp name="FTPSampler.localfilename"></stringProp>
+ <stringProp name="FTPSampler.inputdata"></stringProp>
+ <boolProp name="FTPSampler.binarymode">false</boolProp>
+ <boolProp name="FTPSampler.saveresponse">false</boolProp>
+ <boolProp name="FTPSampler.upload">false</boolProp>
+ </ConfigTestElement>
+ <hashTree/>
+ <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" testname="setUp Thread Group" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">stoptest</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+ <stringProp name="LoopController.loops">1</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </SetupThreadGroup>
+ <hashTree>
+ <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BSS_startFtpServer" enabled="true">
+ <stringProp name="BeanShellSampler.query">import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.FtpServerFactory;
+import org.apache.ftpserver.ftplet.FtpException;
+import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.listener.ListenerFactory;
+import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
+import org.apache.ftpserver.usermanager.impl.BaseUser;
+import org.apache.ftpserver.usermanager.impl.WritePermission;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.ftpserver.ftplet.Authority;
+import java.util.List;
+import java.util.ArrayList;
+import org.apache.commons.io.FileUtils;
+
+
+FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), "bin/ftp_test"));
+new File(JMeterUtils.getJMeterHome(), "bin/ftp_test").mkdir();
+
+PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
+UserManager userManager = userManagerFactory.createUserManager();
+BaseUser user = new BaseUser();
+user.setName(vars.get("login"));
+user.setPassword(vars.get("password"));
+List authorities = new ArrayList();
+authorities.add(new WritePermission());
+user.setAuthorities(authorities);
+user.setHomeDirectory(new File(JMeterUtils.getJMeterHome(), "bin").getAbsolutePath());
+userManager.save(user);
+ListenerFactory listenerFactory = new ListenerFactory();
+listenerFactory.setPort(Integer.parseInt(vars.get("port")));
+
+FtpServerFactory factory = new FtpServerFactory();
+factory.setUserManager(userManager);
+factory.addListener("default", listenerFactory.createListener());
+
+FtpServer server = factory.createServer();
+server.start();
+
+bsh.shared.myMap = new HashMap();
+bsh.shared.myMap.put("FTP_SERVER", server);
+</stringProp>
+ <stringProp name="BeanShellSampler.filename"></stringProp>
+ <stringProp name="BeanShellSampler.parameters"></stringProp>
+ <boolProp name="BeanShellSampler.resetInterpreter">true</boolProp>
+ </BeanShellSampler>
+ <hashTree/>
+ <TestAction guiclass="TestActionGui" testclass="TestAction" testname="Think Time" enabled="true">
+ <intProp name="ActionProcessor.action">1</intProp>
+ <intProp name="ActionProcessor.target">0</intProp>
+ <stringProp name="ActionProcessor.duration">0</stringProp>
+ </TestAction>
+ <hashTree>
+ <UniformRandomTimer guiclass="UniformRandomTimerGui" testclass="UniformRandomTimer" testname="Pause" enabled="true">
+ <stringProp name="ConstantTimer.delay">1000</stringProp>
+ <stringProp name="RandomTimer.range">100</stringProp>
+ </UniformRandomTimer>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="TG-FTP" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+ <stringProp name="LoopController.loops">1</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-get-binary" enabled="true">
+ <stringProp name="FTPSampler.server"></stringProp>
+ <stringProp name="FTPSampler.port"></stringProp>
+ <stringProp name="FTPSampler.filename">jmeter.properties</stringProp>
+ <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-binary.properties</stringProp>
+ <stringProp name="FTPSampler.inputdata"></stringProp>
+ <boolProp name="FTPSampler.binarymode">true</boolProp>
+ <boolProp name="FTPSampler.saveresponse">true</boolProp>
+ <boolProp name="FTPSampler.upload">false</boolProp>
+ <stringProp name="ConfigTestElement.username">${login}</stringProp>
+ <stringProp name="ConfigTestElement.password">${password}</stringProp>
+ </FTPSampler>
+ <hashTree>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+ <collectionProp name="Asserion.test_strings">
+ <stringProp name="-897552584">Apache JMeter Property file</stringProp>
+ </collectionProp>
+ <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <boolProp name="Assertion.assume_success">false</boolProp>
+ <intProp name="Assertion.test_type">16</intProp>
+ </ResponseAssertion>
+ <hashTree/>
+ </hashTree>
+ <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-get-text" enabled="true">
+ <stringProp name="FTPSampler.server"></stringProp>
+ <stringProp name="FTPSampler.port"></stringProp>
+ <stringProp name="FTPSampler.filename">jmeter.properties</stringProp>
+ <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
+ <stringProp name="FTPSampler.inputdata"></stringProp>
+ <boolProp name="FTPSampler.binarymode">false</boolProp>
+ <boolProp name="FTPSampler.saveresponse">true</boolProp>
+ <boolProp name="FTPSampler.upload">false</boolProp>
+ <stringProp name="ConfigTestElement.username">${login}</stringProp>
+ <stringProp name="ConfigTestElement.password">${password}</stringProp>
+ </FTPSampler>
+ <hashTree>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+ <collectionProp name="Asserion.test_strings">
+ <stringProp name="-897552584">Apache JMeter Property file</stringProp>
+ </collectionProp>
+ <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <boolProp name="Assertion.assume_success">false</boolProp>
+ <intProp name="Assertion.test_type">16</intProp>
+ </ResponseAssertion>
+ <hashTree/>
+ </hashTree>
+ <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-put-text" enabled="true">
+ <stringProp name="FTPSampler.server"></stringProp>
+ <stringProp name="FTPSampler.port"></stringProp>
+ <stringProp name="FTPSampler.filename">ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
+ <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii.properties</stringProp>
+ <stringProp name="FTPSampler.inputdata"></stringProp>
+ <boolProp name="FTPSampler.binarymode">false</boolProp>
+ <boolProp name="FTPSampler.saveresponse">true</boolProp>
+ <boolProp name="FTPSampler.upload">true</boolProp>
+ <stringProp name="ConfigTestElement.username">${login}</stringProp>
+ <stringProp name="ConfigTestElement.password">${password}</stringProp>
+ </FTPSampler>
+ <hashTree/>
+ <FTPSampler guiclass="FtpTestSamplerGui" testclass="FTPSampler" testname="FTP Request-check-upload" enabled="true">
+ <stringProp name="FTPSampler.server"></stringProp>
+ <stringProp name="FTPSampler.port"></stringProp>
+ <stringProp name="FTPSampler.filename">ftp_test/jmeter-from-ftp-ascii-write.properties</stringProp>
+ <stringProp name="FTPSampler.localfilename">ftp_test/jmeter-from-ftp-ascii-write-tocheck.properties</stringProp>
+ <stringProp name="FTPSampler.inputdata"></stringProp>
+ <boolProp name="FTPSampler.binarymode">false</boolProp>
+ <boolProp name="FTPSampler.saveresponse">true</boolProp>
+ <boolProp name="FTPSampler.upload">false</boolProp>
+ <stringProp name="ConfigTestElement.username">${login}</stringProp>
+ <stringProp name="ConfigTestElement.password">${password}</stringProp>
+ </FTPSampler>
+ <hashTree>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+ <collectionProp name="Asserion.test_strings">
+ <stringProp name="-897552584">Apache JMeter Property file</stringProp>
+ </collectionProp>
+ <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <boolProp name="Assertion.assume_success">false</boolProp>
+ <intProp name="Assertion.test_type">16</intProp>
+ </ResponseAssertion>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" testname="tearDown Thread Group" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+ <stringProp name="LoopController.loops">1</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </PostThreadGroup>
+ <hashTree>
+ <BeanShellSampler guiclass="BeanShellSamplerGui" testclass="BeanShellSampler" testname="BSS_stopFtpServer" enabled="true">
+ <stringProp name="BeanShellSampler.query">import org.apache.ftpserver.FtpServer;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FileUtils;
+
+
+FileUtils.deleteDirectory(new File(JMeterUtils.getJMeterHome(), "bin/ftp_test"));
+
+FtpServer server = bsh.shared.myMap.get("FTP_SERVER");
+server.stop();
+
+</stringProp>
+ <stringProp name="BeanShellSampler.filename"></stringProp>
+ <stringProp name="BeanShellSampler.parameters"></stringProp>
+ <boolProp name="BeanShellSampler.resetInterpreter">false</boolProp>
+ </BeanShellSampler>
+ <hashTree/>
+ </hashTree>
+ <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>false</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">FTP_TESTS.csv</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" testname="Simple Data Writer" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">FTP_TESTS.xml</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ <WorkBench guiclass="WorkBenchGui" testclass="WorkBench" testname="WorkBench" enabled="true">
+ <boolProp name="WorkBench.save">true</boolProp>
+ </WorkBench>
+ <hashTree>
+ <ConfigTestElement guiclass="PropertyControlGui" testclass="ConfigTestElement" testname="Property Display" enabled="true"/>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>
Propchange: jmeter/trunk/bin/testfiles/FTP_TESTS.jmx
------------------------------------------------------------------------------
svn:eol-style = LF
Added: jmeter/trunk/bin/testfiles/FTP_TESTS.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/FTP_TESTS.xml?rev=1812953&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/FTP_TESTS.xml (added)
+++ jmeter/trunk/bin/testfiles/FTP_TESTS.xml Sun Oct 22 21:06:58 2017
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testResults version="1.2">
+<sample s="true" lb="BSS_startFtpServer" rc="200" rm="OK" tn="setUp Thread Group 1-1" dt="text" sc="1" ec="0" ng="1" na="1"/>
+<sample s="true" lb="FTP Request-get-binary" rc="200" rm="OK" tn="TG-FTP 1-1" dt="" sc="1" ec="0" ng="1" na="1">
+ <assertionResult>
+ <name>Response Assertion</name>
+ <failure>false</failure>
+ <error>false</error>
+ </assertionResult>
+</sample>
+<sample s="true" lb="FTP Request-get-text" rc="200" rm="OK" tn="TG-FTP 1-1" dt="text" sc="1" ec="0" ng="1" na="1">
+ <assertionResult>
+ <name>Response Assertion</name>
+ <failure>false</failure>
+ <error>false</error>
+ </assertionResult>
+</sample>
+<sample s="true" lb="FTP Request-put-text" rc="200" rm="OK" tn="TG-FTP 1-1" dt="" sc="1" ec="0" ng="1" na="1"/>
+<sample s="true" lb="FTP Request-check-upload" rc="200" rm="OK" tn="TG-FTP 1-1" dt="text" sc="1" ec="0" ng="1" na="1">
+ <assertionResult>
+ <name>Response Assertion</name>
+ <failure>false</failure>
+ <error>false</error>
+ </assertionResult>
+</sample>
+<sample s="true" lb="BSS_stopFtpServer" rc="200" rm="OK" tn="tearDown Thread Group 1-1" dt="text" sc="1" ec="0" ng="1" na="1"/>
+
+</testResults>
Propchange: jmeter/trunk/bin/testfiles/FTP_TESTS.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/bin/testfiles/FTP_TESTS.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1812953&r1=1812952&r2=1812953&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Oct 22 21:06:58 2017
@@ -442,4 +442,20 @@ hsqldb.md5 = 72cae1d3ef
activemq-all.version = 5.15.2
activemq-all.jar = activemq-all-${activemq-all.version}.jar
activemq-all.loc = ${maven2.repo}/org/apache/activemq/activemq-all/${activemq-all.version}
-activemq-all.md5 = bd24ae082be11dc969a6e5bc45515ab7
\ No newline at end of file
+activemq-all.md5 = bd24ae082be11dc969a6e5bc45515ab7
+
+# Optional for use by FTP_TESTS.jmx
+mina-core.version = 2.0.16
+mina-core.jar = mina-core-${mina-core.version}.jar
+mina-core.loc = ${maven2.repo}/org/apache/mina/mina-core/${mina-core.version}
+mina-core.md5 = fd86528fa9d9ba8fb8c37e3ac28fa45f
+
+ftplet-api.version = 1.1.1
+ftplet-api.jar = ftplet-api-${ftplet-api.version}.jar
+ftplet-api.loc = ${maven2.repo}/org/apache/ftpserver/ftplet-api/${ftplet-api.version}
+ftplet-api.md5 = a17a7513f5a7e2cd717f7b0fbd15241a
+
+ftpserver-core.version = 1.1.1
+ftpserver-core.jar = ftpserver-core-${ftpserver-core.version}.jar
+ftpserver-core.loc = ${maven2.repo}/org/apache/ftpserver/ftpserver-core/${ftpserver-core.version}
+ftpserver-core.md5 = 62b0a623ff211013d3056dbdf26139b2
\ No newline at end of file
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1812953&r1=1812952&r2=1812953&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Oct 22 21:06:58 2017
@@ -2752,6 +2752,11 @@ run JMeter unless all the JMeter jars ar
</antcall>
<antcall target="batchtest">
+ <param name="batchtest.name" value="FTP_TESTS"/>
+ <param name="batchtest.jmx" value="FTP_TESTS.jmx"/>
+ </antcall>
+
+ <antcall target="batchtest">
<param name="batchtest.name" value="Bug60607"/>
<param name="batchtest.jmx" value="Bug60607.jmx"/>
<param name="skip.batchtest" value="${skip.bug60607}" />
@@ -3209,6 +3214,9 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="xstream"/>
<process_jarfile jarname="hsqldb" dest.dir="${lib.coverage}" />
<process_jarfile jarname="activemq-all" dest.dir="${lib.coverage}" />
+ <process_jarfile jarname="mina-core" dest.dir="${lib.coverage}" />
+ <process_jarfile jarname="ftplet-api" dest.dir="${lib.coverage}" />
+ <process_jarfile jarname="ftpserver-core" dest.dir="${lib.coverage}" />
<process_jarfile jarname="jacocoant" dest.dir="${lib.coverage}" />
<process_jarfile jarname="sonarqube-ant-task" dest.dir="${lib.coverage}" />
</target>
Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1812953&r1=1812952&r2=1812953&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sun Oct 22 21:06:58 2017
@@ -115,7 +115,8 @@ public class JMeterVersionTest extends J
propNames.remove("rat-tasks");
versions.remove("rat-tasks");
// remove optional hsqldb, jacoco and sonar jars (required for coverage reporting, not required for jmeter)
- for (String optLib : Arrays.asList("jacocoant", "sonarqube-ant-task", "hsqldb", "activemq-all")) {
+ for (String optLib : Arrays.asList("jacocoant", "sonarqube-ant-task", "hsqldb", "activemq-all",
+ "mina-core", "ftplet-api", "ftpserver-core")) {
propNames.remove(optLib);
versions.remove(optLib);
}