Repository: tomee Updated Branches: refs/heads/master d57a8cb0a -> 40f2ab750
avoid timezone issues in LocalFileHandlerPatternFormatterTest Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/40f2ab75 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/40f2ab75 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/40f2ab75 Branch: refs/heads/master Commit: 40f2ab7502208c8851d7eaee45d642e044fcc96d Parents: d57a8cb Author: rmannibucau <[email protected]> Authored: Tue Jan 3 09:54:34 2017 +0100 Committer: rmannibucau <[email protected]> Committed: Tue Jan 3 09:54:34 2017 +0100 ---------------------------------------------------------------------- .../LocalFileHandlerPatternFormatterTest.java | 23 ++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/40f2ab75/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java index 15ca282..30faa11 100644 --- a/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java +++ b/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerPatternFormatterTest.java @@ -16,6 +16,7 @@ */ package org.apache.tomee.jul.handler.rotating; +import org.junit.Before; import org.junit.Test; import java.util.Locale; @@ -23,8 +24,22 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class LocalFileHandlerPatternFormatterTest { + private Locale locale; + + @Before + public void setLocale() { + locale = Locale.getDefault(); + Locale.setDefault(Locale.US); + } + + @Before + public void resetLocale() { + Locale.setDefault(locale); + } + @Test public void format() { final LogRecord record = new LogRecord(Level.FINE, "test message"); @@ -45,9 +60,9 @@ public class LocalFileHandlerPatternFormatterTest { "test message\n", new LocalFileHandler.PatternFormatter("%5$s%n", Locale.ENGLISH).format(record).replace("\r", "")); - // simple - assertEquals("1970-17-02 11:17:36 [FINER][my.class.Name] test message\n", - new LocalFileHandler.PatternFormatter( - "%1$tY-%1$tM-%1$td %1$tT [%4$5s][%7$s] %5$s%6$s%n", Locale.ENGLISH).format(record).replace("\r", "")); + final String custom = new LocalFileHandler.PatternFormatter("%1$tY-%1$tM-%1$td %1$tT [%4$5s][%7$s] %5$s%6$s%n", Locale.ENGLISH) + .format(record).replace("\r", ""); + assertTrue(custom + .matches("1970\\-17\\-02 \\p{Digit}+\\:17\\:36 \\[FINER\\]\\[my\\.class\\.Name\\] test message\\\n")); } }
