Repository: logging-log4j2 Updated Branches: refs/heads/master f65f0b916 -> f1c0d6806
LOG4J2-829 fix more tests to work in non-JST time zones Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f1c0d680 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f1c0d680 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f1c0d680 Branch: refs/heads/master Commit: f1c0d680631afe7f2d8b5ac8ac73a21cb40540be Parents: f65f0b9 Author: rpopma <[email protected]> Authored: Sat Sep 20 11:24:24 2014 +0900 Committer: rpopma <[email protected]> Committed: Sat Sep 20 11:24:24 2014 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/pattern/PatternParserTest2.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f1c0d680/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 72c3851..f945c36 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 @@ -33,24 +33,24 @@ public class PatternParserTest2 { public void testParseConvertBackslashes() { final boolean convert = true; final StringBuilder buf = new StringBuilder(); - final String pattern = "%d{HHmmss} \\t ..."; + final String pattern = "%d{HHmmss}{GMT+0} \\t ..."; final Date date = new Date(1411142535260L); // Sat Sep 20 01:02:15 JST 2014 parse(pattern, convert, buf, date, 123); - assertEquals("010215 \t ...", buf.toString()); + assertEquals("160215 \t ...", buf.toString()); } @Test public void testParseDontConvertBackslashes() { final boolean convert = false; final StringBuilder buf = new StringBuilder(); - final String pattern = "%d{HHmmss} \\t---"; + final String pattern = "%d{HHmmss}{GMT+0} \\t---"; final Date date = new Date(1411142535260L); // Sat Sep 20 01:02:15 JST 2014 parse(pattern, convert, buf, date, new Integer(3)); - assertEquals("010215 \\t---", buf.toString()); + assertEquals("160215 \\t---", buf.toString()); } private void parse(String pattern, boolean convert, StringBuilder buf, Date date, int i) {
