You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2014/02/25 02:29:46 UTC
svn commit: r1571518 -
/httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
Author: sebb
Date: Tue Feb 25 01:29:46 2014
New Revision: 1571518
URL: http://svn.apache.org/r1571518
Log:
Remove duplication of setUp() code
Avoid name hiding
Modified:
httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
Modified: httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java?rev=1571518&r1=1571517&r2=1571518&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/branches/4.3.x/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java Tue Feb 25 01:29:46 2014
@@ -321,15 +321,15 @@ public class TestResponseCachingPolicy {
@Test
public void testIsGetWithout200Cacheable() {
- HttpResponse response = new BasicHttpResponse(new BasicStatusLine(HTTP_1_1,
+ HttpResponse response404 = new BasicHttpResponse(new BasicStatusLine(HTTP_1_1,
HttpStatus.SC_NOT_FOUND, ""));
- Assert.assertFalse(policy.isResponseCacheable("GET", response));
+ Assert.assertFalse(policy.isResponseCacheable("GET", response404));
- response = new BasicHttpResponse(new BasicStatusLine(HTTP_1_1,
+ response404 = new BasicHttpResponse(new BasicStatusLine(HTTP_1_1,
HttpStatus.SC_GATEWAY_TIMEOUT, ""));
- Assert.assertFalse(policy.isResponseCacheable("GET", response));
+ Assert.assertFalse(policy.isResponseCacheable("GET", response404));
}
@Test
@@ -435,8 +435,6 @@ public class TestResponseCachingPolicy {
@Test
public void testResponsesWithMultipleExpiresHeadersAreNotCacheable() {
- final Date now = new Date();
- final Date sixSecondsAgo = new Date(now.getTime() - 6 * 1000L);
response.addHeader("Expires", DateUtils.formatDate(now));
response.addHeader("Expires", DateUtils.formatDate(sixSecondsAgo));
Assert.assertFalse(policy.isResponseCacheable("GET", response));
@@ -448,8 +446,6 @@ public class TestResponseCachingPolicy {
request.setHeader("Authorization", "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==");
response.setHeader("Cache-Control", "public");
- final Date now = new Date();
- final Date sixSecondsAgo = new Date(now.getTime() - 6 * 1000L);
response.addHeader("Expires", DateUtils.formatDate(now));
response.addHeader("Expires", DateUtils.formatDate(sixSecondsAgo));
Assert.assertFalse(policy.isResponseCacheable(request, response));
@@ -557,8 +553,6 @@ public class TestResponseCachingPolicy {
@Test
public void getsWithQueryParametersFrom1_0OriginsViaProxiesAreCacheableWithExpires() {
request = new BasicHttpRequest("GET", "/foo?s=bar");
- final Date now = new Date();
- final Date tenSecondsFromNow = new Date(now.getTime() + 10 * 1000L);
response.setHeader("Date", DateUtils.formatDate(now));
response.setHeader("Expires", DateUtils.formatDate(tenSecondsFromNow));
response.setHeader("Via", "1.0 someproxy");
@@ -569,8 +563,6 @@ public class TestResponseCachingPolicy {
public void getsWithQueryParametersFrom1_0OriginsViaProxiesCanNotBeCacheableEvenWithExpires() {
policy = new ResponseCachingPolicy(0, true, true, true);
request = new BasicHttpRequest("GET", "/foo?s=bar");
- final Date now = new Date();
- final Date tenSecondsFromNow = new Date(now.getTime() + 10 * 1000L);
response.setHeader("Date", DateUtils.formatDate(now));
response.setHeader("Expires", DateUtils.formatDate(tenSecondsFromNow));
response.setHeader("Via", "1.0 someproxy");