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 2008/02/20 15:00:40 UTC
svn commit: r629460 -
/httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
Author: olegk
Date: Wed Feb 20 06:00:40 2008
New Revision: 629460
URL: http://svn.apache.org/viewvc?rev=629460&view=rev
Log:
Should fix the failing test case
Modified:
httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
Modified: httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java?rev=629460&r1=629459&r2=629460&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java (original)
+++ httpcomponents/httpclient/trunk/module-httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartFormHttpEntity.java Wed Feb 20 06:00:40 2008
@@ -72,14 +72,14 @@
HttpMultipartMode.BROWSER_COMPATIBLE,
"whatever",
CharsetUtil.getCharset("UTF-8"));
-
+
assertNull(entity.getContentEncoding());
assertNotNull(entity.getContentType());
Header header = entity.getContentType();
HeaderElement[] elems = header.getElements();
assertNotNull(elems);
assertEquals(1, elems.length);
-
+
HeaderElement elem = elems[0];
assertEquals("multipart/form-data", elem.getName());
NameValuePair p1 = elem.getParameterByName("boundary");
@@ -89,7 +89,7 @@
assertNotNull(p2);
assertEquals("UTF-8", p2.getValue());
}
-
+
public void testImplictContractorParams() throws Exception {
MultipartEntity entity = new MultipartEntity();
assertNull(entity.getContentEncoding());
@@ -98,22 +98,22 @@
HeaderElement[] elems = header.getElements();
assertNotNull(elems);
assertEquals(1, elems.length);
-
+
HeaderElement elem = elems[0];
assertEquals("multipart/form-data", elem.getName());
NameValuePair p1 = elem.getParameterByName("boundary");
assertNotNull(p1);
-
+
String boundary = p1.getValue();
assertNotNull(boundary);
-
- assertTrue(boundary.length() > 30);
+
+ assertTrue(boundary.length() >= 30);
assertTrue(boundary.length() <= 40);
-
+
NameValuePair p2 = elem.getParameterByName("charset");
assertNull(p2);
}
-
+
public void testRepeatable() throws Exception {
MultipartEntity entity = new MultipartEntity();
entity.addPart("p1", new StringBody("blah blah"));
@@ -121,29 +121,29 @@
assertTrue(entity.isRepeatable());
assertFalse(entity.isChunked());
assertFalse(entity.isStreaming());
-
+
long len = entity.getContentLength();
assertTrue(len == entity.getContentLength());
-
+
ByteArrayOutputStream out = new ByteArrayOutputStream();
entity.writeTo(out);
out.close();
-
+
byte[] bytes = out.toByteArray();
assertNotNull(bytes);
assertTrue(bytes.length == len);
assertTrue(len == entity.getContentLength());
-
+
out = new ByteArrayOutputStream();
entity.writeTo(out);
out.close();
-
+
bytes = out.toByteArray();
assertNotNull(bytes);
assertTrue(bytes.length == len);
}
-
+
public void testNonRepeatable() throws Exception {
MultipartEntity entity = new MultipartEntity();
entity.addPart("p1", new InputStreamBody(
@@ -153,8 +153,8 @@
assertFalse(entity.isRepeatable());
assertTrue(entity.isChunked());
assertTrue(entity.isStreaming());
-
+
assertTrue(entity.getContentLength() == -1);
}
-
+
}