You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2022/02/01 11:05:42 UTC

[sling-org-apache-sling-scripting-sightly] 02/02: SLING-11108 - org.apache.sling.scripting.sightly.impl.engine.extension.FormatFilterExtensionTest#testDateFormatWithEscapedCharacters fails on newer JDKs

This is an automated email from the ASF dual-hosted git repository.

radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly.git

commit 6fe7d5efa04bc2f039c800c328a6892ed440080c
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Feb 1 12:04:48 2022 +0100

    SLING-11108 - org.apache.sling.scripting.sightly.impl.engine.extension.FormatFilterExtensionTest#testDateFormatWithEscapedCharacters fails on newer JDKs
    
    * make the test consistent by providing a set locale
---
 .../sightly/impl/engine/extension/FormatFilterExtensionTest.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtensionTest.java b/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtensionTest.java
index f168883..9c33bc6 100644
--- a/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtensionTest.java
+++ b/src/test/java/org/apache/sling/scripting/sightly/impl/engine/extension/FormatFilterExtensionTest.java
@@ -23,6 +23,7 @@ import java.time.ZoneId;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.script.Bindings;
@@ -106,10 +107,10 @@ public class FormatFilterExtensionTest {
     @Test
     public void testDateFormatWithEscapedCharacters() {
         assumeJdk8LocaleData();
-        assertDate("01 December '18 12:00 AM; day in year: 335; week in year: 49",
+        assertDate("01 December '18 12:00 AM; day in year: 335; week in year: 48",
             "dd MMMM ''yy hh:mm a; 'day in year': D; 'week in year': w",
             "UTC",
-            null);
+            Locale.UK.toString());
     }
 
     /**
@@ -186,4 +187,4 @@ public class FormatFilterExtensionTest {
         }
         assertEquals(expected, subject.call(renderContext, format, options));
     }
-}
\ No newline at end of file
+}