summaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2018-12-14 06:29:41 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-14 06:29:41 +0000
commit41908970d82f6e8e7f9d2fd7aeb558c551e81d25 (patch)
treea11c38d9e250625a9e6de458aada0d02b8f9b062 /sources
parentfb4914b7b200772f70e9a7b011d9b17c35df5bfc (diff)
parent7fefb1c29aed914511b518ecec3799569338d61b (diff)
Merge "Don't escape in component tests"
Diffstat (limited to 'sources')
-rw-r--r--sources/hv-collector-core/src/test/resources/logback-test.xml2
-rw-r--r--sources/hv-collector-ct/src/test/resources/logback-test.xml14
2 files changed, 14 insertions, 2 deletions
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>