You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/06/18 02:28:45 UTC
svn commit: r668882 - in
/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet:
GadgetRenderingTaskTest.java ServletTestFixture.java
Author: etnu
Date: Tue Jun 17 17:28:45 2008
New Revision: 668882
URL: http://svn.apache.org/viewvc?rev=668882&view=rev
Log:
Updated cache tests to be less time sensitive. We should consider having at least a static clock of some sort on these routines to make testing this stuff easier.
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=668882&r1=668881&r2=668882&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java Tue Jun 17 17:28:45 2008
@@ -51,8 +51,6 @@
}
};
- final ServletTestFixture fixture = new ServletTestFixture();
-
final static URI SPEC_URL = URI.create("http://example.org/gadget.xml");
final static HttpRequest SPEC_REQUEST = new HttpRequest(SPEC_URL);
final static String CONTENT = "Hello, world!";
@@ -66,6 +64,15 @@
"</Module>";
final static String LIBS = "dummy:blah";
+ private ServletTestFixture fixture;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ fixture = new ServletTestFixture();
+ }
+
+
/**
* Performs boilerplate operations to get basic gadgets rendered
* @return Output of the rendering request
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=668882&r1=668881&r2=668882&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Tue Jun 17 17:28:45 2008
@@ -87,12 +87,12 @@
// TODO: A better solution here would be an injectable clock. For now a 1 second fudge is used.
long lowerBound = testStartTime + (1000L * (ttl - 1));
- long upperBound = lowerBound + 6000L;
+ long upperBound = lowerBound + 2000L;
assertGreater("Expires should be at least " + ttl + " seconds more than start time.",
lowerBound, expires);
- assertLesser("Expires should be within 5 seconds of the requested value.",
+ assertLesser("Expires should be within 2 seconds of the requested value.",
upperBound, expires);
if (ttl == 0) {