Repository: logging-log4j2 Updated Branches: refs/heads/master f1c0d6806 -> 551ae399a
LOG4J2-829 replace magic number with Calendar to generate timestamp Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/551ae399 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/551ae399 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/551ae399 Branch: refs/heads/master Commit: 551ae399a1cb468cc662d64bf38434a4fe781f08 Parents: f1c0d68 Author: rpopma <[email protected]> Authored: Sat Sep 20 11:35:45 2014 +0900 Committer: rpopma <[email protected]> Committed: Sat Sep 20 11:35:45 2014 +0900 ---------------------------------------------------------------------- .../appender/rolling/PatternProcessorTest.java | 10 ++++++--- .../log4j/core/pattern/PatternParserTest2.java | 23 +++++++++++++------- 2 files changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/551ae399/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java index 53928b5..a41e68c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java @@ -198,10 +198,14 @@ public class PatternProcessorTest { @Test public void testDontInterpretBackslashAsEscape() { - final PatternProcessor pp = new PatternProcessor("c:\\test\\new/app-%d{HH-mm-ss}{GMT+0}.log"); + final PatternProcessor pp = new PatternProcessor("c:\\test\\new/app-%d{HH-mm-ss}.log"); + final Calendar cal = Calendar.getInstance(); + cal.set(Calendar.HOUR_OF_DAY, 16); + cal.set(Calendar.MINUTE, 02); + cal.set(Calendar.SECOND, 15); + final StringBuilder buf = new StringBuilder(); - final Date date = new Date(1411142535260L); // Sat Sep 20 01:02:15 JST 2014 - pp.formatFileName(buf, date, 23); + pp.formatFileName(buf, cal.getTime(), 23); assertEquals("c:\\test\\new/app-16-02-15.log", buf.toString()); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/551ae399/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java index f945c36..ad6a0e5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest2.java @@ -17,6 +17,7 @@ package org.apache.logging.log4j.core.pattern; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -33,24 +34,30 @@ public class PatternParserTest2 { public void testParseConvertBackslashes() { final boolean convert = true; final StringBuilder buf = new StringBuilder(); - final String pattern = "%d{HHmmss}{GMT+0} \\t ..."; + final String pattern = "%d{HH-mm-ss} \\t ..."; - final Date date = new Date(1411142535260L); // Sat Sep 20 01:02:15 JST 2014 - parse(pattern, convert, buf, date, 123); + final Calendar cal = Calendar.getInstance(); + cal.set(Calendar.HOUR_OF_DAY, 23); + cal.set(Calendar.MINUTE, 53); + cal.set(Calendar.SECOND, 01); + parse(pattern, convert, buf, cal.getTime(), 123); - assertEquals("160215 \t ...", buf.toString()); + assertEquals("23-53-01 \t ...", buf.toString()); } @Test public void testParseDontConvertBackslashes() { final boolean convert = false; final StringBuilder buf = new StringBuilder(); - final String pattern = "%d{HHmmss}{GMT+0} \\t---"; + final String pattern = "%d{HH-mm-ss} \\t---"; - final Date date = new Date(1411142535260L); // Sat Sep 20 01:02:15 JST 2014 - parse(pattern, convert, buf, date, new Integer(3)); + final Calendar cal = Calendar.getInstance(); + cal.set(Calendar.HOUR_OF_DAY, 13); + cal.set(Calendar.MINUTE, 24); + cal.set(Calendar.SECOND, 59); + parse(pattern, convert, buf, cal.getTime(), new Integer(3)); - assertEquals("160215 \\t---", buf.toString()); + assertEquals("13-24-59 \\t---", buf.toString()); } private void parse(String pattern, boolean convert, StringBuilder buf, Date date, int i) {
