Skip to content

Commit 2bf5557

Browse files
committed
fix failed LegacyPatternLayoutTest#subPattern test due to TZ discrepancies, use LevelConverter instead of DateConverter
Signed-off-by: ceki <ceki@qos.ch>
1 parent 2ca8c52 commit 2bf5557

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

logback-classic/src/test/java/ch/qos/logback/classic/pattern/LegacyPatternLayoutTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,21 @@ public class LegacyPatternLayoutTest {
3131

3232
LoggerContext context = new LoggerContext();
3333

34+
/**
35+
* Test backward compatibility for classes derived from
36+
* PatternLayout that add custom conversion words.
37+
*/
3438
@Test public void subPattern() {
3539
SubPatternLayout layout = new SubPatternLayout();
3640
layout.setPattern("%"+SubPatternLayout.DOOO);
3741
layout.setContext(context);
3842
layout.start();
3943
LoggingEvent event = new LoggingEvent();
4044
event.setTimeStamp(0);
45+
event.setLevel(Level.INFO);
4146

4247
String result = layout.doLayout(event);
43-
assertEquals("1970-01-01 01:00:00,000", result);
48+
assertEquals("INFO", result);
4449
}
4550

4651
@Test

logback-classic/src/test/java/ch/qos/logback/classic/pattern/SubPatternLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class SubPatternLayout extends PatternLayout {
2929

3030
SubPatternLayout() {
3131
Map<String, String> defaultConverterMap = getDefaultConverterMap();
32-
defaultConverterMap.put(DOOO, DateConverter.class.getName());
32+
defaultConverterMap.put(DOOO, LevelConverter.class.getName());
3333
}
3434

3535
}

0 commit comments

Comments
 (0)