[freemarker] branch FREEMARKER-35 updated: [FREEMARKER-35] JUnit test setup fix

[ddekany]

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


The following commit(s) were added to refs/heads/FREEMARKER-35 by this push:
     new 34de4db  [FREEMARKER-35] JUnit test setup fix
34de4db is described below

commit 34de4db10cf40ebfabb19611775c39d3a3cc356a
Author: ddekany <ddek...@apache.org>
AuthorDate: Thu Dec 16 19:50:54 2021 +0100

    [FREEMARKER-35] JUnit test setup fix
---
 src/test/java/freemarker/test/templatesuite/TemplateTestCase.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java 
b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
index 1ab62ab..f0e6fc6 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
@@ -26,14 +26,13 @@ import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.OffsetTime;
 import java.time.Year;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.time.temporal.Temporal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -357,8 +356,9 @@ public class TemplateTestCase extends FileTestCase {
             dataModel.put("dateTime", new java.sql.Timestamp(d.getTime()));
         } else if (simpleTestName.equals("temporal")) {
             LocalDateTime ldt = LocalDateTime.of(2003, 4, 5, 6, 7, 8);
-            dataModel.put("dateTime", new java.sql.Timestamp(103, 4 - 1, 5, 8, 
7, 8, 0));
-            dataModel.put("instant", ldt.toInstant(ZoneOffset.UTC));
+            Instant instant = ldt.toInstant(ZoneOffset.UTC);
+            dataModel.put("dateTime", new 
java.sql.Timestamp(instant.toEpochMilli()));
+            dataModel.put("instant", instant);
             dataModel.put("localDateTime", ldt);
             dataModel.put("localDate", ldt.toLocalDate());
             dataModel.put("localTime", ldt.toLocalTime());