Menu
▾
▴
[HtmlUnit] SVN: [14680] trunk/htmlunit/src
|
From: <asa...@us...> - 2017-07-21 07:54:33
|
Revision: 14680
http://sourceforge.net/p/htmlunit/code/14680
Author: asashour
Date: 2017-07-21 07:54:30 +0000 (Fri, 21 Jul 2017)
Log Message:
-----------
No need to use .toString(),.toExternalForm() in string concatenation.
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitBrowserCompatCookieSpec.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient6Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnectionTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitBrowserCompatCookieSpec.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitBrowserCompatCookieSpec.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/httpclient/HtmlUnitBrowserCompatCookieSpec.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -137,7 +137,7 @@
final String headername = header.getName();
if (!headername.equalsIgnoreCase(SM.SET_COOKIE)) {
- throw new MalformedCookieException("Unrecognized cookie header '" + header.toString() + "'");
+ throw new MalformedCookieException("Unrecognized cookie header '" + header + "'");
}
final HeaderElement[] helems = header.getElements();
boolean versioned = false;
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/xml/XMLHttpRequest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -663,9 +663,7 @@
@Override
public String toString() {
- return "XMLHttpRequest "
- + webRequest_.getHttpMethod().toString()
- + " '" + webRequest_.getUrl().toExternalForm() + "'";
+ return "XMLHttpRequest " + webRequest_.getHttpMethod() + " '" + webRequest_.getUrl() + "'";
}
};
final JavaScriptJob job = BackgroundJavaScriptFactory.theFactory().
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/BrowserVersionFeaturesTest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -98,7 +98,7 @@
}
}
assertTrue("BrowserVersionFeatures.java: Annotation '"
- + annotatedBrowser.toString() + "' of feature '"
+ + annotatedBrowser + "' of feature '"
+ feature.name() + "' in no longer in use.", inUse);
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -162,7 +162,7 @@
public void locationUTF() throws Exception {
final String response = "HTTP/1.1 302 Found\r\n"
+ "Content-Length: 0\r\n"
- + "Location: " + URL_FIRST.toExternalForm() + "أهلاً" + "\r\n"
+ + "Location: " + URL_FIRST + "أهلاً" + "\r\n"
+ "\r\n";
final String response2 = "HTTP/1.1 200 OK\r\n"
@@ -197,7 +197,7 @@
public void locationQueryUTF() throws Exception {
final String response = "HTTP/1.1 302 Found\r\n"
+ "Content-Length: 0\r\n"
- + "Location: " + URL_FIRST.toExternalForm() + "test?أهلاً" + "\r\n"
+ + "Location: " + URL_FIRST + "test?أهلاً" + "\r\n"
+ "\r\n";
final String response2 = "HTTP/1.1 200 OK\r\n"
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient6Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient6Test.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClient6Test.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -487,6 +487,6 @@
final WebDriver driver = loadPage2(html);
driver.findElement(By.tagName("a")).click();
- assertEquals(url.toString() + "?param=http%3A//somwhere.org", driver.getCurrentUrl());
+ assertEquals(url + "?param=http%3A//somwhere.org", driver.getCurrentUrl());
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -2096,7 +2096,7 @@
final String html = "<html><body onload='document.getElementById(\"f\").src=\"frame.html\";'>\n"
+ "<iframe id='f'></iframe></body></html>";
conn.setResponse(URL_FIRST, html);
- final URL frameUrl = new URL(URL_FIRST.toExternalForm() + "frame.html");
+ final URL frameUrl = new URL(URL_FIRST, "frame.html");
conn.setResponse(frameUrl, "<html><body></body></html>");
conn.setResponse(URL_SECOND, "<html><body></body></html>");
client.setWebConnection(conn);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlForm2Test.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -191,7 +191,7 @@
else {
linkSuffix = "bug.html?k%F6nig";
}
- assertEquals(URL_FIRST.toExternalForm() + linkSuffix, driver.getCurrentUrl());
+ assertEquals(URL_FIRST + linkSuffix, driver.getCurrentUrl());
}
/**
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFormTest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -1026,7 +1026,7 @@
urlAfterSubmit("post", "foo?foo=12", "foo?foo=12");
urlAfterSubmit("post", "", "");
urlAfterSubmit("post", "?a=1&b=2", "?a=1&b=2");
- final URL url = new URL(URL_FIRST.toExternalForm() + "?a=1&b=2");
+ final URL url = new URL(URL_FIRST + "?a=1&b=2");
urlAfterSubmit(url, "post", "", url.toExternalForm());
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -1225,7 +1225,7 @@
final MockWebConnection conn = new MockWebConnection();
conn.setResponse(URL_FIRST, html1);
- conn.setResponse(new URL(URL_FIRST.toExternalForm() + "myDialog.html"), html2);
+ conn.setResponse(new URL(URL_FIRST, "myDialog.html"), html2);
client.setWebConnection(conn);
final HtmlPage page = client.getPage(URL_FIRST);
@@ -1284,7 +1284,7 @@
final MockWebConnection conn = new MockWebConnection();
conn.setResponse(URL_FIRST, html1);
- conn.setResponse(new URL(URL_FIRST.toExternalForm() + "myDialog.html"), html2);
+ conn.setResponse(new URL(URL_FIRST, "myDialog.html"), html2);
client.setWebConnection(conn);
final HtmlPage page = getWebClient().getPage(URL_FIRST);
@@ -1334,7 +1334,7 @@
final MockWebConnection conn = new MockWebConnection();
conn.setResponse(URL_FIRST, html1);
- conn.setResponse(new URL(URL_FIRST.toExternalForm() + "myDialog.html"), html2);
+ conn.setResponse(new URL(URL_FIRST, "myDialog.html"), html2);
client.setWebConnection(conn);
final HtmlPage page = client.getPage(URL_FIRST);
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnectionTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnectionTest.java 2017-07-21 07:44:41 UTC (rev 14679)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/util/FalsifyingWebConnectionTest.java 2017-07-21 07:54:30 UTC (rev 14680)
@@ -57,7 +57,7 @@
final MockWebConnection mockConnection = new MockWebConnection();
mockConnection.setResponse(URL_FIRST, html);
- mockConnection.setResponse(new URL(URL_FIRST.toExternalForm() + "myJs.js"), "alert('hello');");
+ mockConnection.setResponse(new URL(URL_FIRST, "myJs.js"), "alert('hello');");
webClient.setWebConnection(mockConnection);
final List<String> collectedAlerts = new ArrayList<>();
@@ -98,7 +98,7 @@
final MockWebConnection mockConnection = new MockWebConnection();
mockConnection.setResponse(URL_FIRST, html);
- mockConnection.setResponse(new URL(URL_FIRST.toExternalForm() + "myJs.js"), "alert('hello');");
+ mockConnection.setResponse(new URL(URL_FIRST, "myJs.js"), "alert('hello');");
webClient.setWebConnection(mockConnection);
final List<String> collectedAlerts = new ArrayList<>();
|
