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 2014/04/27 00:52:24 UTC
svn commit: r1590320 - in /logging/log4j/log4j2/trunk/log4j-core/src/test:
java/org/apache/logging/log4j/core/
java/org/apache/logging/log4j/core/appender/db/jdbc/
java/org/apache/logging/log4j/core/config/json/
java/org/apache/logging/log4j/core/confi...
Author: rgoers
Date: Sat Apr 26 22:52:23 2014
New Revision: 1590320
URL: http://svn.apache.org/r1590320
Log:
Reduce build noise
Added:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-collectionLogging.xml
- copied, changed from r1590289, logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-customLevel.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-config.json
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-fatalOnly.xml
- copied, changed from r1590289, logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-test1.xml
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-reference-level.json
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-routing2.json
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml
logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/CollectionLoggingTest.java Sat Apr 26 22:52:23 2014
@@ -24,14 +24,45 @@ import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.message.MapMessage;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+
/**
* Work in progress.
*/
public class CollectionLoggingTest {
+ private static final String CONFIG = "log4j-collectionLogging.xml";
+ private static LoggerContext ctx;
+ private ListAppender app;
+
+
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
+ ctx = (LoggerContext) LogManager.getContext();
+ ctx.reconfigure();
+ }
+
+ @Before
+ public void before() {
+ Configuration config = ctx.getConfiguration();
+ for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
+ if (entry.getKey().equals("List")) {
+ app = (ListAppender) entry.getValue();
+ }
+ }
+ assertNotNull("No Appender", app);
+ app.clear();
+ }
+
@Test
public void testSystemProperties() {
final Logger logger = LogManager.getLogger(CollectionLoggingTest.class.getName());
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSourceTest.java Sat Apr 26 22:52:23 2014
@@ -24,8 +24,14 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.sql.DataSource;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.status.StatusLogger;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -54,6 +60,17 @@ public class DataSourceConnectionSourceT
this.jndiURL = jndiURL;
}
+ private static final String CONFIG = "log4j-fatalOnly.xml";
+
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
+ LoggerContext ctx = (LoggerContext) LogManager.getContext();
+ ctx.reconfigure();
+ StatusLogger logger = StatusLogger.getLogger();
+ logger.setLevel(Level.FATAL);
+ }
+
@Before
public void setUp() throws NamingException {
MockContextFactory.setAsInitial();
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSourceTest.java Sat Apr 26 22:52:23 2014
@@ -20,9 +20,15 @@ import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.status.StatusLogger;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import static org.easymock.EasyMock.*;
@@ -30,6 +36,16 @@ import static org.junit.Assert.*;
public class FactoryMethodConnectionSourceTest {
private static ThreadLocal<Object> holder = new ThreadLocal<Object>();
+ private static final String CONFIG = "log4j-fatalOnly.xml";
+
+ @BeforeClass
+ public static void beforeClass() {
+ System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
+ LoggerContext ctx = (LoggerContext) LogManager.getContext();
+ ctx.reconfigure();
+ StatusLogger logger = StatusLogger.getLogger();
+ logger.setLevel(Level.FATAL);
+ }
@AfterClass
public static void tearDownClass() {
Added: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java?rev=1590320&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java Sat Apr 26 22:52:23 2014
@@ -0,0 +1,23 @@
+/*
+ * 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.config.json;
+
+/**
+ *
+ */
+public class JSONConfigTest {
+}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java Sat Apr 26 22:52:23 2014
@@ -56,7 +56,7 @@ public class XMLConfigurationPropsTest {
@Test
public void testDefaultStatus() {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG1);
- System.setProperty(Constants.LOG4J_DEFAULT_STATUS_LEVEL, "DEBUG");
+ System.setProperty(Constants.LOG4J_DEFAULT_STATUS_LEVEL, "WARN");
try {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
ctx.reconfigure();
@@ -70,7 +70,7 @@ public class XMLConfigurationPropsTest {
@Test
public void testWithConfigProp() {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- System.setProperty("log4j.level", "debug");
+ System.setProperty("log4j.level", "warn");
try {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
ctx.reconfigure();
@@ -85,8 +85,8 @@ public class XMLConfigurationPropsTest {
@Test
public void testWithProps() {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
- System.setProperty("log4j.level", "debug");
- System.setProperty("log.level", "debug");
+ System.setProperty("log4j.level", "warn");
+ System.setProperty("log.level", "warn");
try {
final LoggerContext ctx = (LoggerContext) LogManager.getContext();
ctx.reconfigure();
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java Sat Apr 26 22:52:23 2014
@@ -17,10 +17,12 @@
package org.apache.logging.log4j.core.layout;
import java.util.List;
+import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.BasicConfigurationFactory;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
@@ -91,7 +93,10 @@ public class HTMLLayoutTest {
}
private void testLayout(boolean includeLocation) {
-
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final HTMLLayout layout = HTMLLayout.createLayout("" + includeLocation, null, null, null, "small", null);
final ListAppender appender = new ListAppender("List", null, layout, true, false);
@@ -134,6 +139,8 @@ public class HTMLLayoutTest {
} else {
assertFalse("Location should not be in the output table", html.contains("<td>HTMLLayoutTest.java:"));
}
-
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/JSONLayoutTest.java Sat Apr 26 22:52:23 2014
@@ -20,10 +20,12 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import java.util.List;
+import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.BasicConfigurationFactory;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
@@ -73,7 +75,10 @@ public class JSONLayoutTest {
*/
@Test
public void testLayout() throws Exception {
-
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final JSONLayout layout = JSONLayout.createLayout("true", "true", "true", "false", null);
final ListAppender appender = new ListAppender("List", null, layout, true, false);
@@ -124,11 +129,17 @@ public class JSONLayoutTest {
this.checkAt("\"logger\":\"root\",", 2, list);
this.checkAt("\"level\":\"DEBUG\",", 4, list);
this.checkAt("\"message\":\"starting mdc pattern test\",", 6, list);
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
@Test
public void testEscapeLayout() throws Exception {
-
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final JSONLayout layout = JSONLayout.createLayout("true", "true", "true", "false", null);
final ListAppender appender = new ListAppender("List", null, layout, true, false);
@@ -150,6 +161,9 @@ public class JSONLayoutTest {
this.checkAt("\"logger\":\"root\",", 2, list);
this.checkAt("\"level\":\"DEBUG\",", 4, list);
this.checkAt("\"message\":\"Here is a quote ' and then a double quote \\\"\",", 6, list);
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
private void checkAt(String expected, int lineIndex, List<String> list) {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java Sat Apr 26 22:52:23 2014
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNot
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.BasicConfigurationFactory;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
@@ -36,6 +37,8 @@ import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.Map;
+
/**
*
*/
@@ -77,6 +80,10 @@ public class PatternLayoutTest {
final String mdcMsgPattern3 = "%m : %X{key2}%n";
final String mdcMsgPattern4 = "%m : %X{key3}%n";
final String mdcMsgPattern5 = "%m : %X{key1},%X{key2},%X{key3}%n";
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final PatternLayout layout = PatternLayout.createLayout(msgPattern, ctx.getConfiguration(), null, null, null,
@@ -137,6 +144,10 @@ public class PatternLayoutTest {
root.removeAppender(appender);
appender.stop();
+
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
@Test
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java Sat Apr 26 22:52:23 2014
@@ -20,6 +20,7 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.LoggingException;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.BasicConfigurationFactory;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
@@ -34,6 +35,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertTrue;
@@ -75,7 +77,10 @@ public class SerializedLayoutTest {
*/
@Test
public void testLayout() throws Exception {
-
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final SerializedLayout layout = SerializedLayout.createLayout();
final ListAppender appender = new ListAppender("List", null, layout, false, true);
@@ -123,6 +128,8 @@ public class SerializedLayoutTest {
assertTrue("Incorrect event", event.toString().equals(expected[i]));
++i;
}
-
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java Sat Apr 26 22:52:23 2014
@@ -20,12 +20,14 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import java.util.List;
+import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.BasicConfigurationFactory;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
@@ -77,7 +79,10 @@ public class XMLLayoutTest {
*/
@Test
public void testLayout() throws Exception {
-
+ final Map<String, Appender> appenders = root.getAppenders();
+ for (Appender appender : appenders.values()) {
+ root.removeAppender(appender);
+ }
// set up appender
final XMLLayout layout = XMLLayout.createLayout("true", "true", "true", null, null, null);
final ListAppender appender = new ListAppender("List", null, layout, true, false);
@@ -117,5 +122,8 @@ public class XMLLayoutTest {
assertTrue("Missing Marker-Tag, Expected " + markerTag + ", Actual" + list.get(list.size() - 4),
list.get(list.size() - 4).contains(markerTag));
+ for (Appender app : appenders.values()) {
+ root.addAppender(app);
+ }
}
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-collectionLogging.xml (from r1590289, logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-customLevel.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-collectionLogging.xml?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-collectionLogging.xml&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-customLevel.xml&r1=1590289&r2=1590320&rev=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-customLevel.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-collectionLogging.xml Sat Apr 26 22:52:23 2014
@@ -22,22 +22,13 @@
<Console name="STDOUT">
<PatternLayout pattern="%m%n"/>
</Console>
- <List name="List1">
- </List>
- <List name="List2">
- <Filters>
- <ThresholdFilter level="note"/>
- </Filters>
+ <List name="List">
</List>
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.test1" level="detail" additivity="false">
- <AppenderRef ref="List1"/>
- </Logger>
-
- <Logger name="org.apache.logging.log4j.test2" level="info" additivity="false">
- <AppenderRef ref="List2"/>
+ <Logger name="org.apache.logging.log4j.core" level="error" additivity="false">
+ <AppenderRef ref="List"/>
</Logger>
<Root level="error">
Added: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-config.json
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-config.json?rev=1590320&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-config.json (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-config.json Sat Apr 26 22:52:23 2014
@@ -0,0 +1,48 @@
+{
+ "configuration": {
+ "status": "debug"
+ ,"name": "Test-Logging"
+ ,"monitorInterval":30
+ ,"packages": "org.apache.logging.log4j.core"
+ ,"ThresholdFilter": { "level": "all" }
+ ,"properties": {
+ "property": { "name" : "theLogName"
+ ,"value" : "test-logging2.log"
+ }
+ }
+ ,"appenders": {
+ "Console": {
+ "name": "stdout"
+ ,"target":"SYSTEM_OUT"
+ ,"ignoreExceptions":false
+ ,"PatternLayout": {
+ "pattern": "%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"
+ }
+ }
+ ,"File": {
+ "name": "fileout"
+ ,"immediateFlush": true
+ ,"PatternLayout": {
+ "pattern":"%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"
+ }
+ ,"fileName":"${map:theLogName}"
+ }
+ }
+ ,"loggers": {
+ "logger": {
+ "name": "TestLogger"
+ ,"level": "DEBUG"
+ ,"additivity": "true"
+ ,"bufferedIO": true
+ ,"bufferSize": 16384
+ ,"AppenderRef": {
+ "ref":"fileout"
+ }
+ }
+ ,"root": {
+ "level": "ALL"
+ ,"AppenderRef": { "ref": "stdout" }
+ }
+ }
+ }
+}
\ No newline at end of file
Copied: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-fatalOnly.xml (from r1590289, logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-test1.xml)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-fatalOnly.xml?p2=logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-fatalOnly.xml&p1=logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-test1.xml&r1=1590289&r2=1590320&rev=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-test1.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-fatalOnly.xml Sat Apr 26 22:52:23 2014
@@ -16,41 +16,17 @@
limitations under the License.
-->
-<Configuration status="OFF" name="XMLConfigTest">
- <Properties>
- <Property name="filename">target/test-xml.log</Property>
- </Properties>
- <ThresholdFilter level="debug"/>
+<Configuration status="OFF" name="Log4jTest">
<Appenders>
<Console name="STDOUT">
<PatternLayout pattern="%m%n"/>
</Console>
- <File name="File" fileName="${filename}" bufferedIO="false">
- <PatternLayout>
- <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
- </PatternLayout>
- </File>
- <List name="List">
- <Filters>
- <ThresholdFilter level="error"/>
- </Filters>
- </List>
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
- <ThreadContextMapFilter>
- <KeyValuePair key="test" value="123"/>
- </ThreadContextMapFilter>
- <AppenderRef ref="STDOUT"/>
- </Logger>>
-
- <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
- <AppenderRef ref="File"/>
- </Logger>>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-reference-level.json
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-reference-level.json?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-reference-level.json (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-reference-level.json Sat Apr 26 22:52:23 2014
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-{ "configuration": { "status": "debug", "XMLConfigTest": "RoutingTest",
+{ "configuration": { "status": "error", "XMLConfigTest": "RoutingTest",
"appenders": {
"appender": [
{ "type": "Console", "name": "STDOUT", "PatternLayout": { "pattern": "%m%n" }},
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-routing2.json
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-routing2.json?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-routing2.json (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/log4j-routing2.json Sat Apr 26 22:52:23 2014
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-{ "configuration": { "status": "debug", "name": "RoutingTest",
+{ "configuration": { "status": "error", "name": "RoutingTest",
"properties": {
"property": { "name": "filename", "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
},
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-data-source.xml Sat Apr 26 22:52:23 2014
@@ -33,11 +33,11 @@
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.core.appender.db" level="debug">
+ <Logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-h2-factory-method.xml Sat Apr 26 22:52:23 2014
@@ -34,11 +34,11 @@
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.core.appender.db" level="debug">
+ <Logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jdbc/log4j2-hsqldb-factory-method.xml Sat Apr 26 22:52:23 2014
@@ -34,11 +34,11 @@
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.core.appender.db" level="debug">
+ <Logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-base.xml Sat Apr 26 22:52:23 2014
@@ -26,11 +26,11 @@
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.core.appender.db" level="debug">
+ <Logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml Sat Apr 26 22:52:23 2014
@@ -30,7 +30,7 @@
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-base.xml Sat Apr 26 22:52:23 2014
@@ -26,11 +26,11 @@
</Appenders>
<Loggers>
- <Logger name="org.apache.logging.log4j.core.appender.db" level="debug">
+ <Logger name="org.apache.logging.log4j.core.appender.db" level="debug" additivity="false">
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml?rev=1590320&r1=1590319&r2=1590320&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml Sat Apr 26 22:52:23 2014
@@ -30,7 +30,7 @@
<AppenderRef ref="databaseAppender" />
</Logger>
- <Root level="error">
+ <Root level="fatal">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>