From 5c124d060be2097ef7a6180be3921113a790bcb9 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Thu, 16 Feb 2017 00:15:09 +0100
Subject: [PATCH] work on LOGBACK-1261

---
 .../input/joran/pattern/replaceNewline.xml     | 15 +++++++++++++++
 .../qos/logback/classic/PatternLayoutTest.java | 18 +++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 logback-classic/src/test/input/joran/pattern/replaceNewline.xml

diff --git a/logback-classic/src/test/input/joran/pattern/replaceNewline.xml b/logback-classic/src/test/input/joran/pattern/replaceNewline.xml
new file mode 100755
index 000000000..f3cee11f9
--- /dev/null
+++ b/logback-classic/src/test/input/joran/pattern/replaceNewline.xml
@@ -0,0 +1,15 @@
+<configuration>
+
+  <conversionRule conversionWord="sample"
+    converterClass="ch.qos.logback.classic.testUtil.SampleConverter" />
+
+  <appender name="LIST" class="ch.qos.logback.core.testUtil.StringListAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <Pattern>%replace(%msg){'(\n)', '$1${TAB}'}</Pattern>
+    </layout>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="LIST" />
+  </root>
+</configuration>
\ No newline at end of file
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
index ac51f908a..5a273adfa 100644
--- a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java
@@ -204,7 +204,10 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest<ILoggingEve
 
     @Test
     public void replaceNewline() {
-        pl.setPattern("%replace(A\nB){'\n', '\n\t'}");
+        String pattern = "%replace(A\nB){'\n', '\n\t'}";
+        String substPattern = OptionHelper.substVars(pattern, null, lc);
+        assertEquals(pattern, substPattern);
+        pl.setPattern(substPattern);
         pl.start();
         StatusPrinter.print(lc);
         String val = pl.doLayout(makeLoggingEvent("", null));
@@ -224,4 +227,17 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest<ILoggingEve
         assertEquals("And the number is XXXX, expiring on 12/2010", sla.strList.get(0));
     }
 
+    @Test
+    public void replaceWithJoran_NEWLINE() throws JoranException {
+        lc.putProperty("TAB", "\t");
+        configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "pattern/replaceNewline.xml");
+        StatusPrinter.print(lc);
+        root.getAppender("LIST");
+        String msg = "A\nC";
+        logger.debug(msg);
+        StringListAppender<ILoggingEvent> sla = (StringListAppender<ILoggingEvent>) root.getAppender("LIST");
+        assertNotNull(sla);
+        assertEquals(1, sla.strList.size());
+        assertEquals("A\n\tC", sla.strList.get(0));
+    }
 }
-- 
GitLab