Fix failing tests

Author: ppkarwasz

log4j-async-logger/pom.xml

@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>log4j-async-logger</artifactId>
-  <name>Log4j Async Logger</name>
+  <name>Apache Log4j Async Logger</name>
   <description>Alternative implementation of logger that uses LMAX Disruptor.</description>
 
   <dependencies>
@@ -65,4 +65,22 @@
     </dependency>
 
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths combine.children="append">
+            <path>
+              <groupId>org.apache.logging.log4j</groupId>
+              <artifactId>log4j-plugin-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/AsyncLoggerEventTranslationExceptionTest.java

@@ -46,7 +46,7 @@
 @ContextSelectorType(AsyncLoggerContextSelector.class)
 @SetSystemProperty(
         key = Log4jPropertyKey.Constant.ASYNC_LOGGER_EXCEPTION_HANDLER_CLASS_NAME,
-        value = "org.apache.logging.log4j.core.async.AsyncLoggerEventTranslationExceptionTest$TestExceptionHandler")
+        value = "org.apache.logging.log4j.async.logger.AsyncLoggerEventTranslationExceptionTest$TestExceptionHandler")
 class AsyncLoggerEventTranslationExceptionTest {
 
     @Test

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/DefaultIncludeLocationTest.java

@@ -0,0 +1,91 @@
+/*
+ * 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.async.logger;
+
+import java.util.stream.Stream;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.config.NullConfiguration;
+import org.apache.logging.log4j.util.PropertiesUtil;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class DefaultIncludeLocationTest {
+
+    private static final String LOGGER_NAME = DefaultIncludeLocationTest.class.getName();
+
+    private static Stream<Arguments> loggerConfigs(final Configuration config) {
+        return Stream.of(
+                Arguments.of(
+                        LoggerConfig.newBuilder()
+                                .setConfig(config)
+                                .setLoggerName(LOGGER_NAME)
+                                .build(),
+                        true),
+                Arguments.of(
+                        LoggerConfig.RootLogger.newRootBuilder()
+                                .setConfig(config)
+                                .build(),
+                        true),
+                Arguments.of(
+                        AsyncLoggerConfig.newAsyncBuilder()
+                                .setConfig(config)
+                                .setLoggerName(LOGGER_NAME)
+                                .build(),
+                        false),
+                Arguments.of(
+                        AsyncLoggerConfig.RootLogger.newAsyncRootBuilder()
+                                .setConfig(config)
+                                .build(),
+                        false));
+    }
+
+    static Stream<Arguments> loggerContextDefaultLocation() {
+        final LoggerContext ctx = new LoggerContext("sync");
+        ctx.setProperties(PropertiesUtil.getProperties());
+        final NullConfiguration config = new NullConfiguration(ctx);
+        ctx.setConfiguration(config);
+        return loggerConfigs(config);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void loggerContextDefaultLocation(final LoggerConfig loggerConfig, final boolean expected) {
+        Assertions.assertThat(loggerConfig.isIncludeLocation())
+                .as("Default `includeLocation` value")
+                .isEqualTo(expected);
+    }
+
+    static Stream<LoggerConfig> asyncLoggerContextDefaultLocation() {
+        final AsyncLoggerContext ctx = new AsyncLoggerContext("async");
+        ctx.setProperties(PropertiesUtil.getProperties());
+        final NullConfiguration config = new NullConfiguration(ctx);
+        ctx.setConfiguration(config);
+        return loggerConfigs(config).map(args -> (LoggerConfig) args.get()[0]);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void asyncLoggerContextDefaultLocation(final LoggerConfig loggerConfig) {
+        Assertions.assertThat(loggerConfig.isIncludeLocation())
+                .as("Default `includeLocation` value")
+                .isFalse();
+    }
+}

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/NestedAsyncLoggerConfigTest.java

@@ -0,0 +1,21 @@
+/*
+ * 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.async.logger;
+
+import org.apache.logging.log4j.core.test.config.AbstractNestedLoggerConfigTest;
+
+public class NestedAsyncLoggerConfigTest extends AbstractNestedLoggerConfigTest {}

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/QueueFullAsyncAbstractTest.java

@@ -26,10 +26,10 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.async.QueueFullAbstractTest;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.apache.logging.log4j.core.test.async.BlockingAppender;
+import org.apache.logging.log4j.core.test.async.QueueFullAbstractTest;
 import org.apache.logging.log4j.status.StatusData;
 import org.apache.logging.log4j.test.ListStatusListener;
 

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/QueueFullAsyncLogger3Test.java

@@ -26,6 +26,7 @@
 import org.apache.logging.log4j.core.async.AsyncQueueFullPolicyFactory;
 import org.apache.logging.log4j.core.async.DiscardingAsyncQueueFullPolicy;
 import org.apache.logging.log4j.core.test.async.BlockingAppender;
+import org.apache.logging.log4j.core.test.junit.ContextSelectorType;
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.apache.logging.log4j.core.test.junit.Named;
 import org.apache.logging.log4j.message.Message;
@@ -37,9 +38,7 @@
 /**
  * Tests queue full scenarios with pure AsyncLoggers (all loggers async).
  */
-@SetTestProperty(
-        key = "LoggerContext.selector",
-        value = "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
+@ContextSelectorType(AsyncLoggerContextSelector.class)
 @SetTestProperty(key = "AsyncLogger.ringBufferSize", value = "128")
 @SetTestProperty(key = "AsyncLogger.formatMsg", value = "true")
 @SetTestProperty(key = "AsyncLogger.queueFullPolicy", value = "Discard")

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/QueueFullAsyncLoggerLoggingFromToStringTest.java

@@ -18,6 +18,7 @@
 
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.test.async.BlockingAppender;
+import org.apache.logging.log4j.core.test.junit.ContextSelectorType;
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.apache.logging.log4j.core.test.junit.Named;
 import org.apache.logging.log4j.test.junit.SetTestProperty;
@@ -26,9 +27,7 @@
 /**
  * Tests queue full scenarios with pure AsyncLoggers (all loggers async).
  */
-@SetTestProperty(
-        key = "LoggerContext.selector",
-        value = "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
+@ContextSelectorType(AsyncLoggerContextSelector.class)
 @SetTestProperty(key = "AsyncLogger.ringBufferSize", value = "128")
 public class QueueFullAsyncLoggerLoggingFromToStringTest extends QueueFullAsyncAbstractTest {
 

log4j-async-logger/src/test/java/org/apache/logging/log4j/async/logger/QueueFullAsyncLoggerTest.java

@@ -18,6 +18,7 @@
 
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.test.async.BlockingAppender;
+import org.apache.logging.log4j.core.test.junit.ContextSelectorType;
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
 import org.apache.logging.log4j.core.test.junit.Named;
 import org.apache.logging.log4j.test.junit.SetTestProperty;
@@ -26,9 +27,7 @@
 /**
  * Tests queue full scenarios with pure AsyncLoggers (all loggers async).
  */
-@SetTestProperty(
-        key = "LoggerContext.selector",
-        value = "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector")
+@ContextSelectorType(AsyncLoggerContextSelector.class)
 @SetTestProperty(key = "AsyncLogger.ringBufferSize", value = "128")
 public class QueueFullAsyncLoggerTest extends QueueFullAsyncAbstractTest {