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 2012/04/07 21:23:03 UTC
svn commit: r1310828 -
/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Author: pmouawad
Date: Sat Apr 7 19:23:02 2012
New Revision: 1310828
URL: http://svn.apache.org/viewvc?rev=1310828&view=rev
Log:
Bug 53042 - Introduce a new Interface to be implemented by AbstractSampler to allow Sampler to decide wether a config element applies to Sampler
Make FTP Sampler only merge 3 config elements
Modified:
jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Modified: jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java?rev=1310828&r1=1310827&r2=1310828&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java (original)
+++ jmeter/trunk/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java Sat Apr 7 19:23:02 2012
@@ -28,6 +28,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.NullOutputStream;
@@ -40,6 +43,7 @@ import org.apache.jmeter.samplers.Abstra
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.Interruptible;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.testelement.TestElement;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -48,10 +52,17 @@ import org.apache.log.Logger;
*
*/
public class FTPSampler extends AbstractSampler implements Interruptible {
+
private static final long serialVersionUID = 240L;
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+ Arrays.asList(new String[]{
+ "org.apache.jmeter.config.gui.LoginConfigGui",
+ "org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui",
+ "org.apache.jmeter.config.gui.SimpleConfigGui"}));
+
public final static String SERVER = "FTPSampler.server"; // $NON-NLS-1$
public final static String PORT = "FTPSampler.port"; // $NON-NLS-1$
@@ -294,4 +305,12 @@ public class FTPSampler extends Abstract
}
return client != null;
}
+
+ /**
+ * @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
+ */
+ public boolean applies(ConfigTestElement configElement) {
+ String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
+ return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
+ }
}