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-resolver/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-resolver/commit/8f0a04dd Tree: http://git-wip-us.apache.org/repos/asf/maven-resolver/tree/8f0a04dd Diff: http://git-wip-us.apache.org/repos/asf/maven-resolver/diff/8f0a04dd Branch: refs/heads/master Commit: 8f0a04dd7bf326121ecaf86476e4817e799987ae Parents: d171401 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Tue Nov 11 15:09:51 2014 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Tue Nov 11 15:09:51 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-resolver/blob/8f0a04dd/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 1c85c38..8027bcb 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; @@ -975,7 +975,7 @@ public class HttpTransporterTest { assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) ); } - catch ( HttpHostConnectException e ) + catch ( ConnectException e ) { assertEquals( Transporter.ERROR_OTHER, transporter.classify( e ) ); }
