You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/08/10 17:09:42 UTC
svn commit: r1512759 - in
/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl:
conn/TestBasicHttpClientConnectionManager.java
execchain/TestMainClientExec.java execchain/TestMinimalClientExec.java
Author: olegk
Date: Sat Aug 10 15:09:42 2013
New Revision: 1512759
URL: http://svn.apache.org/r1512759
Log:
Found possible cause of thread interruption during test suite execution
Modified:
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java?rev=1512759&r1=1512758&r2=1512759&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java Sat Aug 10 15:09:42 2013
@@ -49,7 +49,6 @@ import org.apache.http.conn.socket.Layer
import org.apache.http.protocol.HttpContext;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
@@ -207,7 +206,7 @@ public class TestBasicHttpClientConnecti
Mockito.eq(route2), Mockito.<ConnectionConfig>any());
}
- @Test @Ignore
+ @Test
public void testLeaseExpired() throws Exception {
final HttpHost target = new HttpHost("somehost");
final HttpRoute route = new HttpRoute(target);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java?rev=1512759&r1=1512758&r2=1512759&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java Sat Aug 10 15:09:42 2013
@@ -428,17 +428,6 @@ public class TestMainClientExec {
}
@Test(expected=RequestAbortedException.class)
- public void testExecConnectionRequestInterrupted() throws Exception {
- final HttpRoute route = new HttpRoute(target);
- final HttpClientContext context = new HttpClientContext();
- final HttpRequestWrapper request = HttpRequestWrapper.wrap(new HttpGet("http://bar/test"));
-
- Mockito.when(connRequest.get(Mockito.anyInt(), Mockito.<TimeUnit>any()))
- .thenThrow(new InterruptedException());
- mainClientExec.execute(route, request, context, execAware);
- }
-
- @Test(expected=RequestAbortedException.class)
public void testExecConnectionRequestFailed() throws Exception {
final HttpRoute route = new HttpRoute(target);
final HttpClientContext context = new HttpClientContext();
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java?rev=1512759&r1=1512758&r2=1512759&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java Sat Aug 10 15:09:42 2013
@@ -255,17 +255,6 @@ public class TestMinimalClientExec {
}
@Test(expected=RequestAbortedException.class)
- public void testExecConnectionRequestInterrupted() throws Exception {
- final HttpRoute route = new HttpRoute(target);
- final HttpClientContext context = new HttpClientContext();
- final HttpRequestWrapper request = HttpRequestWrapper.wrap(new HttpGet("http://bar/test"));
-
- Mockito.when(connRequest.get(Mockito.anyInt(), Mockito.<TimeUnit>any()))
- .thenThrow(new InterruptedException());
- minimalClientExec.execute(route, request, context, execAware);
- }
-
- @Test(expected=RequestAbortedException.class)
public void testExecConnectionRequestFailed() throws Exception {
final HttpRoute route = new HttpRoute(target);
final HttpClientContext context = new HttpClientContext();