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:54:58 UTC
svn commit: r1310843 -
/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
Author: pmouawad
Date: Sat Apr 7 19:54:58 2012
New Revision: 1310843
URL: http://svn.apache.org/viewvc?rev=1310843&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 MailReaderSampler only merge 1 config elements
Modified:
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
Modified: jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=1310843&r1=1310842&r2=1310843&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java (original)
+++ jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java Sat Apr 7 19:54:58 2012
@@ -22,8 +22,11 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
import javax.mail.Address;
import javax.mail.BodyPart;
@@ -38,6 +41,7 @@ import javax.mail.internet.MimeMultipart
import javax.mail.internet.MimeUtility;
import org.apache.commons.io.IOUtils;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.smtp.sampler.gui.SecuritySettingsPanel;
import org.apache.jmeter.protocol.smtp.sampler.protocol.LocalTrustStoreSSLSocketFactory;
import org.apache.jmeter.protocol.smtp.sampler.protocol.TrustAllSSLSocketFactory;
@@ -46,6 +50,7 @@ import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.Interruptible;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.services.FileServer;
+import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
import org.apache.jmeter.testelement.property.StringProperty;
@@ -60,6 +65,10 @@ public class MailReaderSampler extends A
private static final long serialVersionUID = 240L;
+ private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<String>(
+ Arrays.asList(new String[]{
+ "org.apache.jmeter.config.gui.SimpleConfigGui"}));
+
//+ JMX attributes - do not change the values
private final static String SERVER_TYPE = "host_type"; // $NON-NLS-1$
private final static String SERVER = "host"; // $NON-NLS-1$
@@ -560,4 +569,13 @@ public class MailReaderSampler extends A
busy = false;
return wasbusy;
}
+
+ /**
+ * @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
+ */
+ @Override
+ public boolean applies(ConfigTestElement configElement) {
+ String guiClass = configElement.getProperty(TestElement.GUI_CLASS).getStringValue();
+ return APPLIABLE_CONFIG_CLASSES.contains(guiClass);
+ }
}