You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2012/10/29 02:57:06 UTC
svn commit: r1403146 - in
/logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core:
CombinedLoggerTest.java LoggerTest.java
Author: rgoers
Date: Mon Oct 29 01:57:05 2012
New Revision: 1403146
URL: http://svn.apache.org/viewvc?rev=1403146&view=rev
Log:
Delete LoggerTest and create CombinedLoggerTest that extends LoggerTest from core
Added:
logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/CombinedLoggerTest.java
- copied, changed from r1402938, logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
Removed:
logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
Copied: logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/CombinedLoggerTest.java (from r1402938, logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/LoggerTest.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/CombinedLoggerTest.java?p2=logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/CombinedLoggerTest.java&p1=logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/LoggerTest.java&r1=1402938&r2=1403146&rev=1403146&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/LoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/combined/src/test/java/org/apache/logging/log4j/core/CombinedLoggerTest.java Mon Oct 29 01:57:05 2012
@@ -16,145 +16,10 @@
*/
package org.apache.logging.log4j.core;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.XMLConfigurationFactory;
-import org.apache.logging.log4j.message.StructuredDataMessage;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import static org.junit.Assert.assertTrue;
/**
*
*/
-public class LoggerTest {
-
- private static final String CONFIG = "log4j-test2.xml";
- private static Configuration config;
- private static ListAppender app;
- private static LoggerContext ctx;
-
- @BeforeClass
- public static void setupClass() {
- System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- ctx = (LoggerContext) LogManager.getContext(false);
- config = ctx.getConfiguration();
- for (Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
- if (entry.getKey().equals("List")) {
- app = (ListAppender) entry.getValue();
- break;
- }
- }
- }
-
- @AfterClass
- public static void cleanupClass() {
- System.clearProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
- ctx.reconfigure();
- StatusLogger.getLogger().reset();
- }
-
- org.apache.logging.log4j.Logger logger = LogManager.getLogger("LoggerTest");
-
- @Test
- public void basicFlow() {
- logger.entry();
- logger.exit();
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 2, actual " + events.size(), events.size() == 2);
- app.clear();
- }
-
- @Test
- public void simpleFlow() {
- logger.entry(CONFIG);
- logger.exit(0);
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 2, actual " + events.size(), events.size() == 2);
- app.clear();
- }
-
- @Test
- public void throwing() {
- logger.throwing(new IllegalArgumentException("Test Exception"));
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
-
- @Test
- public void catching() {
- try {
- throw new NullPointerException();
- } catch (Exception e) {
- logger.catching(e);
- }
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
-
- @Test
- public void debug() {
- logger.debug("Debug message");
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
-
- @Test
- public void debugObject() {
- logger.debug(new Date());
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
-
- @Test
- public void debugWithParms() {
- logger.debug("Hello, {}", "World");
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
-
- @Test
- public void mdc() {
-
- ThreadContext.put("TestYear", new Integer(2010).toString());
- logger.debug("Debug message");
- ThreadContext.clear();
- logger.debug("Debug message");
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 2, actual " + events.size(), events.size() == 2);
- app.clear();
- }
-
- @Test
- public void structuredData() {
- ThreadContext.put("loginId", "JohnDoe");
- ThreadContext.put("ipAddress", "192.168.0.120");
- ThreadContext.put("locale", Locale.US.getDisplayName());
- StructuredDataMessage msg = new StructuredDataMessage("Audit@18060", "Transfer Complete", "Transfer");
- msg.put("ToAccount", "123456");
- msg.put("FromAccount", "123457");
- msg.put("Amount", "200.00");
- logger.info(MarkerManager.getMarker("EVENT"), msg);
- ThreadContext.clear();
- List<LogEvent> events = app.getEvents();
- assertTrue("Incorrect number of events. Expected 1, actual " + events.size(), events.size() == 1);
- app.clear();
- }
+public class CombinedLoggerTest extends LoggerTest {
}