jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1676622 - in /jmeter/trunk/xdocs/usermanual: component_reference.xml functions.xml listeners.xml test_plan.xml
Date Tue, 28 Apr 2015 20:40:38 GMT
Author: fschumacher
Date: Tue Apr 28 20:40:37 2015
New Revision: 1676622

URL: http://svn.apache.org/r1676622
Log:
Followup to r1676601. More html entities, that need to be unescaped
since r1674583.

Bugzilla Id: 53764

Modified:
    jmeter/trunk/xdocs/usermanual/component_reference.xml
    jmeter/trunk/xdocs/usermanual/functions.xml
    jmeter/trunk/xdocs/usermanual/listeners.xml
    jmeter/trunk/xdocs/usermanual/test_plan.xml

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1676622&r1=1676621&r2=1676622&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Apr 28 20:40:37 2015
@@ -6318,7 +6318,7 @@ Jakarta ORO also supports zero-width loo
 but retain the trailing <code>/</code> in the output by using <code>(^/images(?=/))</code>".</p>
 
 <note>
-Note that the current version of Jakara ORO does not support look-behind - i.e. <code>(?&amp;lt;=...)</code>
or <code>(?&amp;lt;!...)</code>.
+Note that the current version of Jakara ORO does not support look-behind - i.e. <code>(?&lt;=...)</code>
or <code>(?&lt;!...)</code>.
 </note>
 
 <p>Look out for overlapping matchers. For example the value <code>.*</code>
as a regex in a variable named

Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1676622&r1=1676621&r2=1676622&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Tue Apr 28 20:40:37 2015
@@ -19,6 +19,9 @@
 <!DOCTYPE document
 [
 <!ENTITY sect-num '20'>
+<!ENTITY ccedil   "&#x000E7;" >
+<!ENTITY eacute   "&#x000E9;" >
+<!ENTITY yen      "&#x000A5;" >
 ]>
 
 <document prev="component_reference.html" next="regular_expressions.html" id="$Id$">
@@ -298,8 +301,8 @@ replacement string") parsed by this func
         <property name="First argument" required="Yes">The first argument is the regular
expression
         to be applied to the response data.  It will grab all matches.  Any parts of this
expression
         that you wish to use in your template string, be sure to surround in parentheses.
 Example:
-        <code>&amp;lt;a href="(.*)"&amp;gt;</code>.  This will grab the
value of the link and store it as the first group (there is
-        only 1 group).  Another example: <code>&amp;lt;input type="hidden" name="(.*)"
value="(.*)"&amp;gt;</code>.  This will
+        <code>&lt;a href="(.*)"&gt;</code>.  This will grab the value
of the link and store it as the first group (there is
+        only 1 group).  Another example: <code>&lt;input type="hidden" name="(.*)"
value="(.*)"&gt;</code>.  This will
         grab the name as the first group, and the value as the second group.  These values
can be used
         in your template string</property>
         <property name="Second argument" required="Yes">This is the template string
that will replace
@@ -1078,7 +1081,7 @@ i.intValue(); // or use i.longValue()
 <br/>
 <code>${__char(13,10)}</code> = <code>${__char(0xD,0xA)}</code> =
<code>${__char(015,012)}</code> = <code>CRLF</code>
 <br/>
-<code>${__char(165)}</code> = <code>&amp;#165;</code> (yen)
+<code>${__char(165)}</code> = <code>&yen;</code> (yen)
  </p>
 </component>
 
@@ -1113,12 +1116,12 @@ to a string containing the actual Unicod
 Supports HTML 4.0 entities.
 </p>
 <p>
-For example, the string <code>"&amp;#38;lt;Fran&amp;#38;ccedil;ais&amp;#38;gt;"</code>
-will become <code>"&amp;lt;Fran&amp;ccedil;ais&amp;gt;"</code>.
+For example, the string <code>"&#38;lt;Fran&#38;ccedil;ais&#38;gt;"</code>
+will become <code>"&lt;Fran&ccedil;ais&gt;"</code>.
 </p>
 <p>
 If an entity is unrecognized, it is left alone, and inserted verbatim into the result string.
-e.g. <code>"&amp;gt;&amp;zzzz;x"</code> will become <code>">&amp;zzzz;x"</code>.
+e.g. <code>"&amp;gt;&amp;zzzz;x"</code> will become <code>"&gt;&amp;zzzz;x"</code>.
 </p>
     <p>
     Uses StringEscapeUtils#unescapeHtml(String) from Commons Lang.
@@ -1139,9 +1142,9 @@ Function which escapes the characters in
 Supports HTML 4.0 entities.
 </p>
 <p>
-For example,<code>&amp;quot;bread&amp;quot; &amp;amp; &amp;quot;butter&amp;quot;</code>
+For example,<code>&quot;bread&quot; &amp; &quot;butter&quot;</code>
 becomes:
-<code>&amp;#38;quot;bread&amp;#38;quot; &amp;#38;amp; &amp;#38;quot;butter&amp;#38;quot;</code>.
+<code>&#38;quot;bread&#38;quot; &#38;amp; &#38;quot;butter&#38;quot;</code>.
 </p>
     <p>
     Uses StringEscapeUtils#escapeHtml(String) from Commons Lang.
@@ -1163,7 +1166,7 @@ Note: use UTF-8 as the encoding scheme.
 </p>
 <p>
 For example, the string <code>Word+%22school%22+is+%22%C3%A9cole%22+in+french</code>
would get converted to
- <code>Word &quot;school&quot; is &quot;&amp;eacute;cole&quot;
in french</code>.
+ <code>Word &quot;school&quot; is &quot;&eacute;cole&quot; in french</code>.
 </p>
     <p>
     Uses Java class <a href="http://docs.oracle.com/javase/6/docs/api/java/net/URLDecoder.html">URLDecoder</a>.
@@ -1183,7 +1186,7 @@ For example, the string <code>Word+%22sc
 Function to encode a string to a application/x-www-form-urlencoded string.
 </p>
 <p>
-For example, the string <code>Word &quot;school&quot; is &quot;&amp;eacute;cole&quot;
in french</code> would get converted to
+For example, the string <code>Word &quot;school&quot; is &quot;&eacute;cole&quot;
in french</code> would get converted to
  <code>Word+%22school%22+is+%22%C3%A9cole%22+in+french</code>.
 </p>
     <p>

Modified: jmeter/trunk/xdocs/usermanual/listeners.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=1676622&r1=1676621&r2=1676622&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/listeners.xml (original)
+++ jmeter/trunk/xdocs/usermanual/listeners.xml Tue Apr 28 20:40:37 2015
@@ -106,7 +106,6 @@ jmeter.save.saveservice.default_delimite
 The full set of properties that affect result file output is shown below.
 </p>
 <code>
-<pre>
 #---------------------------------------------------------------------------
 # Results file configuration
 #---------------------------------------------------------------------------
@@ -186,11 +185,10 @@ sampleresult.timestamp.start=true
 # to ensure that the correct data is available at the client.
 
 # Optional xml processing instruction for line 2 of the file:
-#jmeter.save.saveservice.xml_pi=&amp;lt;?xml-stylesheet type="text/xsl" href="sample.xsl"?>
+#jmeter.save.saveservice.xml_pi=&lt;?xml-stylesheet type="text/xsl" href="sample.xsl"?&gt;
 
 # Prefix used to identify filenames that are relative to the current base
 #jmeter.save.saveservice.base_prefix=~/
-</pre>
 </code></p>
 <p>
 The date format to be used for the timestamp_format is described in <a
@@ -320,90 +318,90 @@ The order of appearance of columns is fi
 <p>
 The format of the updated XML (2.1) is as follows (line breaks will be different):
 </p>
-<pre>
-&amp;lt;?xml version="1.0" encoding="UTF-8"?>
-&amp;lt;testResults version="1.2">
+<source>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;testResults version="1.2"&gt;
 
 -- HTTP Sample, with nested samples 
 
-&amp;lt;httpSample t="1392" lt="351" ts="1144371014619" s="true" 
+&lt;httpSample t="1392" lt="351" ts="1144371014619" s="true" 
      lb="HTTP Request" rc="200" rm="OK" 
-     tn="Listen 1-1" dt="text" de="iso-8859-1" by="12407">
-  &amp;lt;httpSample t="170" lt="170" ts="1144371015471" s="true" 
+     tn="Listen 1-1" dt="text" de="iso-8859-1" by="12407"&gt;
+  &lt;httpSample t="170" lt="170" ts="1144371015471" s="true" 
         lb="http://www.apache.org/style/style.css" rc="200" rm="OK" 
-        tn="Listen 1-1" dt="text" de="ISO-8859-1" by="1002">
-    &amp;lt;responseHeader class="java.lang.String">HTTP/1.1 200 OK
+        tn="Listen 1-1" dt="text" de="ISO-8859-1" by="1002"&gt;
+    &lt;responseHeader class="java.lang.String"&gt;HTTP/1.1 200 OK
 Date: Fri, 07 Apr 2006 00:50:14 GMT
 ...
 Content-Type: text/css
-&amp;lt;/responseHeader>
-    &amp;lt;requestHeader class="java.lang.String">MyHeader: MyValue&amp;lt;/requestHeader>
-    &amp;lt;responseData class="java.lang.String">body, td, th {
+&lt;/responseHeader&gt;
+    &lt;requestHeader class="java.lang.String"&gt;MyHeader: MyValue&lt;/requestHeader&gt;
+    &lt;responseData class="java.lang.String"&gt;body, td, th {
     font-size: 95%;
     font-family: Arial, Geneva, Helvetica, sans-serif;
     color: black;
     background-color: white;
 }
 ...
-&amp;lt;/responseData>
-    &amp;lt;cookies class="java.lang.String">&amp;lt;/cookies>
-    &amp;lt;method class="java.lang.String">GET&amp;lt;/method>
-    &amp;lt;queryString class="java.lang.String">&amp;lt;/queryString>
-    &amp;lt;url>http://www.apache.org/style/style.css&amp;lt;/url>
-  &amp;lt;/httpSample>
-  &amp;lt;httpSample t="200" lt="180" ts="1144371015641" s="true" 
+&lt;/responseData&gt;
+    &lt;cookies class="java.lang.String"&gt;&lt;/cookies&gt;
+    &lt;method class="java.lang.String"&gt;GET&lt;/method&gt;
+    &lt;queryString class="java.lang.String"&gt;&lt;/queryString&gt;
+    &lt;url&gt;http://www.apache.org/style/style.css&lt;/url&gt;
+  &lt;/httpSample&gt;
+  &lt;httpSample t="200" lt="180" ts="1144371015641" s="true" 
      lb="http://www.apache.org/images/asf_logo_wide.gif" 
-     rc="200" rm="OK" tn="Listen 1-1" dt="bin" de="ISO-8859-1" by="5866">
-    &amp;lt;responseHeader class="java.lang.String">HTTP/1.1 200 OK
+     rc="200" rm="OK" tn="Listen 1-1" dt="bin" de="ISO-8859-1" by="5866"&gt;
+    &lt;responseHeader class="java.lang.String"&gt;HTTP/1.1 200 OK
 Date: Fri, 07 Apr 2006 00:50:14 GMT
 ...
 Content-Type: image/gif
-&amp;lt;/responseHeader>
-    &amp;lt;requestHeader class="java.lang.String">MyHeader: MyValue&amp;lt;/requestHeader>
-    &amp;lt;responseData class="java.lang.String">http://www.apache.org/asf.gif&amp;lt;/responseData>
-      &amp;lt;responseFile class="java.lang.String">Mixed1.html&amp;lt;/responseFile>
-    &amp;lt;cookies class="java.lang.String">&amp;lt;/cookies>
-    &amp;lt;method class="java.lang.String">GET&amp;lt;/method>
-    &amp;lt;queryString class="java.lang.String">&amp;lt;/queryString>
-    &amp;lt;url>http://www.apache.org/asf.gif&amp;lt;/url>
-  &amp;lt;/httpSample>
-  &amp;lt;responseHeader class="java.lang.String">HTTP/1.1 200 OK
+&lt;/responseHeader&gt;
+    &lt;requestHeader class="java.lang.String"&gt;MyHeader: MyValue&lt;/requestHeader&gt;
+    &lt;responseData class="java.lang.String"&gt;http://www.apache.org/asf.gif&lt;/responseData&gt;
+      &lt;responseFile class="java.lang.String"&gt;Mixed1.html&lt;/responseFile&gt;
+    &lt;cookies class="java.lang.String"&gt;&lt;/cookies&gt;
+    &lt;method class="java.lang.String"&gt;GET&lt;/method&gt;
+    &lt;queryString class="java.lang.String"&gt;&lt;/queryString&gt;
+    &lt;url&gt;http://www.apache.org/asf.gif&lt;/url&gt;
+  &lt;/httpSample&gt;
+  &lt;responseHeader class="java.lang.String"&gt;HTTP/1.1 200 OK
 Date: Fri, 07 Apr 2006 00:50:13 GMT
 ...
 Content-Type: text/html; charset=ISO-8859-1
-&amp;lt;/responseHeader>
-  &amp;lt;requestHeader class="java.lang.String">MyHeader: MyValue&amp;lt;/requestHeader>
-  &amp;lt;responseData class="java.lang.String">&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD
XHTML 1.0 Transitional//EN&quot;
+&lt;/responseHeader&gt;
+  &lt;requestHeader class="java.lang.String"&gt;MyHeader: MyValue&lt;/requestHeader&gt;
+  &lt;responseData class="java.lang.String"&gt;&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD
XHTML 1.0 Transitional//EN&quot;
                &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
 ...
-&amp;amp;lt;html&amp;amp;gt;
- &amp;amp;lt;head&amp;amp;gt;
+&lt;html&gt;
+ &lt;head&gt;
 ...
- &amp;amp;lt;/head&amp;amp;gt;
- &amp;amp;lt;body&amp;amp;gt;        
+ &lt;/head&gt;
+ &lt;body&gt;        
 ...
- &amp;amp;lt;/body&amp;amp;gt;
-&amp;amp;lt;/html&amp;amp;gt;
-&amp;lt;/responseData>
-  &amp;lt;cookies class="java.lang.String">&amp;lt;/cookies>
-  &amp;lt;method class="java.lang.String">GET&amp;lt;/method>
-  &amp;lt;queryString class="java.lang.String">&amp;lt;/queryString>
-  &amp;lt;url>http://www.apache.org/&amp;lt;/url>
-&amp;lt;/httpSample>
+ &lt;/body&gt;
+&lt;/html&gt;
+&lt;/responseData&gt;
+  &lt;cookies class="java.lang.String"&gt;&lt;/cookies&gt;
+  &lt;method class="java.lang.String"&gt;GET&lt;/method&gt;
+  &lt;queryString class="java.lang.String"&gt;&lt;/queryString&gt;
+  &lt;url&gt;http://www.apache.org/&lt;/url&gt;
+&lt;/httpSample&gt;
 
 -- nonHTTPP Sample
 
-&amp;lt;sample t="0" lt="0" ts="1144372616082" s="true" lb="Example Sampler"
-    rc="200" rm="OK" tn="Listen 1-1" dt="text" de="ISO-8859-1" by="10">
-  &amp;lt;responseHeader class="java.lang.String">&amp;lt;/responseHeader>
-  &amp;lt;requestHeader class="java.lang.String">&amp;lt;/requestHeader>
-  &amp;lt;responseData class="java.lang.String">Listen 1-1&amp;lt;/responseData>
-  &amp;lt;responseFile class="java.lang.String">Mixed2.unknown&amp;lt;/responseFile>
-  &amp;lt;samplerData class="java.lang.String">ssssss&amp;lt;/samplerData>
-&amp;lt;/sample>
+&lt;sample t="0" lt="0" ts="1144372616082" s="true" lb="Example Sampler"
+    rc="200" rm="OK" tn="Listen 1-1" dt="text" de="ISO-8859-1" by="10"&gt;
+  &lt;responseHeader class="java.lang.String"&gt;&lt;/responseHeader&gt;
+  &lt;requestHeader class="java.lang.String"&gt;&lt;/requestHeader&gt;
+  &lt;responseData class="java.lang.String"&gt;Listen 1-1&lt;/responseData&gt;
+  &lt;responseFile class="java.lang.String"&gt;Mixed2.unknown&lt;/responseFile&gt;
+  &lt;samplerData class="java.lang.String"&gt;ssssss&lt;/samplerData&gt;
+&lt;/sample&gt;
 
-&amp;lt;/testResults>
-</pre>
+&lt;/testResults&gt;
+</source>
 <p>
 Note that the sample node name may be either "sample" or "httpSample".
 </p>

Modified: jmeter/trunk/xdocs/usermanual/test_plan.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/test_plan.xml?rev=1676622&r1=1676621&r2=1676622&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/test_plan.xml (original)
+++ jmeter/trunk/xdocs/usermanual/test_plan.xml Tue Apr 28 20:40:37 2015
@@ -291,7 +291,7 @@ you can indicate that the response is to
 the whole response.</p>
 
 <p>You can add an assertion to any Sampler. For example, you can
-add an assertion to a HTTP Request that checks for the text, "&amp;lt;/HTML&amp;gt;".
 JMeter
+add an assertion to a HTTP Request that checks for the text, "<code>&lt;/HTML&gt;</code>".
 JMeter
 will then check that the text is present in the HTTP response.  If JMeter cannot find the
 text, then it will mark this as a failed request.</p>
 



Mime
View raw message