From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Thu, 13 Dec 2018 13:03:37 +0000 (+0100)
Subject: Don't escape in component tests
X-Git-Tag: 1.1.0~86^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7fefb1c29aed914511b518ecec3799569338d61b;p=dcaegen2%2Fcollectors%2Fhv-ves.git

Don't escape in component tests

We want our test output to be readable, so we should not escape
\n or \t in console output.

Change-Id: I4c673760ea0cd55007b47b7490036c0693887eda
Issue-ID: DCAEGEN2-1026
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---

diff --git a/sources/hv-collector-core/src/test/resources/logback-test.xml b/sources/hv-collector-core/src/test/resources/logback-test.xml
index f4cb6c59..06aa3adc 100644
--- a/sources/hv-collector-core/src/test/resources/logback-test.xml
+++ b/sources/hv-collector-core/src/test/resources/logback-test.xml
@@ -21,7 +21,7 @@
 <configuration>
     <property name="p_tim" value="%date{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
     <property name="p_lvl" value="%highlight(%-5level)"/>
-    <property name="p_log" value="%50.50logger"/>WireFrameCodecsTest
+    <property name="p_log" value="%50.50logger"/>
     <property name="SIMPLE_LOG_PATTERN" value="
 %nopexception
 | ${p_tim}\t
diff --git a/sources/hv-collector-ct/src/test/resources/logback-test.xml b/sources/hv-collector-ct/src/test/resources/logback-test.xml
index fc80a2f2..40a20fc1 100644
--- a/sources/hv-collector-ct/src/test/resources/logback-test.xml
+++ b/sources/hv-collector-ct/src/test/resources/logback-test.xml
@@ -12,6 +12,18 @@
     <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
     <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
     <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+
+    <property name="READABLE_LOG_PATTERN" value="
+%nopexception
+| ${p_tim}\t
+| ${p_log}\t
+| ${p_lvl}\t
+| %msg\t
+| ${p_mak}\t
+| %rootException\t
+| ${p_mdc}\t
+| ${p_thr}%n"/>
+
     <property name="ONAP_LOG_PATTERN" value="
 %nopexception
 | ${p_tim}\t
@@ -25,7 +37,7 @@
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>${ONAP_LOG_PATTERN}</pattern>
+            <pattern>${READABLE_LOG_PATTERN}</pattern>
         </encoder>
     </appender>