You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/23 18:19:47 UTC
svn commit: r1437577 - in
/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http:
client/entity/ client/protocol/ conn/ impl/client/ impl/cookie/
impl/execchain/
Author: ggregory
Date: Wed Jan 23 17:19:46 2013
New Revision: 1437577
URL: http://svn.apache.org/viewvc?rev=1437577&view=rev
Log:
JUnit 3 -> 4: replace import of junit.framework.Assert with org.junit.Assert.
Modified:
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java Wed Jan 23 17:19:46 2013
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.atomic.AtomicBoolean;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java Wed Jan 23 17:19:46 2013
@@ -26,7 +26,7 @@
*/
package org.apache.http.client.protocol;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.Header;
import org.apache.http.HttpRequest;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java Wed Jan 23 17:19:46 2013
@@ -26,7 +26,7 @@
*/
package org.apache.http.client.protocol;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java Wed Jan 23 17:19:46 2013
@@ -26,7 +26,7 @@
*/
package org.apache.http.client.protocol;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.Header;
import org.apache.http.HttpHost;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java Wed Jan 23 17:19:46 2013
@@ -29,7 +29,7 @@ package org.apache.http.client.protocol;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.Header;
import org.apache.http.HttpRequest;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java Wed Jan 23 17:19:46 2013
@@ -26,7 +26,7 @@
*/
package org.apache.http.client.protocol;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java Wed Jan 23 17:19:46 2013
@@ -26,7 +26,7 @@
*/
package org.apache.http.client.protocol;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java Wed Jan 23 17:19:46 2013
@@ -28,7 +28,7 @@ package org.apache.http.client.protocol;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java Wed Jan 23 17:19:46 2013
@@ -29,7 +29,7 @@ package org.apache.http.conn;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java Wed Jan 23 17:19:46 2013
@@ -29,7 +29,7 @@ package org.apache.http.impl.client;
import java.io.InputStream;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java Wed Jan 23 17:19:46 2013
@@ -29,7 +29,7 @@ package org.apache.http.impl.client;
import java.io.IOException;
import java.io.InputStream;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java Wed Jan 23 17:19:46 2013
@@ -30,7 +30,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.Arrays;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java Wed Jan 23 17:19:46 2013
@@ -30,7 +30,7 @@ package org.apache.http.impl.cookie;
import java.io.InputStreamReader;
import java.io.Reader;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.cookie.CookieOrigin;
import org.junit.Before;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java Wed Jan 23 17:19:46 2013
@@ -29,7 +29,7 @@ package org.apache.http.impl.execchain;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.logging.Log;
import org.apache.http.HttpClientConnection;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java?rev=1437577&r1=1437576&r2=1437577&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java Wed Jan 23 17:19:46 2013
@@ -31,7 +31,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.SocketException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.http.HttpEntity;
import org.apache.http.util.EntityUtils;