Refactor context selectors to test. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dd5a2532 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dd5a2532 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dd5a2532
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: dd5a253234cebade3925c34f0b8ef5e565b2f2dd Parents: 0af1bc2 Author: ggregory <ggreg...@us-l-gg02.rocketsoftware.com> Authored: Fri Aug 5 12:21:54 2016 -0700 Committer: ggregory <ggreg...@us-l-gg02.rocketsoftware.com> Committed: Fri Aug 5 12:21:54 2016 -0700 ---------------------------------------------------------------------- .../core/selector/CoreContextSelectors.java | 25 ++++++++++++++++++++ .../appender/JsonCompleteFileAppenderTest.java | 6 ++--- .../appender/XmlCompleteFileAppenderTest.java | 3 ++- 3 files changed, 29 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dd5a2532/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/CoreContextSelectors.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/CoreContextSelectors.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/CoreContextSelectors.java new file mode 100644 index 0000000..1077e5a --- /dev/null +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/CoreContextSelectors.java @@ -0,0 +1,25 @@ +/* + * 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.selector; + +import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; + +public class CoreContextSelectors { + + public static final Class<?>[] CLASSES = new Class<?>[] { ClassLoaderContextSelector.class, BasicContextSelector.class, AsyncLoggerContextSelector.class }; + +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dd5a2532/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java index b184421..47cb060 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JsonCompleteFileAppenderTest.java @@ -24,10 +24,8 @@ import java.io.File; import java.io.FileReader; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; -import org.apache.logging.log4j.core.selector.BasicContextSelector; -import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.selector.CoreContextSelectors; import org.apache.logging.log4j.junit.CleanFiles; import org.apache.logging.log4j.junit.LoggerContextRule; import org.junit.Rule; @@ -51,7 +49,7 @@ public class JsonCompleteFileAppenderTest { @Parameters(name = "{0}") public static Class<?>[] getParameters() { - return new Class<?>[] { ClassLoaderContextSelector.class, BasicContextSelector.class, AsyncLoggerContextSelector.class }; + return CoreContextSelectors.CLASSES; } private final File logFile = new File("target", "JsonCompleteFileAppenderTest.log"); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dd5a2532/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java index 9111825..2ad6e8f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/XmlCompleteFileAppenderTest.java @@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector; import org.apache.logging.log4j.core.selector.BasicContextSelector; import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.selector.CoreContextSelectors; import org.apache.logging.log4j.junit.CleanFiles; import org.apache.logging.log4j.junit.LoggerContextRule; import org.junit.Rule; @@ -54,7 +55,7 @@ public class XmlCompleteFileAppenderTest { @Parameters(name = "{0}") public static Class<?>[] getParameters() { - return new Class<?>[] { ClassLoaderContextSelector.class, BasicContextSelector.class, AsyncLoggerContextSelector.class }; + return CoreContextSelectors.CLASSES; } private final File logFile = new File("target", "XmlCompleteFileAppenderTest.log");
