Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed references to deprecated JUnit classes 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1602394 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2014-06-13 12:01:06 +00:00
parent dc0642e094
commit 4709d85aaf
6 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
View File

@ -27,8 +27,8 @@
package org.apache.http.client.config;
import junit.framework.Assert;
import org.apache.http.HttpHost;
import org.junit.Assert;
import org.junit.Test;
import java.net.InetAddress;

3
httpclient/src/test/java/org/apache/http/impl/client/TestFutureRequestExecutionService.java
View File

@ -40,8 +40,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.Assert;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
@ -55,6 +53,7 @@ import org.apache.http.localserver.LocalTestServer;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

3
httpclient/src/test/java/org/apache/http/impl/client/integration/TestBasicConnectionManager.java
View File

@ -26,8 +26,6 @@
*/
package org.apache.http.impl.client.integration;
import junit.framework.Assert;
import org.apache.http.HttpHost;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@ -36,6 +34,7 @@ import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.apache.http.localserver.LocalTestServer;
import org.apache.http.util.EntityUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

7
httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
View File

@ -26,8 +26,6 @@
*/
package org.apache.http.impl.execchain;
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InterruptedIOException;
@ -56,6 +54,7 @@ import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.impl.conn.ConnectionShutdownException;
import org.apache.http.message.BasicHttpResponse;
import org.apache.http.protocol.HttpRequestExecutor;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
@ -63,8 +62,6 @@ import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import junit.framework.Assert;
@SuppressWarnings({"boxing","static-access"}) // test code
public class TestMinimalClientExec {
@ -360,6 +357,6 @@ public class TestMinimalClientExec {
final ArgumentCaptor<HttpRequest> reqCaptor = ArgumentCaptor.forClass(HttpRequest.class);
Mockito.verify(requestExecutor).execute(reqCaptor.capture(), Mockito.<HttpClientConnection>any(), Mockito.<HttpClientContext>any());
assertEquals("/test", reqCaptor.getValue().getRequestLine().getUri());
Assert.assertEquals("/test", reqCaptor.getValue().getRequestLine().getUri());
}
}

3
httpclient/src/test/java/org/apache/http/impl/execchain/TestRedirectExec.java
View File

@ -26,8 +26,6 @@
*/
package org.apache.http.impl.execchain;
import junit.framework.Assert;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
@ -52,6 +50,7 @@ import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.auth.NTLMScheme;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;

3
httpclient/src/test/java/org/apache/http/impl/execchain/TestRetryExec.java
View File

@ -26,8 +26,6 @@
*/
package org.apache.http.impl.execchain;
import junit.framework.Assert;
import org.apache.http.Header;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpHost;
@ -41,6 +39,7 @@ import org.apache.http.client.methods.HttpRequestWrapper;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.protocol.HttpContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;