Updated Branches: refs/heads/wicket-1.5.x df1df0e43 -> 9376af3b5
WICKET-4619 Windows JRE6 StoredResponsesMapTest#getExpiredValue() falures Sleep for a duration that is twice longer than StoredResponsesMap's timeout duration. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9376af3b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9376af3b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9376af3b Branch: refs/heads/wicket-1.5.x Commit: 9376af3b5482da3e7c829311a88dfb1f1f7f5cd4 Parents: df1df0e Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jun 26 12:03:01 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jun 26 12:04:22 2012 +0300 ---------------------------------------------------------------------- .../protocol/http/StoredResponsesMapTest.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9376af3b/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java index a7cb2d9..81e83cd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java @@ -24,8 +24,8 @@ import java.util.concurrent.TimeUnit; import org.apache.wicket.util.SlowTests; import org.apache.wicket.util.time.Duration; +import org.apache.wicket.util.time.Time; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -62,13 +62,15 @@ public class StoredResponsesMapTest extends Assert @Test public void getExpiredValue() throws Exception { - StoredResponsesMap map = new StoredResponsesMap(1000, Duration.milliseconds(50)); + Time start = Time.now(); + Duration timeout = Duration.milliseconds(50); + StoredResponsesMap map = new StoredResponsesMap(1000, timeout); assertEquals(0, map.size()); map.put("1", new BufferedWebResponse(null)); assertEquals(1, map.size()); - TimeUnit.MILLISECONDS.sleep(51); + TimeUnit.MILLISECONDS.sleep(timeout.getMilliseconds() * 2); // sleep for twice longer than the timeout + assertTrue("The timeout has passed.", Time.now().subtract(start).compareTo(timeout) == 1); Object value = map.get("1"); - // TODO This test sometimes fails on XP and java 1.6 (not reproduceable) assertNull(value); }
