Author: pmouawad
Date: Sat Aug 25 20:18:39 2018
New Revision: 1839102
URL: http://svn.apache.org/viewvc?rev=1839102&view=rev
Log:
Bug 62593 - Rename CSS/JQuery Extractor to CSS Selector Extractor
Contributed by Orimarko
Bugzilla Id: 62593
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml
jmeter/trunk/xdocs/usermanual/functions.xml
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
Sat Aug 25 20:18:39 2018
@@ -171,7 +171,7 @@ public class HtmlExtractor extends Abstr
getExtractorImpl().extract(expression, attribute, matchNumber,
inputString, result, found, "-1");
} else {
if (inputString==null && log.isWarnEnabled()) {
- log.warn("No variable '{}' found to process by CSS/JQuery
Extractor '{}', skipping processing",
+ log.warn("No variable '{}' found to process by CSS
Selector Extractor '{}', skipping processing",
getVariableName(), getName());
}
return Collections.emptyList();
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat
Aug 25 20:18:39 2018
@@ -432,8 +432,8 @@ help_node=What's this node?
html_assertion_file=Write JTidy report to file
html_assertion_label=HTML Assertion
html_assertion_title=HTML Assertion
-html_extractor_title=CSS/JQuery Extractor
-html_extractor_type=CSS/JQuery Extractor Implementation
+html_extractor_title=CSS Selector Extractor
+html_extractor_type=CSS Selector Extractor Implementation
http_implementation=Implementation:
http_response_code=HTTP response code
http_url_rewriting_modifier_title=HTTP URL Re-writing Modifier
Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Sat Aug 25 20:18:39 2018
@@ -426,8 +426,8 @@ help_node=Quel est ce noeud ?
html_assertion_file=Ecrire un rapport JTidy dans un fichier
html_assertion_label=Assertion HTML
html_assertion_title=Assertion HTML
-html_extractor_title=Extracteur CSS/JQuery
-html_extractor_type=Impl\u00E9mentation de l'extracteur CSS/JQuery
+html_extractor_title=Extracteur par S\u00E9lecteur CSS
+html_extractor_type=Impl\u00E9mentation de l'extracteur S\u00E9lecteur CSS
http_implementation=Impl\u00E9mentation \:
http_response_code=Code de r\u00E9ponse HTTP
http_url_rewriting_modifier_title=Transcripteur d'URL HTTP
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
---
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
(original)
+++
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomFromMultipleVars.java
Sat Aug 25 20:18:39 2018
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* Those kind of variables are extracted by:
* - Regular Expression extractor
* - JSON extractor
- * - CSS/JQuery extractor
+ * - CSS Selector extractor
* - XPath Extractor
*
* @since 3.1
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 25 20:18:39 2018
@@ -118,6 +118,7 @@ this behaviour, set <code>httpclient.res
<ul>
<li><bug>62320</bug>Counter : Reference Name property is not clear</li>
<li><bug>60991</bug>XPath Extractor : Implement XPath 2.0. Contributed by
Ubik Load Pack (support at ubikloadpack.com)</li>
+ <li><bug>62593</bug>Rename CSS/JQuery Extractor to CSS Selector Extractor.
Contributed by orimarko at gmail.com</li>
</ul>
<h3>Functions</h3>
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Aug 25 20:18:39
2018
@@ -5662,8 +5662,8 @@ generate the template string, and store
and <a href="regular_expressions.html"> for further information on JMeter
regular expressions.</a></p>
</component>
-<component name="CSS/JQuery Extractor" index="§-num;.8.2" width="826"
height="276" screenshot="css_extractor_attr.png">
-<description><p>Allows the user to extract values from a server response using
a CSS/JQuery selector like syntax. As a post-processor,
+<component name="CSS Selector Extractor" was="CSS/JQuery Extractor"
index="§-num;.8.2" width="826" height="276"
screenshot="css_extractor_attr.png">
+<description><p>Allows the user to extract values from a server HTML response
using a CSS Selector syntax. As a post-processor,
this element will execute after each Sample request in its scope, applying the
CSS/JQuery expression, extracting the requested nodes,
extracting the node as text or attribute value and store the result into the
given variable name.</p></description>
<properties>
@@ -5685,7 +5685,7 @@ extracting the node as text or attribute
For match number = <code>0</code> or negative, all qualifying samples
will be processed.
For match number > <code>0</code>, matching will stop as soon as
enough matches have been found.
</property>
- <property name="CSS/JQuery extractor Implementation" required="False">
+ <property name="CSS Selector Implementation" required="False">
2 Implementations for CSS/JQuery based syntax are supported:
<ul>
<li><a href="http://jsoup.org/"; >JSoup</a></li>
@@ -5837,7 +5837,7 @@ extracting the node as text or attribute
<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>
<li>"<code>Use Tidy</code>" should be unchecked for both XHTML or
XML response (for example RSS)</li>
</ul>
- <note>For HTML, CSS/JQuery Extractor is the correct and performing
solution. Don't use XPath for HTML extractions.</note>
+ <note>For HTML, CSS Selector Extractor is the correct and performing
solution. Don't use XPath for HTML extractions.</note>
</property>
<property name="Quiet" required="If Tidy is selected">Sets the Tidy Quiet
flag</property>
<property name="Report Errors" required="If Tidy is selected">If a Tidy error
occurs, then set the Assertion accordingly</property>
Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1839102&r1=1839101&r2=1839102&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Sat Aug 25 20:18:39 2018
@@ -702,10 +702,12 @@ string like <code>2z22ak</code> or <code
<description><p>The RandomFromMultipleVars function returns a random value
based on the variable values provided by <code>Source Variables</code>.</p>
The variables can be simple or multi-valued as they can be generated by the
following extractors:
<ul>
+ <li><a href="component_reference.html#Boundary_Extractor">Boundary
Extractor</a></li>
<li><a
href="component_reference.html#Regular_Expression_Extractor">Regular Expression
Extractor</a></li>
- <li><a href="component_reference.html#CSS/JQuery_Extractor">CSS/JQuery
Extractor</a></li>
+ <li><a href="component_reference.html#CSS_Selector_Extractor">CSS Selector
Extractor</a></li>
<li><a href="component_reference.html#JSON_Extractor">JSON
Extractor</a></li>
- <li><a href="component_reference.html#XPath_Assertion">XPath
Assertion</a></li>
+ <li><a href="component_reference.html#XPath_Extractor">XPath
Extractor</a></li>
+ <li><a href="component_reference.html#XPath2_Extractor">XPath2
Extractor</a></li>
</ul>
Multi-value vars are the ones that are extracted when you set <code>-1</code>
for <code>Match Numbers</code>.
