Repository: incubator-freemarker Updated Branches: refs/heads/3 578a57b16 -> 3ce155f2d
(Test: Shorter sleep) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/3ce155f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/3ce155f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/3ce155f2 Branch: refs/heads/3 Commit: 3ce155f2d416111d8e5d4c7338db1aef4036c901 Parents: 578a57b Author: ddekany <[email protected]> Authored: Tue May 16 18:55:55 2017 +0200 Committer: ddekany <[email protected]> Committed: Tue May 16 18:55:55 2017 +0200 ---------------------------------------------------------------------- .../core/templateresolver/DefaultTemplateResolverTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/3ce155f2/freemarker-core-test/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java index a7063fd..f51ba86 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java @@ -50,7 +50,7 @@ public class DefaultTemplateResolverTest { MockTemplateLoader loader = new MockTemplateLoader(); DefaultTemplateResolver tr = new DefaultTemplateResolver( loader, - new StrongCacheStorage(), 1000L, + new StrongCacheStorage(), 100L, DefaultTemplateLookupStrategy.INSTANCE, true, DefaultTemplateNameFormat.INSTANCE, null, @@ -73,7 +73,7 @@ public class DefaultTemplateResolverTest { assertSame(e, e2.getCause()); assertEquals(1, loader.getLoadAttemptCount()); try { - Thread.sleep(1100L); + Thread.sleep(132L); tr.getTemplate("t", Locale.getDefault(), null).getTemplate(); fail(); } catch (IOException e3) { @@ -90,7 +90,7 @@ public class DefaultTemplateResolverTest { MockTemplateLoader loader = new MockTemplateLoader(); DefaultTemplateResolver cache = new DefaultTemplateResolver( loader, - new StrongCacheStorage(), 1000L, + new StrongCacheStorage(), 100L, DefaultTemplateLookupStrategy.INSTANCE, false, DefaultTemplateNameFormat.INSTANCE, null, new TestConfigurationBuilder().build()); @@ -99,7 +99,7 @@ public class DefaultTemplateResolverTest { assertNull(cache.getTemplate("t", Locale.getDefault(), null).getTemplate()); // Still 1 - returned cached exception assertEquals(1, loader.getLoadAttemptCount()); - Thread.sleep(1100L); + Thread.sleep(132L); assertNull(cache.getTemplate("t", Locale.getDefault(), null).getTemplate()); // Cache had to retest assertEquals(2, loader.getLoadAttemptCount());
