View | Details | Raw Unified | Return to bug 62593
Collapse All | Expand All

(-)src/components/org/apache/jmeter/extractor/HtmlExtractor.java (-1 / +1 lines)
Lines 171-177 Link Here
171
                getExtractorImpl().extract(expression, attribute, matchNumber, inputString, result, found, "-1");
171
                getExtractorImpl().extract(expression, attribute, matchNumber, inputString, result, found, "-1");
172
            } else {
172
            } else {
173
                if (inputString==null && log.isWarnEnabled()) {
173
                if (inputString==null && log.isWarnEnabled()) {
174
                    log.warn("No variable '{}' found to process by CSS/JQuery Extractor '{}', skipping processing",
174
                    log.warn("No variable '{}' found to process by HTML Extractor '{}', skipping processing",
175
                            getVariableName(), getName());
175
                            getVariableName(), getName());
176
                }
176
                }
177
                return Collections.emptyList();
177
                return Collections.emptyList();
(-)src/core/org/apache/jmeter/resources/messages.properties (-2 / +2 lines)
Lines 432-439 Link Here
432
html_assertion_file=Write JTidy report to file
432
html_assertion_file=Write JTidy report to file
433
html_assertion_label=HTML Assertion
433
html_assertion_label=HTML Assertion
434
html_assertion_title=HTML Assertion
434
html_assertion_title=HTML Assertion
435
html_extractor_title=CSS/JQuery Extractor
435
html_extractor_title=HTML Extractor
436
html_extractor_type=CSS/JQuery Extractor Implementation
436
html_extractor_type=HTML Extractor Implementation
437
http_implementation=Implementation:
437
http_implementation=Implementation:
438
http_response_code=HTTP response code
438
http_response_code=HTTP response code
439
http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
439
http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
(-)src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java (-1 / +1 lines)
Lines 38-44 Link Here
38
 * Those kind of variables are extracted by:
38
 * Those kind of variables are extracted by:
39
 * - Regular Expression extractor
39
 * - Regular Expression extractor
40
 * - JSON extractor
40
 * - JSON extractor
41
 * - CSS/JQuery extractor
41
 * - HTML extractor
42
 * - XPath Extractor
42
 * - XPath Extractor
43
 * 
43
 * 
44
 * @since 3.1
44
 * @since 3.1
(-)xdocs/changes.xml (+1 lines)
Lines 230-235 Link Here
230
    <li><bug>62252</bug>HTTP header merging logic does not correspond to the documentation</li>
230
    <li><bug>62252</bug>HTTP header merging logic does not correspond to the documentation</li>
231
    <li><bug>62554</bug>BoundaryExtractor : Field to check is not reset</li>
231
    <li><bug>62554</bug>BoundaryExtractor : Field to check is not reset</li>
232
    <li><bug>62553</bug>Random element might return same value even if property "Per thread user (User)" is set to TRUE</li>
232
    <li><bug>62553</bug>Random element might return same value even if property "Per thread user (User)" is set to TRUE</li>
233
    <li><bug>62593</bug>Rename CSS/JQuery Extractor to HTML Extractor. Contributed by orimarko at gmail.com</li>
233
</ul>
234
</ul>
234
235
235
<h3>Functions</h3>
236
<h3>Functions</h3>
(-)xdocs/usermanual/component_reference.xml (-4 / +4 lines)
Lines 5661-5668 Link Here
5661
    and <a href="regular_expressions.html"> for further information on JMeter regular expressions.</a></p>
5661
    and <a href="regular_expressions.html"> for further information on JMeter regular expressions.</a></p>
5662
</component>
5662
</component>
5663
5663
5664
<component name="CSS/JQuery Extractor" index="&sect-num;.8.2"  width="826" height="276" screenshot="css_extractor_attr.png">
5664
<component name="HTML Extractor" index="&sect-num;.8.2"  width="826" height="276" screenshot="css_extractor_attr.png">
5665
<description><p>Allows the user to extract values from a server response using a CSS/JQuery selector like syntax.  As a post-processor,
5665
<description><p>Allows the user to extract values from a server HTML response using a CSS/JQuery selector like syntax.  As a post-processor,
5666
this element will execute after each Sample request in its scope, applying the CSS/JQuery expression, extracting the requested nodes,
5666
this element will execute after each Sample request in its scope, applying the CSS/JQuery expression, extracting the requested nodes,
5667
extracting the node as text or attribute value and store the result into the given variable name.</p></description>
5667
extracting the node as text or attribute value and store the result into the given variable name.</p></description>
5668
<properties>
5668
<properties>
Lines 5684-5690 Link Here
5684
        For match number = <code>0</code> or negative, all qualifying samples will be processed.
5684
        For match number = <code>0</code> or negative, all qualifying samples will be processed.
5685
        For match number > <code>0</code>, matching will stop as soon as enough matches have been found.
5685
        For match number > <code>0</code>, matching will stop as soon as enough matches have been found.
5686
        </property>
5686
        </property>
5687
        <property name="CSS/JQuery extractor Implementation" required="False">
5687
        <property name="HTML Implementation" required="False">
5688
        2 Implementations for CSS/JQuery based syntax are supported:
5688
        2 Implementations for CSS/JQuery based syntax are supported:
5689
        <ul>
5689
        <ul>
5690
                <li><a href="http://jsoup.org/" >JSoup</a></li>
5690
                <li><a href="http://jsoup.org/" >JSoup</a></li>
Lines 5836-5842 Link Here
5836
           <li>"<code>Use Tidy</code>" should be checked on for HTML response. Such response is converted to valid XHTML (XML compatible HTML) using Tidy</li>
5836
           <li>"<code>Use Tidy</code>" should be checked on for HTML response. Such response is converted to valid XHTML (XML compatible HTML) using Tidy</li>
5837
           <li>"<code>Use Tidy</code>" should be unchecked for both XHTML or XML response (for example RSS)</li>
5837
           <li>"<code>Use Tidy</code>" should be unchecked for both XHTML or XML response (for example RSS)</li>
5838
       </ul>
5838
       </ul>
5839
       <note>For HTML, CSS/JQuery Extractor is the correct and performing solution. Don't use XPath for HTML extractions.</note>
5839
       <note>For HTML, HTML Extractor is the correct and performing solution. Don't use XPath for HTML extractions.</note>
5840
       </property>
5840
       </property>
5841
<property name="Quiet"  required="If Tidy is selected">Sets the Tidy Quiet flag</property>
5841
<property name="Quiet"  required="If Tidy is selected">Sets the Tidy Quiet flag</property>
5842
<property name="Report Errors"  required="If Tidy is selected">If a Tidy error occurs, then set the Assertion accordingly</property>
5842
<property name="Report Errors"  required="If Tidy is selected">If a Tidy error occurs, then set the Assertion accordingly</property>
(-)xdocs/usermanual/functions.xml (-1 / +1 lines)
Lines 703-709 Link Here
703
The variables can be simple or multi-valued as they can be generated by the following extractors:
703
The variables can be simple or multi-valued as they can be generated by the following extractors:
704
<ul>
704
<ul>
705
    <li><a href="component_reference.html#Regular_Expression_Extractor">Regular Expression Extractor</a></li>
705
    <li><a href="component_reference.html#Regular_Expression_Extractor">Regular Expression Extractor</a></li>
706
    <li><a href="component_reference.html#CSS/JQuery_Extractor">CSS/JQuery Extractor</a></li>
706
    <li><a href="component_reference.html#HTML_Extractor">HTML Extractor</a></li>
707
    <li><a href="component_reference.html#JSON_Extractor">JSON Extractor</a></li>
707
    <li><a href="component_reference.html#JSON_Extractor">JSON Extractor</a></li>
708
    <li><a href="component_reference.html#XPath_Assertion">XPath Assertion</a></li>
708
    <li><a href="component_reference.html#XPath_Assertion">XPath Assertion</a></li>
709
</ul>
709
</ul>

Return to bug 62593