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/09/18 18:20:22 UTC
svn commit: r1172301 [2/3] - in /httpcomponents/httpclient/trunk: ./
httpclient-cache/src/main/java/org/apache/http/client/cache/
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/
httpclient-cache/src/main/java/org/apache/http/impl/clie...
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java Sun Sep 18 16:20:20 2011
@@ -71,7 +71,7 @@ public class TestCacheInvalidator {
public void setUp() {
now = new Date();
tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
-
+
host = new HttpHost("foo.example.com");
mockStorage = createMock(HttpCacheStorage.class);
cacheKeyGenerator = new CacheKeyGenerator();
@@ -265,7 +265,7 @@ public class TestCacheInvalidator {
impl.flushInvalidatedCacheEntries(host, request);
verifyMocks();
}
-
+
@Test
public void doesNotFlushForResponsesWithoutContentLocation()
throws Exception {
@@ -273,7 +273,7 @@ public class TestCacheInvalidator {
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void flushesEntryIfFresherAndSpecifiedByContentLocation()
throws Exception {
@@ -281,20 +281,20 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
mockStorage.removeEntry(theURI);
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntryForUnsuccessfulResponse()
throws Exception {
@@ -303,14 +303,14 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -323,15 +323,15 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String cacheKey = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", "http://foo.example.com/bar");
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(cacheKey)).andReturn(entry).anyTimes();
mockStorage.removeEntry(cacheKey);
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -344,15 +344,15 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String cacheKey = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", "/bar");
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(cacheKey)).andReturn(entry).anyTimes();
mockStorage.removeEntry(cacheKey);
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -365,21 +365,21 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String cacheKey = "http://baz.example.com:80/bar";
response.setHeader("Content-Location", cacheKey);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(cacheKey)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
-
+
+
@Test
public void doesNotFlushEntrySpecifiedByContentLocationIfEtagsMatch()
throws Exception {
@@ -387,14 +387,14 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"same-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -407,19 +407,19 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(now)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntryIfNotInCache()
throws Exception {
@@ -427,14 +427,14 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
expect(mockStorage.getEntry(theURI)).andReturn(null).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntrySpecifiedByContentLocationIfResponseHasNoEtag()
throws Exception {
@@ -442,19 +442,19 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntrySpecifiedByContentLocationIfEntryHasNoEtag()
throws Exception {
@@ -462,13 +462,13 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("Date", formatDate(tenSecondsAgo)),
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -481,19 +481,19 @@ public class TestCacheInvalidator {
response.removeHeaders("Date");
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("ETag", "\"old-etag\""),
new BasicHeader("Date", formatDate(tenSecondsAgo)),
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntrySpecifiedByContentLocationIfEntryHasNoDate()
throws Exception {
@@ -501,13 +501,13 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
+
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("ETag", "\"old-etag\"")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
@@ -520,19 +520,19 @@ public class TestCacheInvalidator {
response.setHeader("Date", "blarg");
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
- HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
+
+ HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("ETag", "\"old-etag\""),
new BasicHeader("Date", formatDate(tenSecondsAgo))
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
@Test
public void doesNotFlushEntrySpecifiedByContentLocationIfEntryHasMalformedDate()
throws Exception {
@@ -540,20 +540,20 @@ public class TestCacheInvalidator {
response.setHeader("Date", formatDate(now));
String theURI = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", theURI);
-
- HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
+
+ HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(new Header[] {
new BasicHeader("ETag", "\"old-etag\""),
new BasicHeader("Date", "foo")
});
-
+
expect(mockStorage.getEntry(theURI)).andReturn(entry).anyTimes();
-
+
replayMocks();
impl.flushInvalidatedCacheEntries(host, request, response);
verifyMocks();
}
-
+
// Expectations
private void cacheEntryHasVariantMap(Map<String,String> variantMap) {
expect(mockEntry.getVariantMap()).andReturn(variantMap);
@@ -572,4 +572,4 @@ public class TestCacheInvalidator {
mockStorage.removeEntry(theUri);
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java Sun Sep 18 16:20:20 2011
@@ -331,7 +331,7 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers);
assertFalse(impl.isRevalidatable(entry));
}
-
+
@Test
public void testMissingContentLengthDoesntInvalidateEntry() {
final int contentLength = 128;
@@ -339,7 +339,7 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers, HttpTestUtils.getRandomBytes(contentLength));
assertTrue(impl.contentLengthHeaderMatchesActualLength(entry));
}
-
+
@Test
public void testCorrectContentLengthDoesntInvalidateEntry() {
final int contentLength = 128;
@@ -347,7 +347,7 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers, HttpTestUtils.getRandomBytes(contentLength));
assertTrue(impl.contentLengthHeaderMatchesActualLength(entry));
}
-
+
@Test
public void testWrongContentLengthInvalidatesEntry() {
final int contentLength = 128;
@@ -436,7 +436,7 @@ public class TestCacheValidityPolicy {
HttpRequest req = new BasicHttpRequest("GET","/",HttpVersion.HTTP_1_1);
assertTrue(impl.mayReturnStaleIfError(req, entry, now));
}
-
+
@Test
public void testMayReturnStaleIfErrorInRequestIsTrueWithinStaleness(){
Header[] headers = new Header[] {
@@ -475,15 +475,15 @@ public class TestCacheValidityPolicy {
@Test
public void testMayReturnStaleWhileRevalidatingIsFalseWhenDirectiveIsAbsent() {
Date now = new Date();
-
+
Header[] headers = new Header[] { new BasicHeader("Cache-control", "public") };
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers);
-
+
CacheValidityPolicy impl = new CacheValidityPolicy();
-
+
assertFalse(impl.mayReturnStaleWhileRevalidating(entry, now));
}
-
+
@Test
public void testMayReturnStaleWhileRevalidatingIsTrueWhenWithinStaleness() {
Date now = new Date();
@@ -493,12 +493,12 @@ public class TestCacheValidityPolicy {
new BasicHeader("Cache-Control", "max-age=5, stale-while-revalidate=15")
};
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(now, now, headers);
-
+
CacheValidityPolicy impl = new CacheValidityPolicy();
-
+
assertTrue(impl.mayReturnStaleWhileRevalidating(entry, now));
}
-
+
@Test
public void testMayReturnStaleWhileRevalidatingIsFalseWhenPastStaleness() {
Date now = new Date();
@@ -508,12 +508,12 @@ public class TestCacheValidityPolicy {
new BasicHeader("Cache-Control", "max-age=5, stale-while-revalidate=15")
};
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(now, now, headers);
-
+
CacheValidityPolicy impl = new CacheValidityPolicy();
-
+
assertFalse(impl.mayReturnStaleWhileRevalidating(entry, now));
}
-
+
@Test
public void testMayReturnStaleWhileRevalidatingIsFalseWhenDirectiveEmpty() {
Date now = new Date();
@@ -523,9 +523,9 @@ public class TestCacheValidityPolicy {
new BasicHeader("Cache-Control", "max-age=5, stale-while-revalidate=")
};
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(now, now, headers);
-
+
CacheValidityPolicy impl = new CacheValidityPolicy();
-
+
assertFalse(impl.mayReturnStaleWhileRevalidating(entry, now));
}
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java Sun Sep 18 16:20:20 2011
@@ -260,4 +260,4 @@ public class TestCachedResponseSuitabili
Assert.assertTrue(impl.canCachedResponseBeUsed(host, request, entry, now));
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingHttpClient.java Sun Sep 18 16:20:20 2011
@@ -203,16 +203,16 @@ public class TestCachingHttpClient {
@Test
public void testCacheableResponsesGoIntoCache() throws Exception {
impl = new CachingHttpClient(mockBackend);
-
+
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control","max-age=3600");
-
+
expect(mockBackend.execute(isA(HttpHost.class), isA(HttpRequest.class),
(HttpContext)isNull())).andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
@@ -224,7 +224,7 @@ public class TestCachingHttpClient {
impl = new CachingHttpClient(mockBackend);
Date now = new Date();
Date fiveSecondsAgo = new Date(now.getTime() - 5 * 1000L);
-
+
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Date", DateUtils.formatDate(now));
@@ -233,7 +233,7 @@ public class TestCachingHttpClient {
expect(mockBackend.execute(isA(HttpHost.class), isA(HttpRequest.class),
(HttpContext)isNull())).andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control","no-cache");
HttpResponse resp2 = HttpTestUtils.make200Response();
@@ -260,7 +260,7 @@ public class TestCachingHttpClient {
impl = new CachingHttpClient(mockBackend);
Date now = new Date();
Date fiveSecondsAgo = new Date(now.getTime() - 5 * 1000L);
-
+
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Date", DateUtils.formatDate(fiveSecondsAgo));
@@ -269,7 +269,7 @@ public class TestCachingHttpClient {
expect(mockBackend.execute(isA(HttpHost.class), isA(HttpRequest.class),
(HttpContext)isNull())).andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control","max-age=0");
HttpResponse resp2 = HttpTestUtils.make200Response();
@@ -486,7 +486,7 @@ public class TestCachingHttpClient {
impl = new CachingHttpClient(mockBackend,
new BasicHttpCache(new HeapResourceFactory(), mockStorage, config),
config);
-
+
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control","no-cache");
@@ -1012,8 +1012,8 @@ public class TestCachingHttpClient {
resp1.setHeader("Last-Modified", DateUtils.formatDate(tenSecondsAgo));
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
replayMocks();
@@ -1048,8 +1048,8 @@ public class TestCachingHttpClient {
HttpResponse resp2 = HttpTestUtils.make200Response();
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
mockBackend.execute(isA(HttpHost.class),
@@ -1088,8 +1088,8 @@ public class TestCachingHttpClient {
.formatDate(tenSecondsAfter));
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1).times(2);
replayMocks();
@@ -1116,8 +1116,8 @@ public class TestCachingHttpClient {
resp1.setHeader("Cache-Control", "public, max-age=3600");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
replayMocks();
@@ -1147,12 +1147,12 @@ public class TestCachingHttpClient {
HttpResponse resp2 = HttpTestUtils.make200Response();
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
replayMocks();
@@ -1185,8 +1185,8 @@ public class TestCachingHttpClient {
req2.addHeader("If-Modified-Since", DateUtils.formatDate(now));
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
replayMocks();
@@ -1217,12 +1217,12 @@ public class TestCachingHttpClient {
resp1.setHeader("Last-Modified", DateUtils.formatDate(tenSecondsAgo));
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
replayMocks();
@@ -1432,13 +1432,13 @@ public class TestCachingHttpClient {
resp2.setHeader("Date", DateUtils.formatDate(now));
resp2.setHeader("Cache-Control", "public, max-age=5");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
replayMocks();
impl.execute(host, req1);
@@ -1476,13 +1476,13 @@ public class TestCachingHttpClient {
resp2.setHeader("Date", DateUtils.formatDate(tenSecondsAgo));
resp2.setHeader("Cache-Control", "public, max-age=5");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
replayMocks();
impl.execute(host, req1);
@@ -1520,13 +1520,13 @@ public class TestCachingHttpClient {
resp1.setHeader("Last-Modified", DateUtils.formatDate(tenSecondsAgo));
resp2.setHeader("Cache-Control", "public, max-age=5");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
replayMocks();
impl.execute(host, req1);
@@ -1565,13 +1565,13 @@ public class TestCachingHttpClient {
resp1.setHeader("Last-Modified", DateUtils.formatDate(now));
resp2.setHeader("Cache-Control", "public, max-age=5");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
replayMocks();
impl.execute(host, req1);
@@ -1628,18 +1628,18 @@ public class TestCachingHttpClient {
resp3.setHeader("Cache-Control", "public, max-age=3600");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp3);
@@ -1702,18 +1702,18 @@ public class TestCachingHttpClient {
resp4.setHeader("Cache-Control", "public, max-age=3600");
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp1);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp2);
expect(
- mockBackend.execute(isA(HttpHost.class),
- isA(HttpRequest.class), (HttpContext)
+ mockBackend.execute(isA(HttpHost.class),
+ isA(HttpRequest.class), (HttpContext)
isNull())).andReturn(resp4);
replayMocks();
@@ -1744,7 +1744,7 @@ public class TestCachingHttpClient {
mockCache.flushInvalidatedCacheEntriesFor(host, request);
expectLastCall().andThrow(new IOException()).anyTimes();
mockCache.flushInvalidatedCacheEntriesFor(isA(HttpHost.class), isA(HttpRequest.class), isA(HttpResponse.class));
- expectLastCall().anyTimes();
+ expectLastCall().anyTimes();
expect(mockCache.getCacheEntry(same(host),
isA(HttpRequest.class)))
.andThrow(new IOException()).anyTimes();
@@ -1853,7 +1853,7 @@ public class TestCachingHttpClient {
expect(mockValidityPolicy.isRevalidatable(
(HttpCacheEntry)anyObject())).andReturn(b);
}
-
+
private void cacheEntryMustRevalidate(boolean b) {
expect(mockValidityPolicy.mustRevalidate(mockCacheEntry))
.andReturn(b);
@@ -1863,7 +1863,7 @@ public class TestCachingHttpClient {
expect(mockValidityPolicy.proxyRevalidate(mockCacheEntry))
.andReturn(b);
}
-
+
private void mayReturnStaleWhileRevalidating(boolean b) {
expect(mockValidityPolicy.mayReturnStaleWhileRevalidating(
(HttpCacheEntry)anyObject(), (Date)anyObject())).andReturn(b);
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=1172301&r1=1172300&r2=1172301&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 Sun Sep 18 16:20:20 2011
@@ -54,12 +54,12 @@ public class TestHttpCacheEntrySerialize
private static final Charset UTF8 = Charset.forName("UTF-8");
private HttpCacheEntrySerializer impl;
-
+
@Before
public void setUp() {
impl = new DefaultHttpCacheEntrySerializer();
}
-
+
@Test
public void canSerializeEntriesWithVariantMaps() throws Exception {
readWriteVerify(makeCacheEntryWithVariantMap());
@@ -96,7 +96,7 @@ public class TestHttpCacheEntrySerialize
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()
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java Sun Sep 18 16:20:20 2011
@@ -363,4 +363,4 @@ public class TestProtocolDeviations {
Assert.assertSame(originResponse, result);
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Sun Sep 18 16:20:20 2011
@@ -66,7 +66,7 @@ public class TestProtocolRecommendations
private Date now;
private Date tenSecondsAgo;
private Date twoMinutesAgo;
-
+
@Override
@Before
public void setUp() {
@@ -76,7 +76,7 @@ public class TestProtocolRecommendations
twoMinutesAgo = new Date(now.getTime() - 2 * 60 * 1000L);
tenSecondsFromNow = new Date(now.getTime() + 10 * 1000L);
}
-
+
/* "identity: The default (identity) encoding; the use of no
* transformation whatsoever. This content-coding is used only in the
* Accept-Encoding header, and SHOULD NOT be used in the
@@ -107,7 +107,7 @@ public class TestProtocolRecommendations
* "304 Not Modified. ... If the conditional GET used a strong cache
* validator (see section 13.3.3), the response SHOULD NOT include
* other entity-headers."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.5
*/
private void cacheGenerated304ForValidatorShouldNotContainEntityHeader(
@@ -119,29 +119,29 @@ public class TestProtocolRecommendations
resp1.setHeader("Cache-Control","max-age=3600");
resp1.setHeader(validatorHeader, validator);
resp1.setHeader(headerName, headerValue);
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader(conditionalHeader, validator);
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
if (HttpStatus.SC_NOT_MODIFIED == result.getStatusLine().getStatusCode()) {
assertNull(result.getFirstHeader(headerName));
}
}
-
+
private void cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
String headerName, String headerValue) throws Exception,
IOException {
cacheGenerated304ForValidatorShouldNotContainEntityHeader(headerName,
headerValue, "ETag", "\"etag\"", "If-None-Match");
}
-
+
private void cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
String headerName, String headerValue) throws Exception,
IOException {
@@ -149,28 +149,28 @@ public class TestProtocolRecommendations
headerValue, "Last-Modified", formatDate(twoMinutesAgo),
"If-Modified-Since");
}
-
+
@Test
public void cacheGenerated304ForStrongEtagValidatorShouldNotContainAllow()
throws Exception {
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Allow", "GET,HEAD");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainAllow()
throws Exception {
cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
"Allow", "GET,HEAD");
}
-
+
@Test
public void cacheGenerated304ForStrongEtagValidatorShouldNotContainContentEncoding()
throws Exception {
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Content-Encoding", "gzip");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentEncoding()
throws Exception {
@@ -184,7 +184,7 @@ public class TestProtocolRecommendations
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Content-Language", "en");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentLanguage()
throws Exception {
@@ -198,21 +198,21 @@ public class TestProtocolRecommendations
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Content-Length", "128");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentLength()
throws Exception {
cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
"Content-Length", "128");
}
-
+
@Test
public void cacheGenerated304ForStrongValidatorShouldNotContainContentMD5()
throws Exception {
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Content-MD5", "Q2hlY2sgSW50ZWdyaXR5IQ==");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentMD5()
throws Exception {
@@ -229,9 +229,9 @@ public class TestProtocolRecommendations
resp1.setHeader("Cache-Control","max-age=3600");
resp1.setHeader(validatorHeader, validator);
resp1.setHeader("Content-Range", "bytes 0-127/256");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("If-Range", validator);
req2.setHeader("Range","bytes=0-127");
@@ -240,67 +240,67 @@ public class TestProtocolRecommendations
HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not Modified");
resp2.setHeader("Date", formatDate(now));
resp2.setHeader(validatorHeader, validator);
-
+
// cache module does not currently deal with byte ranges, but we want
// this test to work even if it does some day
Capture<HttpRequest> cap = new Capture<HttpRequest>();
expect(mockBackend.execute(same(host), capture(cap), (HttpContext)isNull()))
.andReturn(resp2).times(0,1);
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
if (!cap.hasCaptured()
&& HttpStatus.SC_NOT_MODIFIED == result.getStatusLine().getStatusCode()) {
// cache generated a 304
assertNull(result.getFirstHeader("Content-Range"));
}
}
-
+
@Test
public void cacheGenerated304ForStrongEtagValidatorShouldNotContainContentRange()
throws Exception {
cacheGenerated304ForStrongValidatorShouldNotContainContentRange(
"ETag", "\"etag\"", "If-None-Match");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentRange()
throws Exception {
cacheGenerated304ForStrongValidatorShouldNotContainContentRange(
"Last-Modified", formatDate(twoMinutesAgo), "If-Modified-Since");
}
-
+
@Test
public void cacheGenerated304ForStrongEtagValidatorShouldNotContainContentType()
throws Exception {
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Content-Type", "text/html");
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainContentType()
throws Exception {
cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
"Content-Type", "text/html");
}
-
+
@Test
public void cacheGenerated304ForStrongEtagValidatorShouldNotContainLastModified()
throws Exception {
cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
"Last-Modified", formatDate(tenSecondsAgo));
}
-
+
@Test
public void cacheGenerated304ForStrongDateValidatorShouldNotContainLastModified()
throws Exception {
cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
"Last-Modified", formatDate(twoMinutesAgo));
}
-
+
private void shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
String entityHeader, String entityHeaderValue) throws Exception,
IOException {
@@ -311,23 +311,23 @@ public class TestProtocolRecommendations
resp.setHeader("Date", formatDate(now));
resp.setHeader("Etag", "\"etag\"");
resp.setHeader(entityHeader, entityHeaderValue);
-
+
backendExpectsAnyRequest().andReturn(resp);
-
+
replayMocks();
HttpResponse result = impl.execute(host, req);
verifyMocks();
-
+
assertNull(result.getFirstHeader(entityHeader));
}
-
+
@Test
public void shouldStripAllowFromOrigin304ResponseToStrongValidation()
throws Exception {
shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
"Allow", "GET,HEAD");
}
-
+
@Test
public void shouldStripContentEncodingFromOrigin304ResponseToStrongValidation()
throws Exception {
@@ -341,14 +341,14 @@ public class TestProtocolRecommendations
shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
"Content-Language", "en");
}
-
+
@Test
public void shouldStripContentLengthFromOrigin304ResponseToStrongValidation()
throws Exception {
shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
"Content-Length", "128");
}
-
+
@Test
public void shouldStripContentMD5FromOrigin304ResponseToStrongValidation()
throws Exception {
@@ -362,35 +362,35 @@ public class TestProtocolRecommendations
shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
"Content-Type", "text/html;charset=utf-8");
}
-
+
@Test
public void shouldStripContentRangeFromOrigin304ResponseToStringValidation()
throws Exception {
HttpRequest req = HttpTestUtils.makeDefaultRequest();
req.setHeader("If-Range","\"etag\"");
req.setHeader("Range","bytes=0-127");
-
+
HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not Modified");
resp.setHeader("Date", formatDate(now));
resp.setHeader("ETag", "\"etag\"");
resp.setHeader("Content-Range", "bytes 0-127/256");
-
+
backendExpectsAnyRequest().andReturn(resp);
-
+
replayMocks();
HttpResponse result = impl.execute(host, req);
verifyMocks();
-
+
assertNull(result.getFirstHeader("Content-Range"));
}
-
+
@Test
public void shouldStripLastModifiedFromOrigin304ResponseToStrongValidation()
throws Exception {
shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
"Last-Modified", formatDate(twoMinutesAgo));
}
-
+
/*
* "For this reason, a cache SHOULD NOT return a stale response if the
* client explicitly requests a first-hand or fresh one, unless it is
@@ -616,7 +616,7 @@ public class TestProtocolRecommendations
assertEquals(warning, result.getFirstHeader("Warning").getValue());
}
-
+
/*
* "A transparent proxy SHOULD NOT modify an end-to-end header unless
* the definition of that header requires or specifically allows that."
@@ -1175,7 +1175,7 @@ public class TestProtocolRecommendations
}
assertTrue(foundEtag1 && foundEtag2);
}
-
+
/* "If the entity-tag of the new response matches that of an existing
* entry, the new response SHOULD be used to update the header fields
* of the existing entry, and the result MUST be returned to the
@@ -1237,7 +1237,7 @@ public class TestProtocolRecommendations
assertEquals(formatDate(now), result1.getFirstHeader("Date").getValue());
assertEquals(formatDate(now), result2.getFirstHeader("Date").getValue());
}
-
+
@Test
public void testResponseToExistingVariantsIsCachedForFutureResponses()
throws Exception {
@@ -1279,7 +1279,7 @@ public class TestProtocolRecommendations
* for the associated entity, its entity-tag SHOULD NOT be included in
* the If-None-Match header field unless the request is for a range
* that would be fully satisfied by that entry."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.6
*/
@Test
@@ -1291,9 +1291,9 @@ public class TestProtocolRecommendations
resp1.setHeader("Cache-Control", "max-age=3600");
resp1.setHeader("Vary", "User-Agent");
resp1.setHeader("ETag", "\"etag1\"");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("User-Agent", "agent2");
req2.setHeader("Range", "bytes=0-49");
@@ -1306,27 +1306,27 @@ public class TestProtocolRecommendations
resp2.setHeader("ETag", "\"etag2\"");
resp2.setHeader("Cache-Control","max-age=3600");
resp2.setHeader("Date", formatDate(new Date()));
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
HttpRequest req3 = HttpTestUtils.makeDefaultRequest();
req3.setHeader("User-Agent", "agent3");
-
+
HttpResponse resp3 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control", "max-age=3600");
resp1.setHeader("Vary", "User-Agent");
resp1.setHeader("ETag", "\"etag3\"");
-
+
Capture<HttpRequest> cap = new Capture<HttpRequest>();
expect(mockBackend.execute(isA(HttpHost.class), capture(cap),
(HttpContext)isNull())).andReturn(resp3);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
impl.execute(host, req3);
verifyMocks();
-
+
HttpRequest captured = cap.getValue();
for(Header h : captured.getHeaders("If-None-Match")) {
for(HeaderElement elt : h.getElements()) {
@@ -1334,15 +1334,15 @@ public class TestProtocolRecommendations
}
}
}
-
+
/* "If a cache receives a successful response whose Content-Location
* field matches that of an existing cache entry for the same Request-
* URI, whose entity-tag differs from that of the existing entry, and
* whose Date is more recent than that of the existing entry, the
* existing entry SHOULD NOT be returned in response to future requests
* and SHOULD be deleted from the cache.
- *
- * http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.6
+ *
+ * http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.6
*/
@Test
public void cachedEntryShouldNotBeUsedIfMoreRecentMentionInContentLocation()
@@ -1352,34 +1352,34 @@ public class TestProtocolRecommendations
resp1.setHeader("Cache-Control","max-age=3600");
resp1.setHeader("ETag", "\"old-etag\"");
resp1.setHeader("Date", formatDate(tenSecondsAgo));
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = new HttpGet("http://foo.example.com/bar");
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("ETag", "\"new-etag\"");
resp2.setHeader("Date", formatDate(now));
resp2.setHeader("Content-Location", "http://foo.example.com/");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
HttpRequest req3 = new HttpGet("http://foo.example.com");
HttpResponse resp3 = HttpTestUtils.make200Response();
-
+
backendExpectsAnyRequest().andReturn(resp3);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
impl.execute(host, req3);
verifyMocks();
}
-
+
/*
* "This specifically means that responses from HTTP/1.0 servers for such
* URIs [those containing a '?' in the rel_path part] SHOULD NOT be taken
* from a cache."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.9
*/
@Test
@@ -1391,23 +1391,23 @@ public class TestProtocolRecommendations
resp1.setHeader("Content-Length","200");
resp1.setHeader("Date", formatDate(now));
resp1.setHeader("Expires", formatDate(tenSecondsFromNow));
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = new HttpGet("http://foo.example.com/bar?baz=quux");
HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_OK, "OK");
resp2.setEntity(HttpTestUtils.makeBody(200));
resp2.setHeader("Content-Length","200");
resp2.setHeader("Date", formatDate(now));
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
verifyMocks();
}
-
+
@Test
public void responseToGetWithQueryFrom1_0OriginVia1_1ProxyIsNotCached()
throws Exception {
@@ -1418,18 +1418,18 @@ public class TestProtocolRecommendations
resp1.setHeader("Date", formatDate(now));
resp1.setHeader("Expires", formatDate(tenSecondsFromNow));
resp1.setHeader("Via","1.0 someproxy");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = new HttpGet("http://foo.example.com/bar?baz=quux");
HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_OK, "OK");
resp2.setEntity(HttpTestUtils.makeBody(200));
resp2.setHeader("Content-Length","200");
resp2.setHeader("Date", formatDate(now));
resp2.setHeader("Via","1.0 someproxy");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
@@ -1440,7 +1440,7 @@ public class TestProtocolRecommendations
* "A cache that passes through requests for methods it does not
* understand SHOULD invalidate any entities referred to by the
* Request-URI."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.10
*/
@Test
@@ -1449,30 +1449,30 @@ public class TestProtocolRecommendations
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control","max-age=3600");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = new BasicHttpRequest("FROB", "/", HttpVersion.HTTP_1_1);
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("Cache-Control","max-age=3600");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
HttpRequest req3 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp3 = HttpTestUtils.make200Response();
resp3.setHeader("ETag", "\"etag\"");
-
+
backendExpectsAnyRequest().andReturn(resp3);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
HttpResponse result = impl.execute(host, req3);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp3, result));
}
-
+
@Test
public void shouldInvalidateAllVariantsForUnknownMethod()
throws Exception {
@@ -1481,7 +1481,7 @@ public class TestProtocolRecommendations
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control","max-age=3600");
resp1.setHeader("Vary", "User-Agent");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
@@ -1489,30 +1489,30 @@ public class TestProtocolRecommendations
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("Cache-Control","max-age=3600");
resp2.setHeader("Vary", "User-Agent");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
HttpRequest req3 = new BasicHttpRequest("FROB", "/", HttpVersion.HTTP_1_1);
req3.setHeader("User-Agent", "agent3");
HttpResponse resp3 = HttpTestUtils.make200Response();
resp3.setHeader("Cache-Control","max-age=3600");
-
+
backendExpectsAnyRequest().andReturn(resp3);
-
+
HttpRequest req4 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
req4.setHeader("User-Agent", "agent1");
HttpResponse resp4 = HttpTestUtils.make200Response();
resp4.setHeader("ETag", "\"etag1\"");
-
+
backendExpectsAnyRequest().andReturn(resp4);
HttpRequest req5 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
req5.setHeader("User-Agent", "agent2");
HttpResponse resp5 = HttpTestUtils.make200Response();
resp5.setHeader("ETag", "\"etag2\"");
-
+
backendExpectsAnyRequest().andReturn(resp5);
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
@@ -1520,7 +1520,7 @@ public class TestProtocolRecommendations
HttpResponse result4 = impl.execute(host, req4);
HttpResponse result5 = impl.execute(host, req5);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp4, result4));
assertTrue(HttpTestUtils.semanticallyTransparent(resp5, result5));
}
@@ -1529,7 +1529,7 @@ public class TestProtocolRecommendations
* "If a new cacheable response is received from a resource while any
* existing responses for the same resource are cached, the cache
* SHOULD use the new response to reply to the current request."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.12
*/
@Test
@@ -1540,29 +1540,29 @@ public class TestProtocolRecommendations
resp1.setHeader("Date", formatDate(tenSecondsAgo));
resp1.setHeader("Cache-Control", "max-age=3600");
resp1.setHeader("ETag", "\"etag1\"");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "max-age=0");
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("Date", formatDate(now));
resp2.setHeader("Cache-Control", "max-age=3600");
resp2.setHeader("ETag", "\"etag2\"");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
HttpRequest req3 = HttpTestUtils.makeDefaultRequest();
-
+
replayMocks();
impl.execute(host, req1);
impl.execute(host, req2);
HttpResponse result = impl.execute(host, req3);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp2, result));
}
-
+
/*
* "Many HTTP/1.0 cache implementations will treat an Expires value
* that is less than or equal to the response Date value as being
@@ -1571,7 +1571,7 @@ public class TestProtocolRecommendations
* does not include a Cache-Control header field, it SHOULD consider
* the response to be non-cacheable in order to retain compatibility
* with HTTP/1.0 servers."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.3
*/
@Test
@@ -1582,24 +1582,24 @@ public class TestProtocolRecommendations
resp1.setHeader("Date", formatDate(now));
resp1.setHeader("Expires", formatDate(now));
resp1.removeHeaders("Cache-Control");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "max-stale=1000");
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("ETag", "\"etag2\"");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp2, result));
}
-
+
@Test
public void expiresPriorToDateWithNoCacheControlIsNotCacheable()
throws Exception {
@@ -1608,28 +1608,28 @@ public class TestProtocolRecommendations
resp1.setHeader("Date", formatDate(now));
resp1.setHeader("Expires", formatDate(tenSecondsAgo));
resp1.removeHeaders("Cache-Control");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "max-stale=1000");
HttpResponse resp2 = HttpTestUtils.make200Response();
resp2.setHeader("ETag", "\"etag2\"");
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp2, result));
}
/*
* "If a request includes the no-cache directive, it SHOULD NOT
* include min-fresh, max-stale, or max-age."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.4
*/
@Test
@@ -1638,15 +1638,15 @@ public class TestProtocolRecommendations
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
req1.setHeader("Cache-Control", "min-fresh=10, no-cache");
req1.addHeader("Cache-Control", "max-stale=0, max-age=0");
-
+
Capture<HttpRequest> cap = new Capture<HttpRequest>();
expect(mockBackend.execute(same(host), capture(cap), (HttpContext)isNull()))
.andReturn(HttpTestUtils.make200Response());
-
+
replayMocks();
impl.execute(host, req1);
verifyMocks();
-
+
HttpRequest captured = cap.getValue();
boolean foundNoCache = false;
boolean foundDisallowedDirective = false;
@@ -1665,14 +1665,14 @@ public class TestProtocolRecommendations
assertTrue(foundNoCache);
assertFalse(foundDisallowedDirective);
}
-
+
/*
* "To do this, the client may include the only-if-cached directive in
* a request. If it receives this directive, a cache SHOULD either
* respond using a cached entry that is consistent with the other
* constraints of the request, or respond with a 504 (Gateway Timeout)
* status."
- *
+ *
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.4
*/
@Test
@@ -1680,35 +1680,35 @@ public class TestProtocolRecommendations
throws Exception {
HttpRequest req = HttpTestUtils.makeDefaultRequest();
req.setHeader("Cache-Control", "only-if-cached");
-
+
replayMocks();
HttpResponse result = impl.execute(host, req);
verifyMocks();
-
+
assertEquals(HttpStatus.SC_GATEWAY_TIMEOUT,
result.getStatusLine().getStatusCode());
}
-
+
@Test
public void cacheHitOkWithOnlyIfCached()
throws Exception {
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control","max-age=3600");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "only-if-cached");
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp1, result));
}
-
+
@Test
public void returns504ForStaleEntryWithOnlyIfCached()
throws Exception {
@@ -1716,21 +1716,21 @@ public class TestProtocolRecommendations
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Date", formatDate(tenSecondsAgo));
resp1.setHeader("Cache-Control","max-age=5");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "only-if-cached");
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
assertEquals(HttpStatus.SC_GATEWAY_TIMEOUT,
result.getStatusLine().getStatusCode());
}
-
+
@Test
public void returnsStaleCacheEntryWithOnlyIfCachedAndMaxStale()
throws Exception {
@@ -1739,18 +1739,18 @@ public class TestProtocolRecommendations
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Date", formatDate(tenSecondsAgo));
resp1.setHeader("Cache-Control","max-age=5");
-
+
backendExpectsAnyRequest().andReturn(resp1);
-
+
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control", "max-stale=20, only-if-cached");
-
+
replayMocks();
impl.execute(host, req1);
HttpResponse result = impl.execute(host, req2);
verifyMocks();
-
+
assertTrue(HttpTestUtils.semanticallyTransparent(resp1, result));
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRequirements.java Sun Sep 18 16:20:20 2011
@@ -5836,4 +5836,4 @@ public class TestProtocolRequirements ex
Assert.assertTrue(warningHeaders == null || warningHeaders.length == 0);
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRFC5861Compliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRFC5861Compliance.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRFC5861Compliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRFC5861Compliance.java Sun Sep 18 16:20:20 2011
@@ -38,26 +38,26 @@ import org.apache.http.impl.cookie.DateU
import org.apache.http.message.BasicHttpRequest;
import org.junit.Test;
-/**
+/**
* A suite of acceptance tests for compliance with RFC5861, which
* describes the stale-if-error and stale-while-revalidate
* Cache-Control extensions.
*/
public class TestRFC5861Compliance extends AbstractProtocolTest {
- /*
+ /*
* "The stale-if-error Cache-Control extension indicates that when an
* error is encountered, a cached stale response MAY be used to satisfy
- * the request, regardless of other freshness information.When used as a
+ * the request, regardless of other freshness information.When used as a
* request Cache-Control extension, its scope of application is the request
- * it appears in; when used as a response Cache-Control extension, its
- * scope is any request applicable to the cached response in which it
+ * it appears in; when used as a response Cache-Control extension, its
+ * scope is any request applicable to the cached response in which it
* occurs.Its value indicates the upper limit to staleness; when the cached
* response is more stale than the indicated amount, the cached response
* SHOULD NOT be used to satisfy the request, absent other information.
* In this context, an error is any situation that would result in a
* 500, 502, 503, or 504 HTTP response status code being returned."
- *
+ *
* http://tools.ietf.org/html/rfc5861
*/
@Test
@@ -67,22 +67,22 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=60");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
HttpTestUtils.assert110WarningFound(result);
}
-
+
@Test
public void testStaleIfErrorInResponseYieldsToMustRevalidate()
throws Exception{
@@ -90,22 +90,22 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=60, must-revalidate");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
assertTrue(HttpStatus.SC_OK != result.getStatusLine().getStatusCode());
}
-
+
@Test
public void testStaleIfErrorInResponseYieldsToProxyRevalidateForSharedCache()
throws Exception{
@@ -114,46 +114,46 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=60, proxy-revalidate");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
assertTrue(HttpStatus.SC_OK != result.getStatusLine().getStatusCode());
}
-
+
@Test
public void testStaleIfErrorInResponseNeedNotYieldToProxyRevalidateForPrivateCache()
throws Exception{
CacheConfig config = new CacheConfig();
config.setSharedCache(false);
impl = new CachingHttpClient(mockBackend, config);
-
+
Date tenSecondsAgo = new Date(new Date().getTime() - 10 * 1000L);
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=60, proxy-revalidate");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
HttpTestUtils.assert110WarningFound(result);
}
@@ -164,23 +164,23 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=60");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control","min-fresh=2");
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
assertTrue(HttpStatus.SC_OK != result.getStatusLine().getStatusCode());
}
-
+
@Test
public void testStaleIfErrorInRequestIsTrueReturnsStaleEntryWithWarning()
throws Exception{
@@ -188,23 +188,23 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control","public, stale-if-error=60");
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
verifyMocks();
-
+
HttpTestUtils.assert110WarningFound(result);
}
-
+
@Test
public void testStaleIfErrorInResponseIsFalseReturnsError()
throws Exception{
@@ -213,14 +213,14 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5, stale-if-error=2");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
@@ -229,7 +229,7 @@ public class TestRFC5861Compliance exten
assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR,
result.getStatusLine().getStatusCode());
}
-
+
@Test
public void testStaleIfErrorInRequestIsFalseReturnsError()
throws Exception{
@@ -238,15 +238,15 @@ public class TestRFC5861Compliance exten
HttpRequest req1 = HttpTestUtils.makeDefaultRequest();
HttpResponse resp1 = HttpTestUtils.make200Response(tenSecondsAgo,
"public, max-age=5");
-
+
backendExpectsAnyRequest().andReturn(resp1);
HttpRequest req2 = HttpTestUtils.makeDefaultRequest();
req2.setHeader("Cache-Control","stale-if-error=2");
HttpResponse resp2 = HttpTestUtils.make500Response();
-
+
backendExpectsAnyRequest().andReturn(resp2);
-
+
replayMocks();
impl.execute(host,req1);
HttpResponse result = impl.execute(host,req2);
@@ -255,22 +255,22 @@ public class TestRFC5861Compliance exten
assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR,
result.getStatusLine().getStatusCode());
}
-
+
/*
* When present in an HTTP response, the stale-while-revalidate Cache-
* Control extension indicates that caches MAY serve the response in
* which it appears after it becomes stale, up to the indicated number
* of seconds.
- *
+ *
* http://tools.ietf.org/html/rfc5861
*/
@Test
public void testStaleWhileRevalidateReturnsStaleEntryWithWarning()
throws Exception {
-
+
params.setAsynchronousWorkersMax(1);
impl = new CachingHttpClient(mockBackend, cache, params);
-
+
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
Date now = new Date();
@@ -300,15 +300,15 @@ public class TestRFC5861Compliance exten
}
assertTrue(warning110Found);
}
-
+
@Test
public void testCanAlsoServeStale304sWhileRevalidating()
throws Exception {
-
+
params.setAsynchronousWorkersMax(1);
params.setSharedCache(false);
impl = new CachingHttpClient(mockBackend, cache, params);
-
+
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
Date now = new Date();
@@ -340,17 +340,17 @@ public class TestRFC5861Compliance exten
assertTrue(warning110Found);
}
-
+
@Test
public void testStaleWhileRevalidateYieldsToMustRevalidate()
throws Exception {
-
+
Date now = new Date();
Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
-
+
params.setAsynchronousWorkersMax(1);
impl = new CachingHttpClient(mockBackend, cache, params);
-
+
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15, must-revalidate");
@@ -364,7 +364,7 @@ public class TestRFC5861Compliance exten
resp2.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15, must-revalidate");
resp2.setHeader("ETag","\"etag\"");
resp2.setHeader("Date", DateUtils.formatDate(now));
-
+
backendExpectsAnyRequest().andReturn(resp2);
replayMocks();
@@ -388,14 +388,14 @@ public class TestRFC5861Compliance exten
@Test
public void testStaleWhileRevalidateYieldsToProxyRevalidateForSharedCache()
throws Exception {
-
+
Date now = new Date();
Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
-
+
params.setAsynchronousWorkersMax(1);
params.setSharedCache(true);
impl = new CachingHttpClient(mockBackend, cache, params);
-
+
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15, proxy-revalidate");
@@ -409,7 +409,7 @@ public class TestRFC5861Compliance exten
resp2.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15, proxy-revalidate");
resp2.setHeader("ETag","\"etag\"");
resp2.setHeader("Date", DateUtils.formatDate(now));
-
+
backendExpectsAnyRequest().andReturn(resp2);
replayMocks();
@@ -433,14 +433,14 @@ public class TestRFC5861Compliance exten
@Test
public void testStaleWhileRevalidateYieldsToExplicitFreshnessRequest()
throws Exception {
-
+
Date now = new Date();
Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
-
+
params.setAsynchronousWorkersMax(1);
params.setSharedCache(true);
impl = new CachingHttpClient(mockBackend, cache, params);
-
+
HttpRequest req1 = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
HttpResponse resp1 = HttpTestUtils.make200Response();
resp1.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15");
@@ -455,7 +455,7 @@ public class TestRFC5861Compliance exten
resp2.setHeader("Cache-Control", "public, max-age=5, stale-while-revalidate=15");
resp2.setHeader("ETag","\"etag\"");
resp2.setHeader("Date", DateUtils.formatDate(now));
-
+
backendExpectsAnyRequest().andReturn(resp2);
replayMocks();
@@ -475,5 +475,5 @@ public class TestRFC5861Compliance exten
}
assertFalse(warning110Found);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRequestProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRequestProtocolCompliance.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRequestProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestRequestProtocolCompliance.java Sun Sep 18 16:20:20 2011
@@ -42,22 +42,22 @@ public class TestRequestProtocolComplian
private RequestProtocolCompliance impl;
private HttpRequest req;
private HttpRequest result;
-
+
@Before
public void setUp() {
req = HttpTestUtils.makeDefaultRequest();
impl = new RequestProtocolCompliance();
}
-
+
@Test
public void doesNotModifyACompliantRequest() throws Exception {
- result = impl.makeRequestCompliant(req);
+ result = impl.makeRequestCompliant(req);
assertTrue(HttpTestUtils.equivalent(req, result));
}
-
+
@Test
public void removesEntityFromTRACERequest() throws Exception {
- HttpEntityEnclosingRequest req =
+ HttpEntityEnclosingRequest req =
new BasicHttpEntityEnclosingRequest("TRACE", "/", HttpVersion.HTTP_1_1);
req.setEntity(HttpTestUtils.makeBody(50));
result = impl.makeRequestCompliant(req);
@@ -65,7 +65,7 @@ public class TestRequestProtocolComplian
assertNull(((HttpEntityEnclosingRequest)result).getEntity());
}
}
-
+
@Test
public void upgrades1_0RequestTo1_1() throws Exception {
req = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_0);
@@ -80,7 +80,7 @@ public class TestRequestProtocolComplian
result = impl.makeRequestCompliant(req);
assertEquals(HttpVersion.HTTP_1_1, result.getProtocolVersion());
}
-
+
@Test
public void stripsMinFreshFromRequestIfNoCachePresent()
throws Exception {
@@ -107,7 +107,7 @@ public class TestRequestProtocolComplian
assertEquals("no-cache",
result.getFirstHeader("Cache-Control").getValue());
}
-
+
@Test
public void doesNotStripMinFreshFromRequestWithoutNoCache()
throws Exception {
@@ -116,7 +116,7 @@ public class TestRequestProtocolComplian
assertEquals("min-fresh=10",
result.getFirstHeader("Cache-Control").getValue());
}
-
+
@Test
public void correctlyStripsMinFreshFromMiddleIfNoCache()
throws Exception {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java Sun Sep 18 16:20:20 2011
@@ -60,7 +60,7 @@ public class TestResponseCachingPolicy {
now = new Date();
sixSecondsAgo = new Date(now.getTime() - 6 * 1000L);
tenSecondsFromNow = new Date(now.getTime() + 10 * 1000L);
-
+
policy = new ResponseCachingPolicy(0, true);
request = new BasicHttpRequest("GET","/",HTTP_1_1);
response = new BasicHttpResponse(
@@ -397,7 +397,7 @@ public class TestResponseCachingPolicy {
response = new BasicHttpResponse(HttpVersion.HTTP_1_0, HttpStatus.SC_OK, "OK");
Assert.assertFalse(policy.isResponseCacheable(request, response));
}
-
+
@Test
public void getsWithQueryParametersDirectlyFrom1_0OriginsAreNotCacheableEvenWithExpires() {
request = new BasicHttpRequest("GET", "/foo?s=bar");
@@ -406,7 +406,7 @@ public class TestResponseCachingPolicy {
response.setHeader("Expires", formatDate(tenSecondsFromNow));
Assert.assertFalse(policy.isResponseCacheable(request, response));
}
-
+
@Test
public void getsWithQueryParametersFrom1_0OriginsViaProxiesAreNotCacheable() {
request = new BasicHttpRequest("GET", "/foo?s=bar");
@@ -424,7 +424,7 @@ public class TestResponseCachingPolicy {
response.setHeader("Via", "1.0 someproxy");
Assert.assertFalse(policy.isResponseCacheable(request, response));
}
-
+
@Test
public void getsWithQueryParametersFrom1_0OriginsViaExplicitProxiesAreNotCacheableEvenWithExpires() {
request = new BasicHttpRequest("GET", "/foo?s=bar");
@@ -443,7 +443,7 @@ public class TestResponseCachingPolicy {
response.setHeader("Via", "1.1 someproxy");
Assert.assertTrue(policy.isResponseCacheable(request, response));
}
-
+
@Test
public void notCacheableIfExpiresEqualsDateAndNoCacheControl() {
response.setHeader("Date", formatDate(now));
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java?rev=1172301&r1=1172300&r2=1172301&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseProtocolCompliance.java Sun Sep 18 16:20:20 2011
@@ -60,12 +60,12 @@ public class TestResponseProtocolComplia
private static class Flag {
public boolean set;
}
-
+
private void setMinimalResponseHeaders(HttpResponse resp) {
resp.setHeader("Date", DateUtils.formatDate(new Date()));
resp.setHeader("Server", "MyServer/1.0");
}
-
+
private ByteArrayInputStream makeTrackableBody(int nbytes, final Flag closed) {
byte[] buf = HttpTestUtils.getRandomBytes(nbytes);
ByteArrayInputStream bais = new ByteArrayInputStream(buf) {
@@ -76,7 +76,7 @@ public class TestResponseProtocolComplia
};
return bais;
}
-
+
private HttpResponse makePartialResponse(int nbytes) {
HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_PARTIAL_CONTENT, "Partial Content");
setMinimalResponseHeaders(resp);
@@ -84,7 +84,7 @@ public class TestResponseProtocolComplia
resp.setHeader("Content-Range","0-127/256");
return resp;
}
-
+
@Test
public void consumesBodyIfOriginSendsOneInResponseToHEAD() throws Exception {
HttpRequest req = new HttpHead("http://foo.example.com/");
@@ -96,7 +96,7 @@ public class TestResponseProtocolComplia
final Flag closed = new Flag();
ByteArrayInputStream bais = makeTrackableBody(nbytes, closed);
resp.setEntity(new InputStreamEntity(bais, -1));
-
+
impl.ensureProtocolCompliance(req, resp);
assertNull(resp.getEntity());
assertTrue(closed.set || bais.read() == -1);
@@ -108,7 +108,7 @@ public class TestResponseProtocolComplia
int nbytes = 128;
HttpResponse resp = makePartialResponse(nbytes);
resp.setEntity(HttpTestUtils.makeBody(nbytes));
-
+
impl.ensureProtocolCompliance(req, resp);
}
@@ -117,18 +117,18 @@ public class TestResponseProtocolComplia
HttpRequest req = new HttpGet("http://foo.example.com/");
int nbytes = 128;
HttpResponse resp = makePartialResponse(nbytes);
-
+
final Flag closed = new Flag();
ByteArrayInputStream bais = makeTrackableBody(nbytes, closed);
resp.setEntity(new InputStreamEntity(bais, -1));
-
+
try {
impl.ensureProtocolCompliance(req, resp);
} catch (ClientProtocolException expected) {
}
assertTrue(closed.set || bais.read() == -1);
}
-
+
@Test
public void consumesBodyOf100ContinueResponseIfItArrives() throws Exception {
HttpEntityEnclosingRequest req = new BasicHttpEntityEnclosingRequest("POST", "/", HttpVersion.HTTP_1_1);
@@ -137,12 +137,12 @@ public class TestResponseProtocolComplia
req.setHeader("Content-Type", "application/octet-stream");
HttpEntity postBody = new ByteArrayEntity(HttpTestUtils.getRandomBytes(nbytes));
req.setEntity(postBody);
-
+
HttpResponse resp = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_CONTINUE, "Continue");
final Flag closed = new Flag();
ByteArrayInputStream bais = makeTrackableBody(nbytes, closed);
resp.setEntity(new InputStreamEntity(bais, -1));
-
+
try {
impl.ensureProtocolCompliance(req, resp);
} catch (ClientProtocolException expected) {