[logging-log4j2] 03/06: Fix multiple test classes using the same logger

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit addb3ffc98384426343b0919bf6955ade78f0dbf
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Mon Jun 20 21:34:52 2022 +0200

    Fix multiple test classes using the same logger
    
    If these classes use the same logger, they can not be run concurrently.
---
 .../main/java/org/apache/logging/log4j/test/TestLoggerContext.java | 7 +++----
 .../src/test/java/org/apache/logging/log4j/EventLoggerTest.java    | 1 -
 .../src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContext.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContext.java
index c20e4c07cc..906a2335b0 100644
--- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContext.java
+++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLoggerContext.java
@@ -16,19 +16,18 @@
  */
 package org.apache.logging.log4j.test;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.test.TestLogger;
-import org.apache.logging.log4j.spi.LoggerContext;
 import org.apache.logging.log4j.spi.ExtendedLogger;
+import org.apache.logging.log4j.spi.LoggerContext;
 
 /**
  *
  */
 public class TestLoggerContext implements LoggerContext {
-    private final Map<String, ExtendedLogger> map = new HashMap<>();
+    private final Map<String, ExtendedLogger> map = new ConcurrentHashMap<>();
 
     @Override
     public ExtendedLogger getLogger(final String name) {
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/EventLoggerTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
index 8f17a789fc..c8d504c20e 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
@@ -28,7 +28,6 @@ import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ResourceLock("log4j2.TestLogger")
 @UsingThreadContextMap
 public class EventLoggerTest {
 
diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java
index b575757e04..fd0c12270d 100644
--- a/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java
+++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java
@@ -45,11 +45,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Tests Logger APIs with {@link Supplier}.
  */
 @ResourceLock(Resources.LOCALE)
-@ResourceLock("log4j2.TestLogger")
 @UsingThreadContextMap
 public class LoggerSupplierTest {
 
-    private final TestLogger logger = (TestLogger) LogManager.getLogger("LoggerTest");
+    private final TestLogger logger = (TestLogger) LogManager.getLogger(LoggerSupplierTest.class);
 
     private final List<String> results = logger.getEntries();