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 2010/08/25 10:33:41 UTC
svn commit: r988878 -
/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
Author: olegk
Date: Wed Aug 25 08:33:41 2010
New Revision: 988878
URL: http://svn.apache.org/viewvc?rev=988878&view=rev
Log:
TABS -> SPACES; fixed bug in a test case
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java?rev=988878&r1=988877&r2=988878&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java Wed Aug 25 08:33:41 2010
@@ -25,92 +25,92 @@ import org.apache.http.message.BasicStat
public class TestHttpCacheEntrySerializers extends TestCase {
- private static final Charset UTF8 = Charset.forName("UTF-8");
-
- public void testDefaultSerializer() throws Exception {
- readWriteVerify(new DefaultHttpCacheEntrySerializer());
- }
-
- public void readWriteVerify(HttpCacheEntrySerializer serializer) throws IOException {
- // write the entry
- HttpCacheEntry writeEntry = newCacheEntry();
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- serializer.writeTo(writeEntry, out);
-
- // read the entry
- ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
- HttpCacheEntry readEntry = serializer.readFrom(in);
-
- // compare
- assertTrue(areEqual(readEntry, writeEntry));
- }
-
- private HttpCacheEntry newCacheEntry() throws UnsupportedEncodingException {
- Header[] headers = new Header[5];
- for (int i = 0; i < headers.length; i++) {
- headers[i] = new BasicHeader("header" + i, "value" + i);
- }
- String body = "Lorem ipsum dolor sit amet";
-
- ProtocolVersion pvObj = new ProtocolVersion("HTTP", 1, 1);
- StatusLine slObj = new BasicStatusLine(pvObj, 200, "ok");
- Set<String> variants = new HashSet<String>();
- variants.add("test variant 1");
- variants.add("test variant 2");
-
- HttpCacheEntry cacheEntry = new HttpCacheEntry(new Date(), new Date(),
- slObj, headers, new HeapResource(Base64.decodeBase64(body
- .getBytes(UTF8.name()))), variants);
-
- return cacheEntry;
- }
-
- private boolean areEqual(HttpCacheEntry one, HttpCacheEntry two) throws IOException {
- // dates are only stored with second precision, so scrub milliseconds
- if (!((one.getRequestDate().getTime() / 1000) == (two.getRequestDate()
- .getTime() / 1000)))
- return false;
- if (!((one.getResponseDate().getTime() / 1000) == (two
- .getResponseDate().getTime() / 1000)))
- return false;
- if (!one.getProtocolVersion().equals(two.getProtocolVersion()))
- return false;
-
- byte[] onesByteArray = resourceToBytes(one.getResource());
- byte[] twosByteArray = resourceToBytes(two.getResource());
-
- if (!Arrays.equals(onesByteArray,twosByteArray))
- return false;
-
- Header[] oneHeaders = one.getAllHeaders();
- Header[] twoHeaders = one.getAllHeaders();
- if (!(oneHeaders.length == twoHeaders.length))
- return false;
- for (int i = 0; i < oneHeaders.length; i++) {
- if (!oneHeaders[i].getName().equals(twoHeaders[i].getName()))
- return false;
- if (!oneHeaders[i].getValue().equals(twoHeaders[i].getValue()))
- return false;
- }
-
- return true;
- }
-
- private byte[] resourceToBytes(Resource res) throws IOException {
- InputStream inputStream = res.getInputStream();
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
- int readBytes;
- byte[] bytes = new byte[8096];
- while ((readBytes = inputStream.read(bytes)) > 0) {
- outputStream.write(bytes, 0, readBytes);
- }
-
- byte[] byteData = outputStream.toByteArray();
-
- inputStream.close();
- outputStream.close();
+ private static final Charset UTF8 = Charset.forName("UTF-8");
- return byteData;
- }
+ public void testDefaultSerializer() throws Exception {
+ readWriteVerify(new DefaultHttpCacheEntrySerializer());
+ }
+
+ public void readWriteVerify(HttpCacheEntrySerializer serializer) throws IOException {
+ // write the entry
+ HttpCacheEntry writeEntry = newCacheEntry();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ serializer.writeTo(writeEntry, out);
+
+ // read the entry
+ ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+ HttpCacheEntry readEntry = serializer.readFrom(in);
+
+ // compare
+ assertTrue(areEqual(readEntry, writeEntry));
+ }
+
+ private HttpCacheEntry newCacheEntry() throws UnsupportedEncodingException {
+ Header[] headers = new Header[5];
+ for (int i = 0; i < headers.length; i++) {
+ headers[i] = new BasicHeader("header" + i, "value" + i);
+ }
+ String body = "Lorem ipsum dolor sit amet";
+
+ ProtocolVersion pvObj = new ProtocolVersion("HTTP", 1, 1);
+ StatusLine slObj = new BasicStatusLine(pvObj, 200, "ok");
+ Set<String> variants = new HashSet<String>();
+ variants.add("test variant 1");
+ variants.add("test variant 2");
+
+ HttpCacheEntry cacheEntry = new HttpCacheEntry(new Date(), new Date(),
+ slObj, headers, new HeapResource(Base64.decodeBase64(body
+ .getBytes(UTF8.name()))), variants);
+
+ return cacheEntry;
+ }
+
+ private boolean areEqual(HttpCacheEntry one, HttpCacheEntry two) throws IOException {
+ // dates are only stored with second precision, so scrub milliseconds
+ if (!((one.getRequestDate().getTime() / 1000) == (two.getRequestDate()
+ .getTime() / 1000)))
+ return false;
+ if (!((one.getResponseDate().getTime() / 1000) == (two
+ .getResponseDate().getTime() / 1000)))
+ return false;
+ if (!one.getProtocolVersion().equals(two.getProtocolVersion()))
+ return false;
+
+ byte[] onesByteArray = resourceToBytes(one.getResource());
+ byte[] twosByteArray = resourceToBytes(two.getResource());
+
+ if (!Arrays.equals(onesByteArray,twosByteArray))
+ return false;
+
+ Header[] oneHeaders = one.getAllHeaders();
+ Header[] twoHeaders = two.getAllHeaders();
+ if (!(oneHeaders.length == twoHeaders.length))
+ return false;
+ for (int i = 0; i < oneHeaders.length; i++) {
+ if (!oneHeaders[i].getName().equals(twoHeaders[i].getName()))
+ return false;
+ if (!oneHeaders[i].getValue().equals(twoHeaders[i].getValue()))
+ return false;
+ }
+
+ return true;
+ }
+
+ private byte[] resourceToBytes(Resource res) throws IOException {
+ InputStream inputStream = res.getInputStream();
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+ int readBytes;
+ byte[] bytes = new byte[8096];
+ while ((readBytes = inputStream.read(bytes)) > 0) {
+ outputStream.write(bytes, 0, readBytes);
+ }
+
+ byte[] byteData = outputStream.toByteArray();
+
+ inputStream.close();
+ outputStream.close();
+
+ return byteData;
+ }
}