Author: sebb
Date: Fri Sep 23 15:30:10 2011
New Revision: 1174835

URL: http://svn.apache.org/viewvc?rev=1174835&view=rev
Log:
Bug 51885 - Allow a JMeter Variable as input to XPathExtractor

Modified:
    jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
    
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
    jakarta/jmeter/trunk/xdocs/changes.xml
    jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png?rev=1174835&r1=1174834&r2=1174835&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java?rev=1174835&r1=1174834&r2=1174835&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
 Fri Sep 23 15:30:10 2011
@@ -72,7 +72,7 @@ public class XPathExtractorGui extends A
     public void configure(TestElement el) {
         super.configure(el);
         XPathExtractor xpe = (XPathExtractor) el;
-        showScopeSettings(xpe);
+        showScopeSettings(xpe,true);
         xpathQueryField.setText(xpe.getXPathQuery());
         defaultField.setText(xpe.getDefaultValue());
         refNameField.setText(xpe.getRefName());
@@ -119,7 +119,7 @@ public class XPathExtractorGui extends A
 
         Box box = Box.createVerticalBox();
         box.add(makeTitlePanel());
-        box.add(createScopePanel());
+        box.add(createScopePanel(true));
         
xml.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
 JMeterUtils
                 .getResString("xpath_assertion_option"))); //$NON-NLS-1$
         box.add(xml);

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1174835&r1=1174834&r2=1174835&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Sep 23 15:30:10 2011
@@ -167,6 +167,7 @@ This can be overridden by setting the JM
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
+<li>Bug 51885 - Allow a JMeter Variable as input to XPathExtractor</li>
 </ul>
 
 <h3>Functions</h3>

Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png?rev=1174835&r1=1174834&r2=1174835&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1174835&r1=1174834&r2=1174835&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Sep 23 
15:30:10 2011
@@ -4502,7 +4502,7 @@ generate the template string, and store 
 </p>
 </component>
 
-<component name="XPath Extractor" index="&sect-num;.8.2"  width="612" 
height="318" screenshot="xpath_extractor.png">
+<component name="XPath Extractor" index="&sect-num;.8.2"  width="729" 
height="317" screenshot="xpath_extractor.png">
        <description>This test element allows the user to extract value(s) from 
                structured response - XML or (X)HTML - using XPath
                query language.
@@ -4516,6 +4516,7 @@ generate the template string, and store 
         <li>Main sample only - only applies to the main sample</li>
         <li>Sub-samples only - only applies to the sub-samples</li>
         <li>Main sample and sub-samples - applies to both.</li>
+        <li>JMeter Variable - assertion is to be applied to the contents of 
the named variable</li>
         </ul>
         XPath matching is applied to all qualifying samples in turn, and all 
the matching results will be returned.
        </property>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to