You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/03/10 20:19:27 UTC

svn commit: r1786434 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java

Author: fschumacher
Date: Fri Mar 10 20:19:27 2017
New Revision: 1786434

URL: http://svn.apache.org/viewvc?rev=1786434&view=rev
Log:
Trim extracted URLs and remove whitespace like newline, carriage return, formfeed and backspace.

Bugzilla Id: 60842

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
    jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java?rev=1786434&r1=1786433&r2=1786434&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java Fri Mar 10 20:19:27 2017
@@ -80,7 +80,10 @@ public class LagartoBasedHtmlParser exte
         private void extractAttribute(Tag tag, String attributeName) {
             CharSequence url = tag.getAttributeValue(attributeName);
             if (!StringUtils.isEmpty(url)) {
-                urls.addURL(url.toString(), baseUrl.url);
+                String trimmed = url.toString().trim().replaceAll("[\n\r\b\f]+", "");
+                if (!trimmed.isEmpty()) {
+                    urls.addURL(trimmed, baseUrl.url);
+                }
             }
         }
         /*

Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java?rev=1786434&r1=1786433&r2=1786434&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestLagartoBasedHtmlParser.java Fri Mar 10 20:19:27 2017
@@ -71,9 +71,10 @@ public class TestLagartoBasedHtmlParser
                 new Object[] {"<anytag style=\"foo: url('bar')'\"/>", "http://example.org/bar"},
                 // new Object[] {"<anytag style=\"foo: url(bar)'\"/>", "http://example.org/bar"},
                 // new Object[] {"<anytag style=\"foo: url(bar)'; other: url(something);\"/>", "http://example.org/bar,http://example.org/something"},
-                // new Object[] {"<link href='  abc\n.css  ' rel='stylesheet'/>", "http://example.org/abc.css"},
-                // new Object[] {"<embed src=''/>", ""},
-                // new Object[] {"<embed src='  '/>", ""},
+                new Object[] {"<link href='  abc\n.css  ' rel='stylesheet'/>", "http://example.org/abc.css"},
+                new Object[] {"<link href='  with spaces\n.css  ' rel='stylesheet'/>", "http://example.org/with spaces.css"},
+                new Object[] {"<embed src=''/>", ""},
+                new Object[] {"<embed src='  '/>", ""},
         };
     }