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:20:44 UTC

svn commit: r1437579 - in /httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http: concurrent/ config/ impl/ pool/ protocol/ util/

Author: ggregory
Date: Wed Jan 23 17:20:43 2013
New Revision: 1437579

URL: http://svn.apache.org/viewvc?rev=1437579&view=rev
Log:
JUnit 3 -> 4: replace import of junit.framework.Assert with org.junit.Assert.

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/TestBasicFuture.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/config/TestRegistry.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestNoConnectionReuseStrategy.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestPoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestArgs.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/TestBasicFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/TestBasicFuture.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/TestBasicFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/TestBasicFuture.java Wed Jan 23 17:20:43 2013
@@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionExc
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/config/TestRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/config/TestRegistry.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/config/TestRegistry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/config/TestRegistry.java Wed Jan 23 17:20:43 2013
@@ -26,7 +26,7 @@
  */
 package org.apache.http.config;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestNoConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestNoConnectionReuseStrategy.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestNoConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestNoConnectionReuseStrategy.java Wed Jan 23 17:20:43 2013
@@ -27,7 +27,7 @@
 
 package org.apache.http.impl;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.protocol.HttpContext;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestConnPool.java Wed Jan 23 17:20:43 2013
@@ -32,7 +32,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpConnection;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestPoolEntry.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestPoolEntry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestPoolEntry.java Wed Jan 23 17:20:43 2013
@@ -29,7 +29,7 @@ package org.apache.http.pool;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpConnection;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/pool/TestRouteSpecificPool.java Wed Jan 23 17:20:43 2013
@@ -28,7 +28,7 @@ package org.apache.http.pool;
 
 import java.io.IOException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpConnection;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java Wed Jan 23 17:20:43 2013
@@ -30,7 +30,7 @@ package org.apache.http.protocol;
 import java.util.LinkedList;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.http.HttpRequestInterceptor;
 import org.junit.Test;

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestArgs.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestArgs.java?rev=1437579&r1=1437578&r2=1437579&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestArgs.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestArgs.java Wed Jan 23 17:20:43 2013
@@ -31,7 +31,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;