JUnit 3 -> 4: replace import of junit.framework.Assert with org.junit…

….Assert. git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1437577 13f79535-47bb-0310-9956-ffa450edef68
jillesvangurp · Jan 23, 2013 · 79c1aa0 · 79c1aa0
1 parent 846f34d
commit 79c1aa0
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java b/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java
@@ -32,7 +32,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java
@@ -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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
@@ -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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java
@@ -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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java
@@ -29,7 +29,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
@@ -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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java
@@ -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;

diff --git a/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java b/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java
@@ -28,7 +28,7 @@
 
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseInterceptor;

diff --git a/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java b/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java b/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java
@@ -29,7 +29,7 @@
 
 import java.io.InputStream;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java b/httpclient/src/test/java/org/apache/http/impl/client/TestCloseableHttpClient.java
@@ -29,7 +29,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java b/httpclient/src/test/java/org/apache/http/impl/client/TestInternalHttpClient.java
@@ -30,7 +30,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java b/httpclient/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java
@@ -30,7 +30,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java b/httpclient/src/test/java/org/apache/http/impl/execchain/TestConnectionHolder.java
@@ -29,7 +29,7 @@
 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;

diff --git a/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java b/httpclient/src/test/java/org/apache/http/impl/execchain/TestResponseEntityWrapper.java
@@ -31,7 +31,7 @@
 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;