Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 82596 invoked from network); 8 Nov 2006 17:59:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Nov 2006 17:59:51 -0000 Received: (qmail 11456 invoked by uid 500); 8 Nov 2006 18:00:02 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 11357 invoked by uid 99); 8 Nov 2006 18:00:01 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Nov 2006 10:00:01 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Nov 2006 09:59:48 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8C8C21A9846; Wed, 8 Nov 2006 09:59:21 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r472564 - in /jakarta/httpcomponents/httpcore/trunk/module-main/src: main/java/org/apache/http/impl/ main/java/org/apache/http/impl/entity/ test/java/org/apache/http/impl/entity/ Date: Wed, 08 Nov 2006 17:59:21 -0000 To: httpclient-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061108175921.8C8C21A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Wed Nov 8 09:59:20 2006 New Revision: 472564 URL: http://svn.apache.org/viewvc?view=rev&rev=472564 Log: Renamed some impl classes; Fixed a broken test case Added: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java - copied, changed from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntityDeserializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntitySerializer.java - copied, changed from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntitySerializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java - copied, changed from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntityDeserializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java - copied, changed from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntitySerializer.java Removed: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntityDeserializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntitySerializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntityDeserializer.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntitySerializer.java Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestAllEntityImpl.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?view=diff&rev=472564&r1=472563&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Wed Nov 8 09:59:20 2006 @@ -43,8 +43,8 @@ import org.apache.http.NoHttpResponseException; import org.apache.http.ProtocolException; import org.apache.http.StatusLine; -import org.apache.http.impl.entity.DefaultEntityDeserializer; -import org.apache.http.impl.entity.DefaultEntitySerializer; +import org.apache.http.impl.entity.EntityDeserializer; +import org.apache.http.impl.entity.EntitySerializer; import org.apache.http.impl.entity.LaxContentLengthStrategy; import org.apache.http.impl.entity.StrictContentLengthStrategy; import org.apache.http.io.CharArrayBuffer; @@ -74,8 +74,8 @@ private int maxHeaderCount = -1; private final CharArrayBuffer buffer; - private final DefaultEntitySerializer entityserializer; - private final DefaultEntityDeserializer entitydeserializer; + private final EntitySerializer entityserializer; + private final EntityDeserializer entitydeserializer; /* * Dependent interfaces @@ -87,9 +87,9 @@ public AbstractHttpClientConnection() { super(); this.buffer = new CharArrayBuffer(128); - this.entityserializer = new DefaultEntitySerializer( + this.entityserializer = new EntitySerializer( new StrictContentLengthStrategy()); - this.entitydeserializer = new DefaultEntityDeserializer( + this.entitydeserializer = new EntityDeserializer( new LaxContentLengthStrategy()); } Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java?view=diff&rev=472564&r1=472563&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java Wed Nov 8 09:59:20 2006 @@ -42,8 +42,8 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpServerConnection; import org.apache.http.RequestLine; -import org.apache.http.impl.entity.DefaultEntityDeserializer; -import org.apache.http.impl.entity.DefaultEntitySerializer; +import org.apache.http.impl.entity.EntityDeserializer; +import org.apache.http.impl.entity.EntitySerializer; import org.apache.http.impl.entity.LaxContentLengthStrategy; import org.apache.http.impl.entity.StrictContentLengthStrategy; import org.apache.http.io.CharArrayBuffer; @@ -71,8 +71,8 @@ private int maxHeaderCount = -1; private final CharArrayBuffer buffer; - private final DefaultEntitySerializer entityserializer; - private final DefaultEntityDeserializer entitydeserializer; + private final EntitySerializer entityserializer; + private final EntityDeserializer entitydeserializer; /* * Dependent interfaces @@ -84,9 +84,9 @@ public AbstractHttpServerConnection() { super(); this.buffer = new CharArrayBuffer(128); - this.entityserializer = new DefaultEntitySerializer( + this.entityserializer = new EntitySerializer( new StrictContentLengthStrategy()); - this.entitydeserializer = new DefaultEntityDeserializer( + this.entitydeserializer = new EntityDeserializer( new LaxContentLengthStrategy()); } Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java (from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntityDeserializer.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java?view=diff&rev=472564&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntityDeserializer.java&r1=472563&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntityDeserializer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java Wed Nov 8 09:59:20 2006 @@ -55,11 +55,11 @@ * * @since 4.0 */ -public class DefaultEntityDeserializer { +public class EntityDeserializer { private final ContentLengthStrategy lenStrategy; - public DefaultEntityDeserializer(final ContentLengthStrategy lenStrategy) { + public EntityDeserializer(final ContentLengthStrategy lenStrategy) { super(); if (lenStrategy == null) { throw new IllegalArgumentException("Content length strategy may not be null"); Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntitySerializer.java (from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntitySerializer.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntitySerializer.java?view=diff&rev=472564&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntitySerializer.java&r1=472563&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntitySerializer.java&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/DefaultEntitySerializer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/entity/EntitySerializer.java Wed Nov 8 09:59:20 2006 @@ -53,11 +53,11 @@ * * @since 4.0 */ -public class DefaultEntitySerializer { +public class EntitySerializer { private final ContentLengthStrategy lenStrategy; - public DefaultEntitySerializer(final ContentLengthStrategy lenStrategy) { + public EntitySerializer(final ContentLengthStrategy lenStrategy) { super(); if (lenStrategy == null) { throw new IllegalArgumentException("Content length strategy may not be null"); Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestAllEntityImpl.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestAllEntityImpl.java?view=diff&rev=472564&r1=472563&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestAllEntityImpl.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestAllEntityImpl.java Wed Nov 8 09:59:20 2006 @@ -38,8 +38,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(TestDefaultEntitySerializer.suite()); - suite.addTest(TestDefaultEntityDeserializer.suite()); + suite.addTest(TestEntitySerializer.suite()); + suite.addTest(TestEntityDeserializer.suite()); suite.addTest(TestLaxContentLengthStrategy.suite()); suite.addTest(TestStrictContentLengthStrategy.suite()); return suite; Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java (from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntityDeserializer.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java?view=diff&rev=472564&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntityDeserializer.java&r1=472563&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntityDeserializer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntityDeserializer.java Wed Nov 8 09:59:20 2006 @@ -45,26 +45,26 @@ import org.apache.http.mockup.HttpMessageMockup; import org.apache.http.params.HttpProtocolParams; -public class TestDefaultEntityDeserializer extends TestCase { +public class TestEntityDeserializer extends TestCase { - public TestDefaultEntityDeserializer(String testName) { + public TestEntityDeserializer(String testName) { super(testName); } // ------------------------------------------------------- TestCase Methods public static Test suite() { - return new TestSuite(TestDefaultEntityDeserializer.class); + return new TestSuite(TestEntityDeserializer.class); } // ------------------------------------------------------------------- Main public static void main(String args[]) { - String[] testCaseName = { TestDefaultEntityDeserializer.class.getName() }; + String[] testCaseName = { TestEntityDeserializer.class.getName() }; junit.textui.TestRunner.main(testCaseName); } public void testIllegalGenerateArg() throws Exception { - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); try { entitygen.deserialize(null, null); @@ -89,7 +89,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Transfer-Encoding", "identity, chunked"); message.addHeader("Content-Length", "plain wrong"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -116,7 +116,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Transfer-Encoding", "identity"); message.addHeader("Content-Length", "plain wrong"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -133,7 +133,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Transfer-Encoding", "whatever; param=value, chunked"); message.addHeader("Content-Length", "plain wrong"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -160,7 +160,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Transfer-Encoding", "chunked, identity"); message.addHeader("Content-Length", "plain wrong"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -186,7 +186,7 @@ message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false); message.addHeader("Content-Type", "unknown"); message.addHeader("Content-Length", "0"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -205,7 +205,7 @@ message.addHeader("Content-Length", "0"); message.addHeader("Content-Length", "0"); message.addHeader("Content-Length", "1"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -235,7 +235,7 @@ message.addHeader("Content-Length", "1"); message.addHeader("Content-Length", "yyy"); message.addHeader("Content-Length", "xxx"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -264,7 +264,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Content-Length", "yyy"); message.addHeader("Content-Length", "xxx"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -293,7 +293,7 @@ message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false); message.addHeader("Content-Type", "unknown"); message.addHeader("Content-Length", "xxx"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -320,7 +320,7 @@ // lenient mode message.getParams().setBooleanParameter(HttpProtocolParams.STRICT_TRANSFER_ENCODING, false); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -338,7 +338,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Content-Type", "stuff"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); @@ -351,7 +351,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Content-Encoding", "what not"); - DefaultEntityDeserializer entitygen = new DefaultEntityDeserializer( + EntityDeserializer entitygen = new EntityDeserializer( new LaxContentLengthStrategy()); HttpEntity entity = entitygen.deserialize(datareceiver, message); assertNotNull(entity); Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java (from r472563, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntitySerializer.java) URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java?view=diff&rev=472564&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntitySerializer.java&r1=472563&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestDefaultEntitySerializer.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestEntitySerializer.java Wed Nov 8 09:59:20 2006 @@ -46,26 +46,26 @@ import org.apache.http.mockup.HttpMessageMockup; import org.apache.http.params.HttpProtocolParams; -public class TestDefaultEntitySerializer extends TestCase { +public class TestEntitySerializer extends TestCase { - public TestDefaultEntitySerializer(String testName) { + public TestEntitySerializer(String testName) { super(testName); } // ------------------------------------------------------- TestCase Methods public static Test suite() { - return new TestSuite(TestDefaultEntitySerializer.class); + return new TestSuite(TestEntitySerializer.class); } // ------------------------------------------------------------------- Main public static void main(String args[]) { - String[] testCaseName = { TestDefaultEntitySerializer.class.getName() }; + String[] testCaseName = { TestEntitySerializer.class.getName() }; junit.textui.TestRunner.main(testCaseName); } public void testIllegalGenerateArg() throws Exception { - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); try { entitywriter.serialize(null, null, null); @@ -92,7 +92,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Transfer-Encoding", "Chunked"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); OutputStream outstream = entitywriter.doSerialize(datatransmitter, message); assertNotNull(outstream); @@ -104,7 +104,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Transfer-Encoding", "Identity"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); OutputStream outstream = entitywriter.doSerialize(datatransmitter, message); assertNotNull(outstream); @@ -116,7 +116,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Transfer-Encoding", "whatever"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); try { entitywriter.doSerialize(datatransmitter, message); @@ -133,7 +133,7 @@ HttpVersion.HTTP_1_0); message.addHeader("Transfer-Encoding", "chunked"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); try { entitywriter.doSerialize(datatransmitter, message); @@ -147,7 +147,7 @@ HttpDataTransmitter datatransmitter = new HttpDataTransmitterMockup(); HttpMessage message = new HttpMessageMockup(); message.addHeader("Content-Length", "100"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); OutputStream outstream = entitywriter.doSerialize(datatransmitter, message); assertNotNull(outstream); @@ -159,7 +159,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Content-Length", "whatever"); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); try { entitywriter.doSerialize(datatransmitter, message); @@ -172,7 +172,7 @@ public void testEntityNoContentDelimiter() throws Exception { HttpDataTransmitter datatransmitter = new HttpDataTransmitterMockup(); HttpMessage message = new HttpMessageMockup(); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); OutputStream outstream = entitywriter.doSerialize(datatransmitter, message); assertNotNull(outstream); @@ -187,7 +187,7 @@ HttpMessage message = new HttpMessageMockup(); message.addHeader("Content-Length", Integer.toString(content.length)); - DefaultEntitySerializer entitywriter = new DefaultEntitySerializer( + EntitySerializer entitywriter = new EntitySerializer( new StrictContentLengthStrategy()); entitywriter.serialize(datatransmitter, message, entity); Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java?view=diff&rev=472564&r1=472563&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestLaxContentLengthStrategy.java Wed Nov 8 09:59:20 2006 @@ -47,12 +47,12 @@ // ------------------------------------------------------- TestCase Methods public static Test suite() { - return new TestSuite(TestDefaultEntityDeserializer.class); + return new TestSuite(TestLaxContentLengthStrategy.class); } // ------------------------------------------------------------------- Main public static void main(String args[]) { - String[] testCaseName = { TestDefaultEntityDeserializer.class.getName() }; + String[] testCaseName = { TestLaxContentLengthStrategy.class.getName() }; junit.textui.TestRunner.main(testCaseName); } @@ -81,7 +81,7 @@ message.addHeader("Content-Type", "unknown"); message.addHeader("Transfer-Encoding", "identity"); message.addHeader("Content-Length", "plain wrong"); - assertEquals(ContentLengthStrategy.CHUNKED, lenStrategy.determineLength(message)); + assertEquals(ContentLengthStrategy.IDENTITY, lenStrategy.determineLength(message)); } public void testEntityWithUnsupportedTransferEncoding() throws Exception { Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java?view=diff&rev=472564&r1=472563&r2=472564 ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/entity/TestStrictContentLengthStrategy.java Wed Nov 8 09:59:20 2006 @@ -48,12 +48,12 @@ // ------------------------------------------------------- TestCase Methods public static Test suite() { - return new TestSuite(TestDefaultEntitySerializer.class); + return new TestSuite(TestStrictContentLengthStrategy.class); } // ------------------------------------------------------------------- Main public static void main(String args[]) { - String[] testCaseName = { TestDefaultEntitySerializer.class.getName() }; + String[] testCaseName = { TestStrictContentLengthStrategy.class.getName() }; junit.textui.TestRunner.main(testCaseName); }