natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #23

This commit is contained in:
Nicolas Lalevée 2017-05-21 19:34:52 +02:00
parent 7fc5eee60b c1ad21bf96
commit 7a4bad0561
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/org/apache/ivy/util/url/BasicURLHandler.java
View File

@ -64,6 +64,7 @@ public class BasicURLHandler extends AbstractURLHandler {
try {
url = normalizeToURL(url);
con = url.openConnection();
con.setConnectTimeout(timeout);
con.setRequestProperty("User-Agent", getUserAgent());
if (con instanceof HttpURLConnection) {
HttpURLConnection httpCon = (HttpURLConnection) con;

11
test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
View File

@ -45,15 +45,16 @@ public class BasicURLHandlerTest extends TestCase {
}
public void testIsReachable() throws Exception {
assertTrue(handler.isReachable(new URL("http://www.google.fr/")));
assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html")));
final int connectionTimeoutInMillis = 15000; // 15 seconds
assertTrue(handler.isReachable(new URL("http://www.google.fr/"), connectionTimeoutInMillis));
assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html"), connectionTimeoutInMillis));
assertTrue(handler.isReachable(new File("build.xml").toURI().toURL()));
assertFalse(handler.isReachable(new File("unknownfile.xml").toURI().toURL()));
assertTrue(handler.isReachable(new File("build.xml").toURI().toURL(), connectionTimeoutInMillis));
assertFalse(handler.isReachable(new File("unknownfile.xml").toURI().toURL(), connectionTimeoutInMillis));
// to test ftp we should know of an anonymous ftp site... !
// assertTrue(handler.isReachable(new URL("ftp://ftp.mozilla.org/pub/dir.sizes")));
assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file")));
assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file"), connectionTimeoutInMillis));
}
public void testContentEncoding() throws Exception {