Author: lindner
Date: Thu May 13 13:47:10 2010
New Revision: 943881
URL: http://svn.apache.org/viewvc?rev=943881&view=rev
Log:
add method that returns the static ttl value because Guice can alter this in
the test module
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=943881&r1=943880&r2=943881&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
Thu May 13 13:47:10 2010
@@ -450,6 +450,15 @@ public final class HttpResponse implemen
}
/**
+ * returns the default TTL for responses. Used mainly by tests because
Guice static injects TTL values.
+ *
+ * @return milliseconds of the ttl
+ */
+ public long getDefaultTtl() {
+ return defaultTtl;
+ }
+
+ /**
* Attempts to determine the encoding of the body. If it can't be
determined, we use
* DEFAULT_ENCODING instead.
*
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?rev=943881&r1=943880&r2=943881&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
Thu May 13 13:47:10 2010
@@ -243,10 +243,10 @@ public class HttpResponseTest extends As
.addHeader("Pragma", "junk")
.create();
assertFalse(response.isStrictNoCache());
- int expected = roundToSeconds(System.currentTimeMillis() +
HttpResponse.DEFAULT_TTL);
+ int expected = roundToSeconds(System.currentTimeMillis() +
response.getDefaultTtl());
int expires = roundToSeconds(response.getCacheExpiration());
assertEquals(expected, expires);
- assertTrue(response.getCacheTtl() <= HttpResponse.DEFAULT_TTL &&
response.getCacheTtl() > 0);
+ assertTrue(response.getCacheTtl() <= response.getDefaultTtl() &&
response.getCacheTtl() > 0);
}
@Test
@@ -351,9 +351,9 @@ public class HttpResponseTest extends As
HttpResponse response = new HttpResponseBuilder()
.addHeader("Date", DateUtil.formatRfc1123Date(1000L * time))
.create();
- assertEquals(time + roundToSeconds(HttpResponse.DEFAULT_TTL),
+ assertEquals(time + roundToSeconds(response.getDefaultTtl()),
roundToSeconds(response.getCacheExpiration()));
- assertTtlOk(roundToSeconds(HttpResponse.DEFAULT_TTL), response);
+ assertTtlOk(roundToSeconds(response.getDefaultTtl()), response);
}
@Test
@@ -384,7 +384,7 @@ public class HttpResponseTest extends As
.setStrictNoCache()
.create();
long ttl = response.getCacheTtl();
- assertTrue(ttl <= HttpResponse.DEFAULT_TTL && ttl > 0);
+ assertTrue(ttl <= response.getDefaultTtl() && ttl > 0);
}
@Test
