Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 85903 invoked from network); 21 Apr 2010 11:20:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Apr 2010 11:20:48 -0000 Received: (qmail 80390 invoked by uid 500); 21 Apr 2010 11:20:48 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 80351 invoked by uid 500); 21 Apr 2010 11:20:47 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 80318 invoked by uid 99); 21 Apr 2010 11:20:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Apr 2010 11:20:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Apr 2010 11:20:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5385323889D2; Wed, 21 Apr 2010 11:19:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r936257 - in /httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http: impl/ impl/entity/ impl/io/ message/ params/ protocol/ util/ Date: Wed, 21 Apr 2010 11:19:54 -0000 To: commits@hc.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100421111955.5385323889D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Wed Apr 21 11:19:53 2010 New Revision: 936257 URL: http://svn.apache.org/viewvc?rev=936257&view=rev Log: No need for main() and suite() methods in Test classes Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestBasicRequest.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestEnglishReasonPhraseCatalog.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderElementIterator.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderIterator.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueFormatter.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueParser.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineFormatter.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineParser.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicTokenIterator.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeader.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderElement.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestNameValuePair.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestExceptionUtils.java httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestLangUtils.java Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestBasicRequest.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestBasicRequest.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestBasicRequest.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestBasicRequest.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.impl; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpRequest; import org.apache.http.HttpVersion; @@ -42,18 +40,6 @@ public class TestBasicRequest extends Te super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestBasicRequest.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicRequest.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testConstructor() throws Exception { new BasicHttpRequest("GET", "/stuff"); new BasicHttpRequest("GET", "/stuff", HttpVersion.HTTP_1_1); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Wed Apr 21 11:19:53 2010 @@ -27,6 +27,8 @@ package org.apache.http.impl; +import junit.framework.TestCase; + import org.apache.http.ConnectionReuseStrategy; import org.apache.http.HttpConnection; import org.apache.http.HttpConnectionMetrics; @@ -36,13 +38,9 @@ import org.apache.http.StatusLine; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.message.BasicHttpResponse; import org.apache.http.message.BasicStatusLine; -import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.apache.http.protocol.HttpContext; public class TestDefaultConnectionReuseStrategy extends TestCase { @@ -61,12 +59,6 @@ public class TestDefaultConnectionReuseS super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestDefaultConnectionReuseStrategy.class); - } - public void setUp() { // open and not stale is required for most of the tests here mockConnection = new MockConnection(true, false); @@ -79,12 +71,7 @@ public class TestDefaultConnectionReuseS mockConnection = null; } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestDefaultConnectionReuseStrategy.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } + // ------------------------------------------------------- TestCase Methods public void testIllegalResponseArg() throws Exception { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestEnglishReasonPhraseCatalog.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestEnglishReasonPhraseCatalog.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestEnglishReasonPhraseCatalog.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestEnglishReasonPhraseCatalog.java Wed Apr 21 11:19:53 2010 @@ -27,8 +27,11 @@ package org.apache.http.impl; -import junit.framework.*; -import java.lang.reflect.*; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +import junit.framework.TestCase; import org.apache.http.HttpStatus; @@ -45,19 +48,6 @@ public class TestEnglishReasonPhraseCata super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestEnglishReasonPhraseCatalog.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestEnglishReasonPhraseCatalog.class); - } - - // ----------------------------------------------------------- Test Methods public void testReasonPhrases() throws IllegalAccessException { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/TestSessionBuffers.java Wed Apr 21 11:19:53 2010 @@ -32,14 +32,12 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; -import org.apache.http.io.HttpTransportMetrics; -import org.apache.http.params.BasicHttpParams; +import org.apache.http.io.HttpTransportMetrics; import org.apache.http.mockup.SessionInputBufferMockup; import org.apache.http.mockup.SessionOutputBufferMockup; +import org.apache.http.params.BasicHttpParams; import org.apache.http.params.CoreConnectionPNames; import org.apache.http.params.HttpParams; import org.apache.http.params.HttpProtocolParams; @@ -52,18 +50,6 @@ public class TestSessionBuffers extends super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestSessionBuffers.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestSessionBuffers.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testInit() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); new SessionOutputBufferMockup(out); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.impl.entity; import java.io.InputStream; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpEntity; import org.apache.http.HttpMessage; @@ -40,8 +38,8 @@ import org.apache.http.impl.io.ChunkedIn import org.apache.http.impl.io.ContentLengthInputStream; import org.apache.http.impl.io.IdentityInputStream; import org.apache.http.io.SessionInputBuffer; -import org.apache.http.mockup.SessionInputBufferMockup; import org.apache.http.mockup.HttpMessageMockup; +import org.apache.http.mockup.SessionInputBufferMockup; import org.apache.http.params.CoreProtocolPNames; public class TestEntityDeserializer extends TestCase { @@ -50,18 +48,6 @@ public class TestEntityDeserializer exte super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestEntityDeserializer.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestEntityDeserializer.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testIllegalGenerateArg() throws Exception { EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.impl.entity; import java.io.OutputStream; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpMessage; import org.apache.http.HttpVersion; @@ -41,8 +39,8 @@ import org.apache.http.impl.io.ChunkedOu import org.apache.http.impl.io.ContentLengthOutputStream; import org.apache.http.impl.io.IdentityOutputStream; import org.apache.http.io.SessionOutputBuffer; -import org.apache.http.mockup.SessionOutputBufferMockup; import org.apache.http.mockup.HttpMessageMockup; +import org.apache.http.mockup.SessionOutputBufferMockup; import org.apache.http.params.CoreProtocolPNames; public class TestEntitySerializer extends TestCase { @@ -51,18 +49,6 @@ public class TestEntitySerializer extend super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestEntitySerializer.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestEntitySerializer.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testIllegalGenerateArg() throws Exception { EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.impl.entity; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpMessage; import org.apache.http.ProtocolException; @@ -43,18 +41,6 @@ public class TestLaxContentLengthStrateg super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestLaxContentLengthStrategy.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestLaxContentLengthStrategy.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testEntityWithTransferEncoding() throws Exception { ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy(); HttpMessage message = new HttpMessageMockup(); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.impl.entity; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpMessage; import org.apache.http.HttpVersion; @@ -44,18 +42,6 @@ public class TestStrictContentLengthStra super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestStrictContentLengthStrategy.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestStrictContentLengthStrategy.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testEntityWithChunkTransferEncoding() throws Exception { ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy(); HttpMessage message = new HttpMessageMockup(); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestChunkCoding.java Wed Apr 21 11:19:53 2010 @@ -33,20 +33,16 @@ import java.io.InputStream; import java.io.InterruptedIOException; import java.io.OutputStream; +import junit.framework.TestCase; + import org.apache.http.Header; import org.apache.http.MalformedChunkCodingException; -import org.apache.http.impl.io.ChunkedInputStream; -import org.apache.http.impl.io.ChunkedOutputStream; import org.apache.http.io.SessionInputBuffer; import org.apache.http.mockup.SessionInputBufferMockup; import org.apache.http.mockup.SessionOutputBufferMockup; import org.apache.http.mockup.TimeoutByteArrayInputStream; import org.apache.http.util.EncodingUtils; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - public class TestChunkCoding extends TestCase { private static final String CONTENT_CHARSET = "ISO-8859-1"; @@ -55,18 +51,6 @@ public class TestChunkCoding extends Tes super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestChunkCoding.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestChunkCoding.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testConstructors() throws Exception { try { new ChunkedInputStream((SessionInputBuffer)null); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthInputStream.java Wed Apr 21 11:19:53 2010 @@ -31,32 +31,17 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.http.impl.io.ContentLengthInputStream; +import junit.framework.TestCase; + import org.apache.http.mockup.SessionInputBufferMockup; import org.apache.http.util.EncodingUtils; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - public class TestContentLengthInputStream extends TestCase { public TestContentLengthInputStream(String testName) { super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestContentLengthInputStream.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestContentLengthInputStream.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - private static final String CONTENT_CHARSET = "ISO-8859-1"; public void testConstructors() throws Exception { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestContentLengthOutputStream.java Wed Apr 21 11:19:53 2010 @@ -31,12 +31,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.http.impl.io.ContentLengthOutputStream; -import org.apache.http.mockup.SessionOutputBufferMockup; - -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; + +import org.apache.http.mockup.SessionOutputBufferMockup; public class TestContentLengthOutputStream extends TestCase { @@ -44,18 +41,6 @@ public class TestContentLengthOutputStre super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestContentLengthOutputStream.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestContentLengthOutputStream.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testConstructors() throws Exception { new ContentLengthOutputStream(new SessionOutputBufferMockup(), 10L); try { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityInputStream.java Wed Apr 21 11:19:53 2010 @@ -27,14 +27,11 @@ package org.apache.http.impl.io; -import org.apache.http.impl.io.IdentityInputStream; +import junit.framework.TestCase; + import org.apache.http.io.SessionInputBuffer; import org.apache.http.mockup.SessionInputBufferMockup; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Simple tests for {@link IdentityInputStream}. * @@ -46,18 +43,8 @@ public class TestIdentityInputStream ext super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestIdentityInputStream.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestIdentityInputStream.class); - } - public void testConstructor() throws Exception { SessionInputBuffer receiver = new SessionInputBufferMockup(new byte[] {}); new IdentityInputStream(receiver); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestIdentityOutputStream.java Wed Apr 21 11:19:53 2010 @@ -31,12 +31,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.http.impl.io.IdentityOutputStream; -import org.apache.http.mockup.SessionOutputBufferMockup; - -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; + +import org.apache.http.mockup.SessionOutputBufferMockup; public class TestIdentityOutputStream extends TestCase { @@ -44,18 +41,6 @@ public class TestIdentityOutputStream ex super(testName); } - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestIdentityOutputStream.class); - } - - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestIdentityOutputStream.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testConstructors() throws Exception { new IdentityOutputStream(new SessionOutputBufferMockup()); try { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestMessageParser.java Wed Apr 21 11:19:53 2010 @@ -29,6 +29,8 @@ package org.apache.http.impl.io; import java.io.IOException; +import junit.framework.TestCase; + import org.apache.http.Header; import org.apache.http.HeaderElement; import org.apache.http.NameValuePair; @@ -37,10 +39,6 @@ import org.apache.http.io.SessionInputBu import org.apache.http.message.BufferedHeader; import org.apache.http.mockup.SessionInputBufferMockup; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Unit tests for {@link AbstractMessageParser}. */ @@ -50,15 +48,6 @@ public class TestMessageParser extends T super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestMessageParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestMessageParser.class); - } - public void testInvalidInput() throws Exception { try { // the first argument must not be null Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java Wed Apr 21 11:19:53 2010 @@ -33,9 +33,7 @@ package org.apache.http.impl.io; import java.io.InterruptedIOException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.ConnectionClosedException; import org.apache.http.Header; @@ -58,15 +56,6 @@ public class TestRequestParser extends T super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestRequestParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestRequestParser.class); - } - public void testInvalidConstructorInput() throws Exception { try { new HttpRequestParser( Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.impl.io; import java.io.InterruptedIOException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -54,15 +52,6 @@ public class TestResponseParser extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestResponseParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestResponseParser.class); - } - public void testInvalidConstructorInput() throws Exception { try { new HttpResponseParser( Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java Wed Apr 21 11:19:53 2010 @@ -27,16 +27,14 @@ package org.apache.http.message; +import junit.framework.TestCase; + import org.apache.http.Header; import org.apache.http.HttpMessage; -import org.apache.http.params.BasicHttpParams; import org.apache.http.mockup.HttpMessageMockup; +import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpParams; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Unit tests for {@link Header}. * @@ -47,15 +45,6 @@ public class TestAbstractMessage extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestAbstractMessage.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestAbstractMessage.class); - } - public void testBasicProperties() { HttpMessage message = new HttpMessageMockup(); assertNotNull(message.getParams()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderElementIterator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderElementIterator.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderElementIterator.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderElementIterator.java Wed Apr 21 11:19:53 2010 @@ -29,16 +29,11 @@ package org.apache.http.message; import java.util.NoSuchElementException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HeaderElement; import org.apache.http.HeaderElementIterator; -import org.apache.http.message.BasicHeader; -import org.apache.http.message.BasicHeaderElementIterator; -import org.apache.http.message.BasicHeaderIterator; /** * Tests for {@link BasicHeaderElementIterator}. @@ -51,17 +46,6 @@ public class TestBasicHeaderElementItera super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicHeaderElementIterator.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicHeaderElementIterator.class); - } - public void testMultiHeader() { Header[] headers = new Header[]{ new BasicHeader("Name", "value0"), Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderIterator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderIterator.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderIterator.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderIterator.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.message; import java.util.NoSuchElementException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HeaderIterator; @@ -48,20 +46,8 @@ public class TestBasicHeaderIterator ext super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicHeaderIterator.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicHeaderIterator.class); - } - - - public void testAllSame() { Header[] headers = new Header[]{ new BasicHeader("Name", "value0"), Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueFormatter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueFormatter.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueFormatter.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueFormatter.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HeaderElement; import org.apache.http.NameValuePair; @@ -48,21 +46,8 @@ public class TestBasicHeaderValueFormatt super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { - TestBasicHeaderValueFormatter.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicHeaderValueFormatter.class); - } - - - public void testNVPFormatting() throws Exception { NameValuePair param1 = new BasicNameValuePair("param", "regular_stuff"); NameValuePair param2 = new BasicNameValuePair("param", "this\\that"); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueParser.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicHeaderValueParser.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HeaderElement; import org.apache.http.NameValuePair; @@ -49,19 +47,8 @@ public class TestBasicHeaderValueParser super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicHeaderValueParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicHeaderValueParser.class); - } - - public void testParseHeaderElements() throws Exception { String headerValue = "name1 = value1; name2; name3=\"value3\" , name4=value4; " + "name5=value5, name6= ; name7 = value7; name8 = \" value8\""; Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineFormatter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineFormatter.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineFormatter.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineFormatter.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HttpStatus; @@ -50,20 +48,8 @@ public class TestBasicLineFormatter exte super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicLineFormatter.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicLineFormatter.class); - } - - - public void testHttpVersionFormatting() throws Exception { String s = BasicLineFormatter.formatProtocolVersion (HttpVersion.HTTP_1_1, null); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineParser.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineParser.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicLineParser.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpVersion; import org.apache.http.ParseException; @@ -49,19 +47,8 @@ public class TestBasicLineParser extends super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicLineParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicLineParser.class); - } - - public void testRLParseSuccess() throws Exception { //typical request line RequestLine requestline = BasicLineParser.parseRequestLine Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -50,15 +48,6 @@ public class TestBasicMessages extends T super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestBasicMessages.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestBasicMessages.class); - } - public void testDefaultResponseConstructors() { HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_BAD_REQUEST, "Bad Request"); assertNotNull(response.getProtocolVersion()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicTokenIterator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicTokenIterator.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicTokenIterator.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicTokenIterator.java Wed Apr 21 11:19:53 2010 @@ -29,14 +29,12 @@ package org.apache.http.message; import java.util.NoSuchElementException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HeaderIterator; -import org.apache.http.TokenIterator; import org.apache.http.ParseException; +import org.apache.http.TokenIterator; /** @@ -50,19 +48,8 @@ public class TestBasicTokenIterator exte super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestBasicTokenIterator.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestBasicTokenIterator.class); - } - - public void testSingleHeader() { Header[] headers = new Header[]{ new BasicHeader("Name", "token0,token1, token2 , token3") Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeader.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeader.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeader.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeader.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HeaderElement; @@ -44,15 +42,6 @@ public class TestHeader extends TestCase super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestHeader.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestHeader.class); - } - public void testBasicConstructor() { Header header = new BasicHeader("name", "value"); assertEquals("name", header.getName()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderElement.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderElement.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderElement.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderElement.java Wed Apr 21 11:19:53 2010 @@ -30,9 +30,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HeaderElement; import org.apache.http.NameValuePair; @@ -49,18 +47,8 @@ public class TestHeaderElement extends T super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestHeaderElement.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestHeaderElement.class); - } - public void testConstructor3() throws Exception { HeaderElement element = new BasicHeaderElement("name", "value", new NameValuePair[] { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestHeaderGroup.java Wed Apr 21 11:19:53 2010 @@ -29,13 +29,9 @@ package org.apache.http.message; import java.util.Iterator; -import org.apache.http.Header; -import org.apache.http.message.BasicHeader; -import org.apache.http.message.HeaderGroup; - -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; + +import org.apache.http.Header; /** * Unit tests for {@link HeaderGroup}. @@ -47,15 +43,6 @@ public class TestHeaderGroup extends Tes super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestHeaderGroup.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestHeaderGroup.class); - } - public void testConstructor() { HeaderGroup headergroup = new HeaderGroup(); assertNotNull(headergroup.getAllHeaders()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestNameValuePair.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestNameValuePair.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestNameValuePair.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestNameValuePair.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.NameValuePair; @@ -43,15 +41,6 @@ public class TestNameValuePair extends T super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestNameValuePair.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestNameValuePair.class); - } - public void testConstructor() { NameValuePair param = new BasicNameValuePair("name", "value"); assertEquals("name", param.getName()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestRequestLine.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpVersion; import org.apache.http.RequestLine; @@ -46,18 +44,8 @@ public class TestRequestLine extends Tes super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestRequestLine.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestRequestLine.class); - } - public void testConstructor() { RequestLine requestline = new BasicRequestLine("GET", "/stuff", HttpVersion.HTTP_1_1); assertEquals("GET", requestline.getMethod()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestStatusLine.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.message; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; @@ -48,21 +46,6 @@ public class TestStatusLine extends Test super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestStatusLine.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - // ------------------------------------------------------- TestCase Methods - - public static Test suite() { - return new TestSuite(TestStatusLine.class); - } - - // ------------------------------------------------------ Protected Methods - - // ----------------------------------------------------------- Test Methods public void testConstructor() { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.params; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link BasicHttpParams}. @@ -41,15 +39,6 @@ public class TestBasicHttpParams extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestBasicHttpParams.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestBasicHttpParams.class); - } - public void testRemoveParam() { BasicHttpParams params = new BasicHttpParams(); params.setParameter("param1", "paramValue1"); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestBasicHttpProcessor.java Wed Apr 21 11:19:53 2010 @@ -29,9 +29,7 @@ package org.apache.http.protocol; import java.io.IOException; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.HttpException; import org.apache.http.HttpRequest; @@ -54,18 +52,8 @@ public class TestBasicHttpProcessor exte super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestHttpExecutionContext.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestHttpExecutionContext.class); - } - public void testAddFirstRequestInterceptorNull() { HttpRequestInterceptor itcp = null; BasicHttpProcessor instance = new BasicHttpProcessor(); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpExecutionContext.java Wed Apr 21 11:19:53 2010 @@ -27,8 +27,7 @@ package org.apache.http.protocol; -import junit.framework.*; - +import junit.framework.TestCase; // the name of this test is historic, the implementation classes of HttpContext // have been renamed to BasicHttpContext and SyncBasicHttpContext @@ -39,18 +38,8 @@ public class TestHttpExecutionContext ex super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestHttpExecutionContext.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestHttpExecutionContext.class); - } - public void testContextOperations() { HttpContext parentContext = new SyncBasicHttpContext(null); HttpContext currentContext = new SyncBasicHttpContext(parentContext); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestHandlerRegistry.java Wed Apr 21 11:19:53 2010 @@ -31,14 +31,12 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import junit.framework.TestCase; + import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** */ public class TestHttpRequestHandlerRegistry extends TestCase { @@ -47,15 +45,6 @@ public class TestHttpRequestHandlerRegis super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestHttpRequestHandlerRegistry.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestHttpRequestHandlerRegistry.class); - } - private static class DummyHttpRequestHandler implements HttpRequestHandler { public void handle( Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpServiceAndExecutor.java Wed Apr 21 11:19:53 2010 @@ -38,6 +38,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import junit.framework.TestCase; + import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; @@ -59,7 +61,6 @@ import org.apache.http.params.CoreProtoc import org.apache.http.util.EncodingUtils; import org.apache.http.util.EntityUtils; -import junit.framework.*; import org.apache.http.HttpConnectionMetrics; public class TestHttpServiceAndExecutor extends TestCase { @@ -69,18 +70,8 @@ public class TestHttpServiceAndExecutor super(testName); } - // ------------------------------------------------------------------- Main - public static void main(String args[]) { - String[] testCaseName = { TestHttpServiceAndExecutor.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - // ------------------------------------------------------- TestCase Methods - public static Test suite() { - return new TestSuite(TestHttpServiceAndExecutor.class); - } - private TestHttpServer server; private TestHttpClient client; Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.protocol; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.http.Header; import org.apache.http.HttpHost; @@ -53,15 +51,6 @@ public class TestStandardInterceptors ex super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestStandardInterceptors.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestStandardInterceptors.class); - } - public void testRequestConnControlGenerated() throws Exception { HttpContext context = new BasicHttpContext(null); BasicHttpRequest request = new BasicHttpRequest("GET", "/"); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestByteArrayBuffer.java Wed Apr 21 11:19:53 2010 @@ -27,12 +27,7 @@ package org.apache.http.util; -import org.apache.http.util.ByteArrayBuffer; -import org.apache.http.util.CharArrayBuffer; - -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link ByteArrayBuffer}. @@ -44,15 +39,6 @@ public class TestByteArrayBuffer extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestByteArrayBuffer.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestByteArrayBuffer.class); - } - public void testConstructor() throws Exception { ByteArrayBuffer buffer = new ByteArrayBuffer(16); assertEquals(16, buffer.capacity()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestCharArrayBuffer.java Wed Apr 21 11:19:53 2010 @@ -27,12 +27,7 @@ package org.apache.http.util; -import org.apache.http.util.ByteArrayBuffer; -import org.apache.http.util.CharArrayBuffer; - -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link CharArrayBuffer}. @@ -44,15 +39,6 @@ public class TestCharArrayBuffer extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestCharArrayBuffer.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestCharArrayBuffer.class); - } - public void testConstructor() throws Exception { CharArrayBuffer buffer = new CharArrayBuffer(16); assertEquals(16, buffer.capacity()); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEncodingUtils.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.util; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link TestEncodingUtils}. @@ -41,15 +39,6 @@ public class TestEncodingUtils extends T super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestEncodingUtils.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestEncodingUtils.class); - } - private static String constructString(int [] unicodeChars) { StringBuffer buffer = new StringBuffer(); if (unicodeChars != null) { Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java Wed Apr 21 11:19:53 2010 @@ -27,17 +27,15 @@ package org.apache.http.util; -import java.io.InputStream; import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import junit.framework.TestCase; import org.apache.http.Header; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.message.BasicHeader; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Unit tests for {@link EntityUtils}. * @@ -48,15 +46,6 @@ public class TestEntityUtils extends Tes super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestEntityUtils.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestEntityUtils.class); - } - public void testNullEntityToByteArray() throws Exception { try { EntityUtils.toByteArray(null); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestExceptionUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestExceptionUtils.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestExceptionUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestExceptionUtils.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.util; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link TestExceptionUtils}. @@ -41,15 +39,6 @@ public class TestExceptionUtils extends super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestExceptionUtils.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestExceptionUtils.class); - } - public void testExceptionChaining() throws Exception { Exception ex1 = new Exception(); Exception ex2 = new Exception(); Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestLangUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestLangUtils.java?rev=936257&r1=936256&r2=936257&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestLangUtils.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestLangUtils.java Wed Apr 21 11:19:53 2010 @@ -27,9 +27,7 @@ package org.apache.http.util; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Unit tests for {@link LangUtils}. @@ -41,15 +39,6 @@ public class TestLangUtils extends TestC super(testName); } - public static void main(String args[]) { - String[] testCaseName = { TestLangUtils.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestLangUtils.class); - } - public void testBasicHash() { Integer i = new Integer(1234); int h1 = LangUtils.hashCode(LangUtils.HASH_SEED, i.hashCode());