You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2021/12/19 21:39:59 UTC
[logging-log4j2] branch log4j-2.12 updated: fix backported substitutor tests
This is an automated email from the ASF dual-hosted git repository.
ckozak pushed a commit to branch log4j-2.12
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/log4j-2.12 by this push:
new 607177e fix backported substitutor tests
607177e is described below
commit 607177e9387089f5144427f9873cbfafbb65b97f
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Sun Dec 19 16:39:13 2021 -0500
fix backported substitutor tests
---
.../core/PatternResolverDoesNotEvaluateThreadContextTest.java | 11 ++++++-----
.../apache/logging/log4j/core/lookup/StrSubstitutorTest.java | 10 ----------
log4j-core/src/test/resources/log4j-routing-lookup.xml | 2 +-
.../src/test/resources/log4j2-pattern-layout-with-context.xml | 2 +-
4 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternResolverDoesNotEvaluateThreadContextTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternResolverDoesNotEvaluateThreadContextTest.java
index fc65e14..3766216 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternResolverDoesNotEvaluateThreadContextTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternResolverDoesNotEvaluateThreadContextTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.logging.log4j.core;
+import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.appender.ListAppender;
@@ -47,7 +48,7 @@ public class PatternResolverDoesNotEvaluateThreadContextTest {
@Test
public void testNoUserSet() {
Logger logger = context.getLogger(getClass());
- logger.info("This is a test");
+ logger.info(MarkerManager.getMarker("This is a test"), "msg");
List<String> messages = listAppender.getMessages();
assertTrue("No messages returned", messages != null && messages.size() > 0);
String message = messages.get(0);
@@ -58,7 +59,7 @@ public class PatternResolverDoesNotEvaluateThreadContextTest {
@Test
public void testMessageIsNotLookedUp() {
Logger logger = context.getLogger(getClass());
- logger.info("This is a ${upper:test}");
+ logger.info(MarkerManager.getMarker("This is a ${upper:test}"), "msg");
List<String> messages = listAppender.getMessages();
assertTrue("No messages returned", messages != null && messages.size() > 0);
String message = messages.get(0);
@@ -71,7 +72,7 @@ public class PatternResolverDoesNotEvaluateThreadContextTest {
Logger logger = context.getLogger(getClass());
ThreadContext.put(PARAMETER, "123");
try {
- logger.info("This is a test");
+ logger.info(MarkerManager.getMarker("This is a test"), "msg");
} finally {
ThreadContext.remove(PARAMETER);
}
@@ -87,7 +88,7 @@ public class PatternResolverDoesNotEvaluateThreadContextTest {
Logger logger = context.getLogger(getClass());
ThreadContext.put(PARAMETER, "${java:version}");
try {
- logger.info("This is a test");
+ logger.info(MarkerManager.getMarker("This is a test"), "msg");
} finally {
ThreadContext.remove(PARAMETER);
}
@@ -103,7 +104,7 @@ public class PatternResolverDoesNotEvaluateThreadContextTest {
Logger logger = context.getLogger(getClass());
ThreadContext.put(PARAMETER, "user${java:version}name");
try {
- logger.info("This is a test");
+ logger.info(MarkerManager.getMarker("This is a test"), "msg");
} finally {
ThreadContext.remove(PARAMETER);
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java
index afb3bdd..ed4c9ab 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java
@@ -178,16 +178,6 @@ public class StrSubstitutorTest {
}
@Test
- public void testLookupsNestedWithoutRecursiveEvaluation() {
- final Map<String, String> map = new HashMap<String, String>();
- map.put("first", "${java:version}");
- final StrLookup lookup = new Interpolator(new MapLookup(map));
- final StrSubstitutor subst = new StrSubstitutor(lookup);
- subst.setRecursiveEvaluationAllowed(false);
- assertEquals("${java:version}", subst.replace("${${lower:C}t${lower:X}:first}"));
- }
-
- @Test
public void testLookupThrows() {
final StrSubstitutor subst = new StrSubstitutor(new Interpolator(new StrLookup() {
diff --git a/log4j-core/src/test/resources/log4j-routing-lookup.xml b/log4j-core/src/test/resources/log4j-routing-lookup.xml
index 92f31c3..33b8ec8 100644
--- a/log4j-core/src/test/resources/log4j-routing-lookup.xml
+++ b/log4j-core/src/test/resources/log4j-routing-lookup.xml
@@ -19,7 +19,7 @@
<Configuration status="OFF" name="RoutingAppenderKeyLookupEvaluationTest">
<Appenders>
<List name="List">
- <PatternLayout pattern="%p $${ctx:user} $${event:Message}"/>
+ <PatternLayout pattern="%p $${ctx:user} %m"/>
</List>
<Routing name="Routing">
<Routes pattern="$${ctx:user:-none}">
diff --git a/log4j-core/src/test/resources/log4j2-pattern-layout-with-context.xml b/log4j-core/src/test/resources/log4j2-pattern-layout-with-context.xml
index 281e311..c7c4031 100644
--- a/log4j-core/src/test/resources/log4j2-pattern-layout-with-context.xml
+++ b/log4j-core/src/test/resources/log4j2-pattern-layout-with-context.xml
@@ -18,7 +18,7 @@
-->
<Configuration status="DEBUG" packages="">
<Properties>
- <Property name="pattern">%p %c $${ctx:user} $${event:Message}</Property>
+ <Property name="pattern">%p %c $${ctx:user} $${marker:any}</Property>
</Properties>
<Appenders>
<List name="list">