Index: httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java =================================================================== --- httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java (revision 943759) +++ httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java (revision ) @@ -26,11 +26,6 @@ */ package org.apache.http.impl.client.cache; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotSame; - -import java.util.Date; - import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; @@ -44,6 +39,12 @@ import org.junit.Before; import org.junit.Test; +import java.io.IOException; +import java.util.Date; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotSame; + public class TestCacheEntryUpdater { @@ -86,7 +87,7 @@ } @Test - public void testUpdateCacheEntryReturnsDifferentEntryInstance() { + public void testUpdateCacheEntryReturnsDifferentEntryInstance() throws IOException { CacheEntry entry = getEntry(new Header[]{}); BasicHttpResponse response = new BasicHttpResponse(HTTP_1_1, 200, "OK"); @@ -102,7 +103,7 @@ } @Test - public void testHeadersAreMergedCorrectly() { + public void testHeadersAreMergedCorrectly() throws IOException { Header[] headers = { new BasicHeader("Date", DateUtils.formatDate(responseDate)), @@ -124,7 +125,7 @@ } @Test - public void testNewerHeadersReplaceExistingHeaders() { + public void testNewerHeadersReplaceExistingHeaders() throws IOException { Header[] headers = { new BasicHeader("Date", DateUtils.formatDate(requestDate)), @@ -152,7 +153,7 @@ } @Test - public void testNewHeadersAreAddedByMerge() { + public void testNewHeadersAreAddedByMerge() throws IOException { Header[] headers = { new BasicHeader("Date", DateUtils.formatDate(requestDate)), @@ -179,7 +180,7 @@ } @Test - public void testUpdatedEntryHasLatestRequestAndResponseDates() { + public void testUpdatedEntryHasLatestRequestAndResponseDates() throws IOException { Date now = new Date(); Index: httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestDefaultCacheEntrySerializer.java =================================================================== --- httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestDefaultCacheEntrySerializer.java (revision 943759) +++ httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestDefaultCacheEntrySerializer.java (revision ) @@ -26,11 +26,6 @@ */ package org.apache.http.impl.client.cache; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.Arrays; -import java.util.Date; - import org.apache.http.Header; import org.apache.http.HttpVersion; import org.apache.http.ProtocolVersion; @@ -39,6 +34,12 @@ import org.junit.Assert; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.Arrays; +import java.util.Date; + public class TestDefaultCacheEntrySerializer { @Test @@ -76,7 +77,7 @@ } - private boolean areEqual(CacheEntry one, CacheEntry two) { + private boolean areEqual(CacheEntry one, CacheEntry two) throws IOException { if (!one.getRequestDate().equals(two.getRequestDate())) return false; @@ -84,7 +85,20 @@ return false; if (!one.getProtocolVersion().equals(two.getProtocolVersion())) return false; - if (!Arrays.equals(one.getBody(), two.getBody())) + + byte[] bytesOne, bytesTwo; + + ByteArrayOutputStream streamOne = new ByteArrayOutputStream(); + one.getBody().writeTo(streamOne); + bytesOne = streamOne.toByteArray(); + + ByteArrayOutputStream streamTwo = new ByteArrayOutputStream(); + + two.getBody().writeTo(streamTwo); + bytesTwo = streamTwo.toByteArray(); + + + if (!Arrays.equals(bytesOne, bytesTwo)) return false; Header[] oneHeaders = one.getAllHeaders(); Index: httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java =================================================================== --- httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java (revision 943759) +++ httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCache.java (revision ) @@ -34,6 +34,9 @@ import org.junit.Ignore; import org.junit.Test; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + public class TestResponseCache { private BasicHttpCache cache; @@ -133,7 +136,7 @@ @Test @Ignore - public void testCacheEntryCallbackUpdatesCacheEntry() throws HttpCacheOperationException { + public void testCacheEntryCallbackUpdatesCacheEntry() throws HttpCacheOperationException, IOException { final byte[] expectedArray = new byte[] { 1, 2, 3, 4, 5 }; @@ -164,7 +167,12 @@ Assert.assertNull(bar); - Assert.assertArrayEquals(expectedArray, afterUpdate.getBody()); + byte[] bytes; + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + afterUpdate.getBody().writeTo(stream); + bytes = stream.toByteArray(); + + Assert.assertArrayEquals(expectedArray,bytes); } } Index: httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java =================================================================== --- httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java (revision 943759) +++ httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java (revision ) @@ -26,24 +26,7 @@ */ package org.apache.http.impl.client.cache; -import static junit.framework.Assert.assertTrue; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.apache.http.Header; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.ProtocolException; -import org.apache.http.ProtocolVersion; -import org.apache.http.RequestLine; -import org.apache.http.StatusLine; +import org.apache.http.*; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; @@ -65,6 +48,15 @@ import org.junit.Ignore; import org.junit.Test; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static junit.framework.Assert.assertTrue; + public class TestCachingHttpClient { private static final ProtocolVersion HTTP_1_1 = new ProtocolVersion("HTTP",1,1); @@ -965,7 +957,7 @@ org.easymock.EasyMock.expect(mockCacheEntry.isRevalidatable()).andReturn(b); } - private void cacheEntryUpdaterCalled() { + private void cacheEntryUpdaterCalled() throws IOException { EasyMock.expect( mockCacheEntryUpdater.updateCacheEntry(mockCacheEntry, requestDate, responseDate, mockBackendResponse)).andReturn(mockUpdatedCacheEntry);