This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch FREEMARKER-35 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 959330fd02a15d70a357071ab83b90ecaf182e61 Author: ddekany <[email protected]> AuthorDate: Fri Jan 6 01:56:46 2023 +0100 FREEMARKER-35: (Avoid ant JUnit test task failing on abstract test class) --- ...stractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java} | 4 ++-- .../freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java | 2 +- .../TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java | 2 +- .../core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/freemarker/core/TemplateTemporalFormatAbstractCachingInEnvironmentTest.java b/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java similarity index 95% rename from src/test/java/freemarker/core/TemplateTemporalFormatAbstractCachingInEnvironmentTest.java rename to src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java index d7f293a8..93a320dd 100644 --- a/src/test/java/freemarker/core/TemplateTemporalFormatAbstractCachingInEnvironmentTest.java +++ b/src/test/java/freemarker/core/AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest.java @@ -39,12 +39,12 @@ import freemarker.template.TemplateException; import freemarker.template.utility.DateUtil; import freemarker.template.utility.NullWriter; -public abstract class TemplateTemporalFormatAbstractCachingInEnvironmentTest { +public abstract class AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest { protected static final TimeZone OTHER_TIME_ZONE = TimeZone.getTimeZone("GMT+01"); protected final Environment env; - public TemplateTemporalFormatAbstractCachingInEnvironmentTest() { + public AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest() { try { this.env = createEnvironment(); } catch (Exception e) { diff --git a/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java b/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java index b0c1e6d9..2d705f3f 100644 --- a/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java +++ b/src/test/java/freemarker/core/FormatCacheMemoryLeakPreventionFlushingTest.java @@ -33,7 +33,7 @@ import freemarker.template.TemplateDateModel; * also assert when exactly the flushing happens; that can change in the future, in which case adjust the tests. */ public class FormatCacheMemoryLeakPreventionFlushingTest - extends TemplateTemporalFormatAbstractCachingInEnvironmentTest { + extends AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest { @Test public void testGlobalJavaTemporalFormatCacheLeakProtection() throws Exception { diff --git a/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java b/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java index 262fd4c3..04b5b63a 100644 --- a/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java +++ b/src/test/java/freemarker/core/TemplateTemporalFormatByFormatStringCachingInEnvironmentTest.java @@ -47,7 +47,7 @@ import freemarker.template.TemplateException; * to <code>${temporal}</code>). */ public class TemplateTemporalFormatByFormatStringCachingInEnvironmentTest - extends TemplateTemporalFormatAbstractCachingInEnvironmentTest { + extends AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest { public void test() throws IOException, TemplateException, TemplateValueFormatException { Class<? extends Temporal> temporalClass = LocalDateTime.class; diff --git a/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java b/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java index dc02becf..9e481bf7 100644 --- a/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java +++ b/src/test/java/freemarker/core/TemplateTemporalFormatCurrentCachingInEnvironmentTest.java @@ -47,7 +47,7 @@ import freemarker.template.utility.NullWriter; * @see TemplateTemporalFormatByFormatStringCachingInEnvironmentTest */ public class TemplateTemporalFormatCurrentCachingInEnvironmentTest - extends TemplateTemporalFormatAbstractCachingInEnvironmentTest { + extends AbstractTemplateTemporalFormatAbstractCachingInEnvironmentTest { @Test public void testTemporalClassSeparation() throws Exception {
