From 79c1aa0b5df7bb19e1874b7fa45d05c8fa8aea0f Mon Sep 17 00:00:00 2001 From: "Gary D. Gregory" Date: Wed, 23 Jan 2013 17:19:46 +0000 Subject: [PATCH] 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 --- .../src/test/java/org/apache/http/client/entity/TestGZip.java | 2 +- .../apache/http/client/protocol/TestRequestAcceptEncoding.java | 2 +- .../org/apache/http/client/protocol/TestRequestAuthCache.java | 2 +- .../http/client/protocol/TestRequestClientConnControl.java | 2 +- .../apache/http/client/protocol/TestRequestDefaultHeaders.java | 2 +- .../org/apache/http/client/protocol/TestResponseAuthCache.java | 2 +- .../http/client/protocol/TestResponseContentEncoding.java | 2 +- .../apache/http/client/protocol/TestResponseProcessCookies.java | 2 +- .../java/org/apache/http/conn/TestEofSensorInputStream.java | 2 +- .../org/apache/http/impl/client/TestBasicResponseHandler.java | 2 +- .../org/apache/http/impl/client/TestCloseableHttpClient.java | 2 +- .../org/apache/http/impl/client/TestInternalHttpClient.java | 2 +- .../org/apache/http/impl/cookie/TestPublicSuffixListParser.java | 2 +- .../org/apache/http/impl/execchain/TestConnectionHolder.java | 2 +- .../apache/http/impl/execchain/TestResponseEntityWrapper.java | 2 +- 15 files changed, 15 insertions(+), 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 index 9514e8fd6..23553f34d 100644 --- 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.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; 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 index a227146fe..01b98c950 100644 --- 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 index 2a45fc5ec..43b650189 100644 --- 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 index 756b7da01..d3290ffbf 100644 --- 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 index acf634ce4..9421ba878 100644 --- 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 @@ 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; 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 index 1d6a8d41a..e33346323 100644 --- 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 index 93816fe78..2f3b48dbb 100644 --- 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 index 5ae95f284..710d5a011 100644 --- 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 @@ 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; diff --git a/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java b/httpclient/src/test/java/org/apache/http/conn/TestEofSensorInputStream.java index 3b0132cee..424a96a26 100644 --- 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 @@ 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; 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 index 043c64223..9757616b8 100644 --- 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 @@ 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; 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 index 44d7f4a75..a2be3ebb9 100644 --- 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 @@ 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; 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 index c0876479c..28dd66c39 100644 --- 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.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; 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 index a7129c798..9fea4fe94 100644 --- 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 @@ 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; 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 index 59354dae2..4cccadbed 100644 --- 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 @@ 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; 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 index 8a78d186b..7d9dc0a48 100644 --- 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.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;