Author: pmouawad
Date: Thu Oct 13 17:23:58 2011
New Revision: 1182997
URL: http://svn.apache.org/viewvc?rev=1182997&view=rev
Log:
Bug 51876 - Functionnality to search in Samplers TreeView
Implemented search in AbstractTestElement and refactored already implemented
subclasses to use ancestor method.
Added search features on additionnal configuration elements to:
- BeanShellTestElement
- AbstractScopedElement
- CSVDataSet
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
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/control/TransactionController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=1182997&r1=1182996&r2=1182997&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
Thu Oct 13 17:23:58 2011
@@ -256,4 +256,17 @@ public class CSVDataSet extends ConfigTe
this.shareMode = value;
}
+ /**
+ * {@inheritDoc}}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ if(super.searchContent(textToSearch)) {
+ return true;
+ }
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getPropertyAsString("variableNames"),
searchedTextLowerCase)) {
+ return true;
+ }
+ return false;
+ }
}
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=1182997&r1=1182996&r2=1182997&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
Thu Oct 13 17:23:58 2011
@@ -18,7 +18,6 @@
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;
@@ -31,7 +30,7 @@ import org.apache.jorphan.util.JMeterExc
import org.apache.log.Logger;
public class BeanShellPostProcessor extends BeanShellTestElement
- implements Cloneable, PostProcessor, TestBean, Searchable
+ implements Cloneable, PostProcessor, TestBean
{
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -66,18 +65,4 @@ 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=1182997&r1=1182996&r2=1182997&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
Thu Oct 13 17:23:58 2011
@@ -23,7 +23,6 @@ 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;
@@ -43,7 +42,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, Searchable {
+public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
private static final long serialVersionUID = 240L;
@@ -459,13 +458,10 @@ public class RegexExtractor extends Abst
* {@inheritDoc}
*/
public boolean searchContent(String textToSearch) throws Exception {
- String searchedTextLowerCase = textToSearch.toLowerCase();
- if(testField(getComment(), searchedTextLowerCase)) {
- return true;
- }
- if(testField(getVariableName(), searchedTextLowerCase)) {
+ if(super.searchContent(textToSearch)) {
return true;
}
+ String searchedTextLowerCase = textToSearch.toLowerCase();
if(testField(getRefName(), searchedTextLowerCase)) {
return true;
}
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=1182997&r1=1182996&r2=1182997&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
Thu Oct 13 17:23:58 2011
@@ -34,7 +34,6 @@ 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;
@@ -80,7 +79,7 @@ import org.xml.sax.SAXException;
* See Bugzilla: 37183
*/
public class XPathExtractor extends AbstractScopedTestElement implements
- PostProcessor, Serializable, Searchable {
+ PostProcessor, Serializable {
private static final Logger log = LoggingManager.getLoggerForClass();
private static final long serialVersionUID = 240L;
@@ -393,13 +392,10 @@ public class XPathExtractor extends Abst
* {@inheritDoc}
*/
public boolean searchContent(String textToSearch) throws Exception {
- String searchedTextLowerCase = textToSearch.toLowerCase();
- if(testField(getComment(), searchedTextLowerCase)) {
- return true;
- }
- if(testField(getVariableName(), searchedTextLowerCase)) {
+ if(super.searchContent(textToSearch)) {
return true;
}
+ String searchedTextLowerCase = textToSearch.toLowerCase();
if(testField(getRefName(), searchedTextLowerCase)) {
return true;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=1182997&r1=1182996&r2=1182997&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Thu Oct 13 17:23:58 2011
@@ -20,7 +20,6 @@ package org.apache.jmeter.control;
import java.io.Serializable;
-import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleListener;
import org.apache.jmeter.samplers.SampleResult;
@@ -42,7 +41,7 @@ import org.apache.log.Logger;
* - generate parent sampler containing the nested samples
*
*/
-public class TransactionController extends GenericController implements
SampleListener, Controller, Serializable, Searchable {
+public class TransactionController extends GenericController implements
SampleListener, Controller, Serializable {
private static final long serialVersionUID = 233L;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -252,18 +251,4 @@ public class TransactionController exten
public boolean isIncludeTimers() {
return getPropertyAsBoolean(INCLUDE_TIMERS, true);
}
-
- /**
- * {@inheritDoc}
- */
- public boolean searchContent(String textToSearch) throws Exception {
- String searchedTextLowerCase = textToSearch.toLowerCase();
- if(testField(getComment(), searchedTextLowerCase)) {
- return true;
- }
- if(testField(getName(), searchedTextLowerCase)) {
- return true;
- }
- return false;
- }
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1182997&r1=1182996&r2=1182997&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Thu Oct 13 17:23:58 2011
@@ -46,7 +46,7 @@ public class JMeterTreeNode extends Defa
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final int TEST_PLAN_LEVEL = 2;
+ private static final int TEST_PLAN_LEVEL = 1;
private final JMeterTreeModel treeModel;
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=1182997&r1=1182996&r2=1182997&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
Thu Oct 13 17:23:58 2011
@@ -156,4 +156,18 @@ public abstract class AbstractScopedTest
}
return sampleList;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ if(super.searchContent(textToSearch)) {
+ return true;
+ }
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getVariableName(), 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=1182997&r1=1182996&r2=1182997&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
Thu Oct 13 17:23:58 2011
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
+import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.IntegerProperty;
@@ -45,7 +46,7 @@ import org.apache.log.Logger;
/**
*/
-public abstract class AbstractTestElement implements TestElement, Serializable
{
+public abstract class AbstractTestElement implements TestElement,
Serializable, Searchable {
private static final long serialVersionUID = 240L;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -524,10 +525,24 @@ public abstract class AbstractTestElemen
}
/**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getComment(), searchedTextLowerCase)) {
+ return true;
+ }
+ if(testField(getName(), searchedTextLowerCase)) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Returns true if searchedTextLowerCase is in value
* @param value
* @param searchedTextLowerCase
- * @return true if searchedTextLowerCase is in value
+ * @return
*/
protected boolean testField(String value, String searchedTextLowerCase) {
if(!StringUtils.isEmpty(value)) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java?rev=1182997&r1=1182996&r2=1182997&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
Thu Oct 13 17:23:58 2011
@@ -279,4 +279,18 @@ public abstract class BeanShellTestEleme
public void setResetInterpreter(boolean b) {
resetInterpreter = b;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean searchContent(String textToSearch) throws Exception {
+ if(super.searchContent(textToSearch)) {
+ return true;
+ }
+ String searchedTextLowerCase = textToSearch.toLowerCase();
+ if(testField(getScript(), searchedTextLowerCase)) {
+ return true;
+ }
+ 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=1182997&r1=1182996&r2=1182997&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
Thu Oct 13 17:23:58 2011
@@ -43,7 +43,6 @@ import java.util.concurrent.TimeoutExcep
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.engine.event.LoopIterationEvent;
-import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.protocol.http.control.AuthManager;
import org.apache.jmeter.protocol.http.control.CacheManager;
import org.apache.jmeter.protocol.http.control.CookieManager;
@@ -83,7 +82,7 @@ import org.apache.oro.text.regex.Perl5Ma
*
*/
public abstract class HTTPSamplerBase extends AbstractSampler
- implements TestListener, ThreadListener, HTTPConstantsInterface,
Searchable {
+ implements TestListener, ThreadListener, HTTPConstantsInterface {
private static final long serialVersionUID = 240L;
@@ -1700,6 +1699,9 @@ public abstract class HTTPSamplerBase ex
* {@inheritDoc}
*/
public boolean searchContent(String textToSearch) throws Exception {
+ if(super.searchContent(textToSearch)) {
+ return true;
+ }
String searchedTextLowerCase = textToSearch.toLowerCase();
if(testField(getUrl().toString(), searchedTextLowerCase)) {
return true;
@@ -1716,9 +1718,6 @@ public abstract class HTTPSamplerBase ex
}
}
}
- if(testField(getComment(), searchedTextLowerCase)) {
- return true;
- }
return false;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
