jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1407693 - in /jmeter/trunk: src/components/org/apache/jmeter/config/ src/components/org/apache/jmeter/extractor/ src/core/org/apache/jmeter/testelement/ src/core/org/apache/jmeter/util/ src/protocol/http/org/apache/jmeter/protocol/http/sam...
Date Fri, 09 Nov 2012 23:39:04 GMT
Author: pmouawad
Date: Fri Nov  9 23:39:03 2012
New Revision: 1407693

URL: http://svn.apache.org/viewvc?rev=1407693&view=rev
Log:
Bug 54129 - Search Feature does not find text although existing in elements 
Bugzilla Id: 54129

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
    jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
    jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
    jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java Fri Nov  9 23:39:03
2012
@@ -19,7 +19,6 @@
 package org.apache.jmeter.config;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
@@ -252,14 +251,4 @@ public class CSVDataSet extends ConfigTe
     public void setShareMode(String value) {
         this.shareMode = value;
     }
-    
-    /** 
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getPropertyAsString("variableNames"));
-        return result;
-    }
 }

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Fri Nov  9
23:39:03 2012
@@ -453,16 +453,4 @@ public class RegexExtractor extends Abst
     public void setUseField(String actionCommand) {
         setProperty(MATCH_AGAINST,actionCommand);
     }
-    
-    /** 
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getRefName());
-        result.add(getDefaultValue());
-        result.add(getRegex());
-        return result;
-    }
 }

Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Fri Nov  9
23:39:03 2012
@@ -332,16 +332,4 @@ public class XPathExtractor extends Abst
     public boolean isDownloadDTDs() {
         return getPropertyAsBoolean(DOWNLOAD_DTDS, false);
     }
-    
-    /** 
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getRefName());
-        result.add(getDefaultValue());
-        result.add(getXPathQuery());
-        return result;
-    }
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java Fri
Nov  9 23:39:03 2012
@@ -156,14 +156,4 @@ public abstract class AbstractScopedTest
         }
         return sampleList;
     }
-    
-    /** 
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getVariableName());
-        return result;
-    }
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Fri Nov 
9 23:39:03 2012
@@ -563,9 +563,13 @@ public abstract class AbstractTestElemen
      * {@inheritDoc}}
      */
     public List<String> getSearchableTokens() throws Exception {
-        List<String> result = new ArrayList<String>(2);
-        result.add(getComment());
-        result.add(getName());
+        List<String> result = new ArrayList<String>(25);
+        PropertyIterator iterator = propertyIterator();
+        while(iterator.hasNext()) {
+            JMeterProperty jMeterProperty = iterator.next();    
+            result.add(jMeterProperty.getName());
+            result.add(jMeterProperty.getStringValue());
+        }
         return result;
     }
     

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java Fri Nov  9 23:39:03
2012
@@ -273,14 +273,4 @@ public abstract class BeanShellTestEleme
     public void setResetInterpreter(boolean b) {
         resetInterpreter = b;
     }
-    
-    /** 
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getScript());
-        return result;
-    }
 }

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Fri Nov  9 23:39:03 2012
@@ -1859,26 +1859,6 @@ public abstract class HTTPSamplerBase ex
         }
     }
     
-    
-    /** 
-     * We search in URL and arguments
-     * {@inheritDoc}}
-     */
-    @Override
-    public List<String> getSearchableTokens() throws Exception {
-        List<String> result = super.getSearchableTokens();
-        result.add(getUrl().toExternalForm());
-        Arguments arguments = getArguments();
-        if(arguments != null) {
-            for (int i = 0; i < arguments.getArgumentCount(); i++) {
-                Argument argument = arguments.getArgument(i);
-                result.add(argument.getName());
-                result.add(argument.getValue());
-            }
-        }
-        return result;
-    }
-    
     /**
      * @see org.apache.jmeter.samplers.AbstractSampler#applies(org.apache.jmeter.config.ConfigTestElement)
      */

Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
(original)
+++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
Fri Nov  9 23:39:03 2012
@@ -561,25 +561,6 @@ public abstract class AbstractJDBCTestEl
         this.resultVariable = resultVariable;
     }    
 
-    /** 
-     * {@inheritDoc}}
-	 */
-	@Override
-	public List<String> getSearchableTokens() throws Exception {
-		List<String> result = super.getSearchableTokens();
-		Set<String> properties = new HashSet<String>();
-		properties.addAll(Arrays.asList(new String[]{
-			"dataSource",
-			"query",
-			"queryArguments",
-			"queryArgumentsTypes",
-			"queryType",
-			"resultVariable",
-			"variableNames"
-		}));
-		addPropertiesValues(result, properties);
-        return result;
-	}
 
 	/** 
 	 * {@inheritDoc}

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1407693&r1=1407692&r2=1407693&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Nov  9 23:39:03 2012
@@ -135,6 +135,7 @@ and right angle bracket (&gt;) in search
 <ul>
 <li><bugzilla>53975</bugzilla> - Variables replacement doesn't work with
option "Delay thread creation until needed"</li>
 <li><bugzilla>54055</bugzilla> - View Results tree: = signs are stripped
from parameter values at HTTP tab</li>
+<li><bugzilla>54129</bugzilla> - Search Feature does not find text although
existing in elements </li>
 </ul>
 
 <!-- =================== Improvements =================== -->



Mime
View raw message