You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/05/10 14:44:19 UTC
svn commit: r1101440 - in
/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http:
entity/ impl/entity/ message/ mockup/
Author: olegk
Date: Tue May 10 12:44:18 2011
New Revision: 1101440
URL: http://svn.apache.org/viewvc?rev=1101440&view=rev
Log:
Test case restructuring
Added:
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java (with props)
Removed:
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpEntityMockup.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/mockup/HttpMessageMockup.java
Modified:
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestAbstractHttpEntity.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/message/TestAbstractMessage.java
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestAbstractHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestAbstractHttpEntity.java?rev=1101440&r1=1101439&r2=1101440&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestAbstractHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestAbstractHttpEntity.java Tue May 10 12:44:18 2011
@@ -29,7 +29,6 @@ package org.apache.http.entity;
import org.apache.http.Header;
import org.apache.http.message.BasicHeader;
-import org.apache.http.mockup.HttpEntityMockup;
import org.apache.http.protocol.HTTP;
import org.junit.Assert;
import org.junit.Test;
@@ -42,7 +41,7 @@ public class TestAbstractHttpEntity {
@Test
public void testContentType() throws Exception {
- HttpEntityMockup httpentity = new HttpEntityMockup();
+ BasicHttpEntity httpentity = new BasicHttpEntity();
httpentity.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, HTTP.PLAIN_TEXT_TYPE));
Assert.assertEquals(HTTP.CONTENT_TYPE, httpentity.getContentType().getName());
Assert.assertEquals(HTTP.PLAIN_TEXT_TYPE, httpentity.getContentType().getValue());
@@ -59,7 +58,7 @@ public class TestAbstractHttpEntity {
@Test
public void testContentEncoding() throws Exception {
- HttpEntityMockup httpentity = new HttpEntityMockup();
+ BasicHttpEntity httpentity = new BasicHttpEntity();
httpentity.setContentEncoding(new BasicHeader(HTTP.CONTENT_ENCODING, "gzip"));
Assert.assertEquals(HTTP.CONTENT_ENCODING, httpentity.getContentEncoding().getName());
Assert.assertEquals("gzip", httpentity.getContentEncoding().getValue());
@@ -76,7 +75,7 @@ public class TestAbstractHttpEntity {
@Test
public void testChunkingFlag() throws Exception {
- HttpEntityMockup httpentity = new HttpEntityMockup();
+ BasicHttpEntity httpentity = new BasicHttpEntity();
Assert.assertFalse(httpentity.isChunked());
httpentity.setChunked(true);
Assert.assertTrue(httpentity.isChunked());
Added: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java?rev=1101440&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java (added)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java Tue May 10 12:44:18 2011
@@ -0,0 +1,44 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.entity;
+
+import org.apache.http.ProtocolVersion;
+import org.apache.http.message.AbstractHttpMessage;
+import org.apache.http.params.HttpProtocolParams;
+
+class DummyHttpMessage extends AbstractHttpMessage {
+
+ public DummyHttpMessage() {
+ super();
+ }
+
+ public ProtocolVersion getProtocolVersion() {
+ return HttpProtocolParams.getVersion(this.getParams());
+ }
+
+}
\ No newline at end of file
Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1101440&r1=1101439&r2=1101440&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 Tue May 10 12:44:18 2011
@@ -36,7 +36,6 @@ 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.HttpMessageMockup;
import org.apache.http.mockup.SessionInputBufferMockup;
import org.apache.http.params.CoreProtocolPNames;
import org.junit.Assert;
@@ -65,7 +64,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithTransferEncoding() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup("0\r\n", "US-ASCII");
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -93,7 +92,7 @@ public class TestEntityDeserializer {
public void testEntityWithIdentityTransferEncoding() throws Exception {
SessionInputBuffer datareceiver =
new SessionInputBufferMockup(new byte[] {});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -111,7 +110,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithUnsupportedTransferEncoding() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup("0\r\n", "US-ASCII");
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -139,7 +138,7 @@ public class TestEntityDeserializer {
@Test
public void testChunkedTransferEncodingMustBeLast() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup("0\r\n", "US-ASCII");
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -167,7 +166,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithContentLength() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -185,7 +184,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithMultipleContentLength() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -216,7 +215,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithMultipleContentLengthSomeWrong() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -247,7 +246,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithMultipleContentLengthAllWrong() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -278,7 +277,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityWithInvalidContentLength() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -308,7 +307,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityNeitherContentLengthNorTransferEncoding() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -328,7 +327,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityContentType() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Type", "stuff");
EntityDeserializer entitygen = new EntityDeserializer(
@@ -342,7 +341,7 @@ public class TestEntityDeserializer {
@Test
public void testEntityContentEncoding() throws Exception {
SessionInputBuffer datareceiver = new SessionInputBufferMockup(new byte[] {'0'});
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Encoding", "what not");
EntityDeserializer entitygen = new EntityDeserializer(
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=1101440&r1=1101439&r2=1101440&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 Tue May 10 12:44:18 2011
@@ -37,7 +37,6 @@ 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.HttpMessageMockup;
import org.apache.http.mockup.SessionOutputBufferMockup;
import org.apache.http.params.CoreProtocolPNames;
import org.junit.Assert;
@@ -62,7 +61,7 @@ public class TestEntitySerializer {
// expected
}
try {
- entitywriter.serialize(new SessionOutputBufferMockup() , new HttpMessageMockup(), null);
+ entitywriter.serialize(new SessionOutputBufferMockup() , new DummyHttpMessage(), null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
@@ -72,7 +71,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithChunkTransferEncoding() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "Chunked");
EntitySerializer entitywriter = new EntitySerializer(
@@ -85,7 +84,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithIdentityTransferEncoding() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "Identity");
EntitySerializer entitywriter = new EntitySerializer(
@@ -98,7 +97,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithInvalidTransferEncoding() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "whatever");
EntitySerializer entitywriter = new EntitySerializer(
@@ -114,7 +113,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithInvalidChunkEncodingAndHTTP10() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION,
HttpVersion.HTTP_1_0);
message.addHeader("Transfer-Encoding", "chunked");
@@ -132,7 +131,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithContentLength() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Length", "100");
EntitySerializer entitywriter = new EntitySerializer(
new StrictContentLengthStrategy());
@@ -144,7 +143,7 @@ public class TestEntitySerializer {
@Test
public void testEntityWithInvalidContentLength() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Length", "whatever");
EntitySerializer entitywriter = new EntitySerializer(
@@ -160,7 +159,7 @@ public class TestEntitySerializer {
@Test
public void testEntityNoContentDelimiter() throws Exception {
SessionOutputBuffer datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
EntitySerializer entitywriter = new EntitySerializer(
new StrictContentLengthStrategy());
OutputStream outstream = entitywriter.doSerialize(datatransmitter, message);
@@ -174,7 +173,7 @@ public class TestEntitySerializer {
ByteArrayEntity entity = new ByteArrayEntity(content);
SessionOutputBufferMockup datatransmitter = new SessionOutputBufferMockup();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Length", Integer.toString(content.length));
EntitySerializer entitywriter = new EntitySerializer(
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=1101440&r1=1101439&r2=1101440&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 Tue May 10 12:44:18 2011
@@ -30,7 +30,6 @@ package org.apache.http.impl.entity;
import org.apache.http.HttpMessage;
import org.apache.http.ProtocolException;
import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.mockup.HttpMessageMockup;
import org.apache.http.params.CoreProtocolPNames;
import org.junit.Assert;
import org.junit.Test;
@@ -40,7 +39,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -57,7 +56,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithIdentityTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -70,7 +69,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithUnsupportedTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -92,7 +91,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testChunkedTransferEncodingMustBeLast() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -114,7 +113,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithContentLength() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -126,7 +125,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithMultipleContentLength() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -149,7 +148,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithMultipleContentLengthSomeWrong() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -172,7 +171,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithMultipleContentLengthAllWrong() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -194,7 +193,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityWithInvalidContentLength() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
message.getParams().setBooleanParameter(CoreProtocolPNames.STRICT_TRANSFER_ENCODING, false);
@@ -215,7 +214,7 @@ public class TestLaxContentLengthStrateg
@Test
public void testEntityNeitherContentLengthNorTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new LaxContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
// lenient mode
Assert.assertEquals(ContentLengthStrategy.IDENTITY, lenStrategy.determineLength(message));
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=1101440&r1=1101439&r2=1101440&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 Tue May 10 12:44:18 2011
@@ -31,7 +31,6 @@ import org.apache.http.HttpMessage;
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.mockup.HttpMessageMockup;
import org.apache.http.params.CoreProtocolPNames;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +40,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithChunkTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "Chunked");
Assert.assertEquals(ContentLengthStrategy.CHUNKED, lenStrategy.determineLength(message));
@@ -50,7 +49,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithIdentityTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "Identity");
Assert.assertEquals(ContentLengthStrategy.IDENTITY, lenStrategy.determineLength(message));
@@ -59,7 +58,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithInvalidTransferEncoding() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Transfer-Encoding", "whatever");
try {
@@ -73,7 +72,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithInvalidChunkEncodingAndHTTP10() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.getParams().setParameter(CoreProtocolPNames.PROTOCOL_VERSION,
HttpVersion.HTTP_1_0);
message.addHeader("Transfer-Encoding", "chunked");
@@ -89,7 +88,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithContentLength() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Length", "100");
Assert.assertEquals(100, lenStrategy.determineLength(message));
}
@@ -97,7 +96,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityWithInvalidContentLength() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
message.addHeader("Content-Length", "whatever");
try {
@@ -111,7 +110,7 @@ public class TestStrictContentLengthStra
@Test
public void testEntityNoContentDelimiter() throws Exception {
ContentLengthStrategy lenStrategy = new StrictContentLengthStrategy();
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new DummyHttpMessage();
Assert.assertEquals(ContentLengthStrategy.IDENTITY, lenStrategy.determineLength(message));
}
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=1101440&r1=1101439&r2=1101440&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 Tue May 10 12:44:18 2011
@@ -29,9 +29,10 @@ package org.apache.http.message;
import org.apache.http.Header;
import org.apache.http.HttpMessage;
-import org.apache.http.mockup.HttpMessageMockup;
+import org.apache.http.ProtocolVersion;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
import org.junit.Assert;
import org.junit.Test;
@@ -41,9 +42,21 @@ import org.junit.Test;
*/
public class TestAbstractMessage {
+ static class TestHttpMessage extends AbstractHttpMessage {
+
+ public TestHttpMessage() {
+ super();
+ }
+
+ public ProtocolVersion getProtocolVersion() {
+ return HttpProtocolParams.getVersion(this.getParams());
+ }
+
+ }
+
@Test
public void testBasicProperties() {
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new TestHttpMessage();
Assert.assertNotNull(message.getParams());
Assert.assertNotNull(message.headerIterator());
Header[] headers = message.getAllHeaders();
@@ -53,7 +66,7 @@ public class TestAbstractMessage {
@Test
public void testBasicHeaderOps() {
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new TestHttpMessage();
Assert.assertFalse(message.containsHeader("whatever"));
message.addHeader("name", "1");
@@ -112,7 +125,7 @@ public class TestAbstractMessage {
@Test
public void testParameters() {
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new TestHttpMessage();
Assert.assertNotNull(message.getParams());
HttpParams params = new BasicHttpParams();
message.setParams(params);
@@ -121,7 +134,7 @@ public class TestAbstractMessage {
@Test
public void testInvalidInput() {
- HttpMessage message = new HttpMessageMockup();
+ HttpMessage message = new TestHttpMessage();
try {
message.setParams(null);
Assert.fail("IllegalArgumentException should have been thrown");