You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/10/04 20:27:53 UTC
[3/3] git commit: Add CallerInformationTest to log4j-to-slf4j.
Add CallerInformationTest to log4j-to-slf4j.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7bc4d399
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7bc4d399
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7bc4d399
Branch: refs/heads/master
Commit: 7bc4d399ec3944e6bc021b075914ee460038752c
Parents: b7206d0
Author: Matt Sicker <ma...@apache.org>
Authored: Sat Oct 4 13:27:45 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Sat Oct 4 13:27:45 2014 -0500
----------------------------------------------------------------------
.../logging/slf4j/CallerInformationTest.java | 65 ++++++++++++++++++++
.../test/resources/logback-calling-class.xml | 38 ++++++++++++
2 files changed, 103 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bc4d399/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
new file mode 100644
index 0000000..e1d7d64
--- /dev/null
+++ b/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/CallerInformationTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.slf4j;
+
+import java.util.List;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.testUtil.StringListAppender;
+import org.apache.logging.log4j.LogManager;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class CallerInformationTest {
+
+ private static final String CONFIG = "target/test-classes/logback-calling-class.xml";
+
+ @ClassRule
+ public static final InitialLoggerContext CTX = new InitialLoggerContext(CONFIG);
+
+ @Test
+ public void testClassLogger() throws Exception {
+ final SLF4JLogger logger = (SLF4JLogger) LogManager.getLogger("ClassLogger");
+ final StringListAppender<ILoggingEvent> app = TestUtil.getListAppender(logger, "Class");
+ logger.info("Ignored message contents.");
+ logger.warn("Verifying the caller class is still correct.");
+ logger.error("Hopefully nobody breaks me!");
+ final List<String> messages = app.strList;
+ assertEquals("Incorrect number of messages.", 3, messages.size());
+ for (final String message : messages) {
+ assertEquals("Incorrect caller class name.", this.getClass().getName(), message);
+ }
+ }
+
+ @Test
+ public void testMethodLogger() throws Exception {
+ final SLF4JLogger logger = (SLF4JLogger) LogManager.getLogger("MethodLogger");
+ final StringListAppender<ILoggingEvent> app = TestUtil.getListAppender(logger, "Method");
+ logger.info("More messages.");
+ logger.warn("CATASTROPHE INCOMING!");
+ logger.error("ZOMBIES!!!");
+ logger.warn("brains~~~");
+ logger.info("Itchy. Tasty.");
+ final List<String> messages = app.strList;
+ assertEquals("Incorrect number of messages.", 5, messages.size());
+ for (final String message : messages) {
+ assertEquals("Incorrect caller method name.", "testMethodLogger", message);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7bc4d399/log4j-to-slf4j/src/test/resources/logback-calling-class.xml
----------------------------------------------------------------------
diff --git a/log4j-to-slf4j/src/test/resources/logback-calling-class.xml b/log4j-to-slf4j/src/test/resources/logback-calling-class.xml
new file mode 100644
index 0000000..3251c7f
--- /dev/null
+++ b/log4j-to-slf4j/src/test/resources/logback-calling-class.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
+<configuration>
+ <!-- This test config is analogous to the log4j2-calling-class.xml test config -->
+
+ <appender name="Class" class="ch.qos.logback.core.testUtil.StringListAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%class</pattern>
+ </layout>
+ </appender>
+ <logger name="ClassLogger" level="info" additivity="false">
+ <appender-ref ref="Class"/>
+ </logger>
+
+ <appender name="Method" class="ch.qos.logback.core.testUtil.StringListAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%method</pattern>
+ </layout>
+ </appender>
+ <logger name="MethodLogger" level="info" additivity="false">
+ <appender-ref ref="Method"/>
+ </logger>
+</configuration>