Author: pmouawad
Date: Tue Oct 11 20:01:55 2011
New Revision: 1182059
URL: http://svn.apache.org/viewvc?rev=1182059&view=rev
Log:
Bug 51876 - Functionnality to search in Samplers TreeView
Factored in AbstractTestElement method testField.
Implemented search for BeanShellPostProcessor, RegexExtractor, XPathExtractor
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=1182059&r1=1182058&r2=1182059&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
Tue Oct 11 20:01:55 2011
@@ -18,6 +18,7 @@
package org.apache.jmeter.extractor;
+import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testbeans.TestBean;
@@ -30,7 +31,7 @@ import org.apache.jorphan.util.JMeterExc
import org.apache.log.Logger;
public class BeanShellPostProcessor extends BeanShellTestElement
- implements Cloneable, PostProcessor, TestBean
+ implements Cloneable, PostProcessor, TestBean, Searchable
{
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -65,4 +66,18 @@ public class BeanShellPostProcessor exte
log.warn("Problem in BeanShell script "+e);
}
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getComment(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getScript(), searchedTextLowerCase)) {
+ return true;
+ }
+ return false;
+ }
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1182059&r1=1182058&r2=1182059&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Tue Oct 11 20:01:55 2011
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -42,7 +43,7 @@ import org.apache.oro.text.regex.Perl5Ma
// @see org.apache.jmeter.extractor.TestRegexExtractor for unit tests
-public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
+public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable, Searchable {
private static final long serialVersionUID = 240L;
@@ -453,4 +454,27 @@ public class RegexExtractor extends Abst
public void setUseField(String actionCommand) {
setProperty(MATCH_AGAINST,actionCommand);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getComment(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getVariableName(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getRefName(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getDefaultValue(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getRegex(), searchedTextLowerCase)) {
+ return true;
+ }
+ return false;
+ }
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1182059&r1=1182058&r2=1182059&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Tue Oct 11 20:01:55 2011
@@ -34,6 +34,7 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import org.apache.jmeter.assertions.AssertionResult;
+import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractScopedTestElement;
@@ -79,7 +80,7 @@ import org.xml.sax.SAXException;
* See Bugzilla: 37183
*/
public class XPathExtractor extends AbstractScopedTestElement implements
- PostProcessor, Serializable {
+ PostProcessor, Serializable, Searchable {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final long serialVersionUID = 240L;
@@ -387,4 +388,27 @@ public class XPathExtractor extends Abst
}
return sw.toString();
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getComment(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getVariableName(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getRefName(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getDefaultValue(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getXPathQuery(), searchedTextLowerCase)) {
+ return true;
+ }
+ return false;
+ }
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1182059&r1=1182058&r2=1182059&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Tue Oct 11 20:01:55 2011
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
@@ -521,4 +522,17 @@ public abstract class AbstractTestElemen
public boolean isEnabled() {
return getProperty(TestElement.ENABLED) instanceof NullProperty ||
getPropertyAsBoolean(TestElement.ENABLED);
}
+
+ /**
+ * Returns true if searchedTextLowerCase is in value
+ * @param value
+ * @param searchedTextLowerCase
+ * @return
+ */
+ protected boolean testField(String value, String searchedTextLowerCase) {
+ if(!StringUtils.isEmpty(value)) {
+ return value.toLowerCase().indexOf(searchedTextLowerCase)>=0;
+ }
+ return false;
+ }
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1182059&r1=1182058&r2=1182059&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Tue Oct 11 20:01:55 2011
@@ -40,7 +40,6 @@ import java.util.concurrent.ThreadPoolEx
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.commons.lang.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.engine.event.LoopIterationEvent;
@@ -1722,18 +1721,5 @@ public abstract class HTTPSamplerBase ex
}
return false;
}
-
- /**
- * Returns true if searchedTextLowerCase is in value
- * @param value
- * @param searchedTextLowerCase
- * @return
- */
- private boolean testField(String value, String searchedTextLowerCase) {
- if(!StringUtils.isEmpty(value)) {
- return value.toLowerCase().indexOf(searchedTextLowerCase)>=0;
- }
- return false;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
