Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java?rev=1183017&view=auto ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java (added) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java Thu Oct 13 18:13:00 2011 @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.lookup; + +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +/** + * + */ +public class SystemPropertiesLookupTest { + + + private static final String TESTKEY = "TestKey"; + private static final String TESTVAL = "TestValue"; + + @BeforeClass + public static void before() { + System.setProperty(TESTKEY, TESTVAL); + } + + @AfterClass + public static void after() { + System.clearProperty(TESTKEY); + } + + @Test + public void testLookup() { + StrLookup lookup = new SystemPropertiesLookup(); + String value = lookup.lookup(TESTKEY); + assertEquals(TESTVAL, value); + value = lookup.lookup("BadKey"); + assertNull(value); + } +}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java?rev=1183017&r1=1183016&r2=1183017&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java Thu Oct 13 18:13:00 2011 @@ -17,13 +17,8 @@ package org.apache.logging.log4j.core.pattern; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.Logger; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.impl.Log4jLogEvent; -import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.junit.Before; import org.junit.Test; @@ -32,7 +27,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * Copied: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml (from r1147720, logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml) URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml?p2=logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml&p1=logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml&r1=1147720&r2=1183017&rev=1183017&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-rolling1.xml (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-routing.xml Thu Oct 13 18:13:00 2011 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<configuration packages="" status="warn" name="XMLConfigTest"> +<configuration packages="" status="debug" name="RoutingTest"> <properties> - <property name="filename">target/rolling1/rollingtest.log</property> + <property name="filename">target/rolling1/rollingtest-$${sd:type}.log</property> </properties> <filters> <Threshold level="debug"/> @@ -11,32 +11,32 @@ <Console name="STDOUT"> <PatternLayout pattern="%m%n"/> </Console> - <RollingFile name="RollingFile" fileName="${filename}" filePattern="target/rolling1/test1-%i.log.gz"> - <PatternLayout> - <pattern>%d %p %C{1.} [%t] %m%n</pattern> - </PatternLayout> - <SizeBasedTriggeringPolicy size="500" /> - </RollingFile> <List name="List"> <filters> - <Threshold level="error"/> + <Threshold level="debug"/> </filters> </List> + <Routing name="Routing"> + <Routes pattern="$${sd:type}"> + <Route> + <RollingFile name="Rolling-${sd:type}" fileName="${filename}" + filePattern="target/rolling1/test1-${sd:type}.%i.log.gz"> + <PatternLayout> + <pattern>%d %p %C{1.} [%t] %m%n</pattern> + </PatternLayout> + <SizeBasedTriggeringPolicy size="500" /> + </RollingFile> + </Route> + <Route appender-ref="STDOUT" key="Audit"/> + <Route appender-ref="List" key="Service"/> + </Routes> + </Routing> </appenders> <loggers> - <logger name="org.apache.logging.log4j.test1" level="debug" additivity="false"> - <filters> - <ThreadContextMap> - <KeyValuePair key="test" value="123"/> - </ThreadContextMap> - </filters> - <appender-ref ref="STDOUT"/> - </logger>> - - <logger name="org.apache.logging.log4j.core.appender.rolling" level="debug" additivity="false"> - <appender-ref ref="RollingFile"/> - </logger>> + <logger name="EventLogger" level="info" additivity="false"> + <appender-ref ref="Routing"/> + </logger> <root level="error"> <appender-ref ref="STDOUT"/> Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java?rev=1183017&r1=1183016&r2=1183017&view=diff ============================================================================== --- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java (original) +++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/slf4j-impl/src/main/java/org/slf4j/helpers/Log4JMDCAdapter.java Thu Oct 13 18:13:00 2011 @@ -32,7 +32,7 @@ public class Log4JMDCAdapter implements } public String get(String key) { - return ThreadContext.get(key).toString(); + return ThreadContext.get(key); } public void remove(String key) {
