Updated timeout test to account for changed exception generation in httpclient:4.3.x (cf. HTTPCLIENT-1362)
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/57c56f92 Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/57c56f92 Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/57c56f92 Branch: refs/heads/master Commit: 57c56f92b8faca575562b0887fd9711a4097e4cc Parents: e171c21 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Mon Nov 10 23:24:46 2014 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Mon Nov 10 23:24:46 2014 +0100 ---------------------------------------------------------------------- .../org/eclipse/aether/transport/http/HttpTransporterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/57c56f92/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java ---------------------------------------------------------------------- diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java index 50d4fee..50e4e8b 100644 --- a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java +++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.*; import java.io.File; import java.io.FileNotFoundException; +import java.net.ConnectException; import java.net.ServerSocket; import java.net.SocketTimeoutException; import java.net.URI; @@ -23,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.http.client.HttpResponseException; import org.apache.http.conn.ConnectTimeoutException; -import org.apache.http.conn.HttpHostConnectException; import org.apache.http.pool.ConnPoolControl; import org.apache.http.pool.PoolStats; import org.eclipse.aether.ConfigurationProperties; @@ -1033,7 +1033,7 @@ public class HttpTransporterTest { assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) ); } - catch ( HttpHostConnectException e ) + catch ( ConnectException e ) { assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) ); }
