This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 1b8481f63a083ca4b0aa44515762f869117e0e7d Author: ddekany <[email protected]> AuthorDate: Fri Dec 8 11:43:02 2023 +0100 Adjusted JUnit test expected value for JDK 11+, where the default format of numbers and temporals has been changed. (We already require JDK 16 for the build.) --- src/test/java/freemarker/core/CAndCnBuiltInTest.java | 2 +- src/test/java/freemarker/core/DateFormatTest.java | 2 +- src/test/java/freemarker/core/NumberFormatTest.java | 2 +- .../freemarker/test/templatesuite/expected/number-format.txt | 4 ++-- .../freemarker/test/templatesuite/templates/number-format.ftl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/freemarker/core/CAndCnBuiltInTest.java b/src/test/java/freemarker/core/CAndCnBuiltInTest.java index 9e73e8a8..b3c8f508 100644 --- a/src/test/java/freemarker/core/CAndCnBuiltInTest.java +++ b/src/test/java/freemarker/core/CAndCnBuiltInTest.java @@ -107,7 +107,7 @@ public class CAndCnBuiltInTest extends TemplateTest { expectedNaN = "NaN"; } else { expectedInf = "\u221E"; - expectedNaN = "\uFFFD"; + expectedNaN = "NaN"; // was \uFFFD before Java 11 } assertOutput("${" + type + "Inf?" + builtInName + "}", expectedInf); diff --git a/src/test/java/freemarker/core/DateFormatTest.java b/src/test/java/freemarker/core/DateFormatTest.java index 3f8a81c4..53243615 100644 --- a/src/test/java/freemarker/core/DateFormatTest.java +++ b/src/test/java/freemarker/core/DateFormatTest.java @@ -382,7 +382,7 @@ public class DateFormatTest extends TemplateTest { + "<#setting locale='en_GB_Win'>${d} " + "<#setting locale='fr_FR'>${d} " + "<#setting locale='hu_HU'>${d}", - "2015-Sep_en 2015-Sep_en_GB 2015-Sep_en_GB 2015-sept._fr_FR 2015-szept."); + "2015-Sep_en 2015-Sept_en_GB 2015-Sept_en_GB 2015-sept._fr_FR 2015-szept."); } /** diff --git a/src/test/java/freemarker/core/NumberFormatTest.java b/src/test/java/freemarker/core/NumberFormatTest.java index 4d4ce237..b9f99789 100644 --- a/src/test/java/freemarker/core/NumberFormatTest.java +++ b/src/test/java/freemarker/core/NumberFormatTest.java @@ -332,7 +332,7 @@ public class NumberFormatTest extends TemplateTest { boolean cBuiltInBroken = ici.intValue() < Configuration.VERSION_2_3_21.intValue(); boolean cNumberFormatBroken = ici.intValue() < Configuration.VERSION_2_3_31.intValue(); - String humanAudienceOutput = "\u221e -\u221e \ufffd"; + String humanAudienceOutput = "\u221e -\u221e NaN"; // NaN was \uFFFD before Java 11 String computerAudienceOutput = ici.intValue() < Configuration.VERSION_2_3_32.intValue() ? "INF -INF NaN" : "Infinity -Infinity NaN"; diff --git a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt index 5d8237df..326bddb1 100644 --- a/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt +++ b/src/test/resources/freemarker/test/templatesuite/expected/number-format.txt @@ -18,7 +18,7 @@ */ 1 1 -1 234 567,89 +1 234 567,89 1234567.886 1,00 1 @@ -27,4 +27,4 @@ 1 100000.5 100000.5 -100 000,5 \ No newline at end of file +100 000,5 \ No newline at end of file diff --git a/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl b/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl index 9d4b61f6..5ffaf5c2 100644 --- a/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl +++ b/src/test/resources/freemarker/test/templatesuite/templates/number-format.ftl @@ -58,5 +58,5 @@ ${100000.5} <#else> <@assertEquals expected="\x221E" actual="INF"?number?string /> <@assertEquals expected="-\x221E" actual="-INF"?number?string /> - <@assertEquals expected="\xFFFD" actual="NaN"?number?string /> + <@assertEquals expected="NaN"<#-- was \xFFFD before Java 11 --> actual="NaN"?number?string /> </#if> \ No newline at end of file
