[logging-log4j2] branch master updated: Use explicit default locale for test

[mattsicker]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 9ed2073  Use explicit default locale for test
9ed2073 is described below

commit 9ed20734e426dde0328bcc67787365af16683bd4
Author: Matt Sicker <mattsic...@apache.org>
AuthorDate: Sat Jan 29 02:26:57 2022 -0600

    Use explicit default locale for test
    
    Signed-off-by: Matt Sicker <mattsic...@apache.org>
---
 .../log4j/message/LocalizedMessageFactoryTest.java  | 19 +++++++++++++------
 .../logging/log4j/message/LocalizedMessageTest.java | 21 ++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
index 25f4f51..6c6571b 100644
--- 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
+++ 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageFactoryTest.java
@@ -35,16 +35,23 @@ public class LocalizedMessageFactoryTest {
     @Test
     public void testNewMessage() {
         final LocalizedMessageFactory localizedMessageFactory = new 
LocalizedMessageFactory(
-                ResourceBundle.getBundle("MF", Locale.US, 
getClass().getModule()));
+                ResourceBundle.getBundle("MF", Locale.US));
         final Message message = 
localizedMessageFactory.newMessage("hello_world");
         assertEquals("Hello world.", message.getFormattedMessage());
     }
        
-         @Test
+    @Test
+    @ResourceLock(Resources.LOCALE)
     public void testNewMessageUsingBaseName() {
-        final LocalizedMessageFactory localizedMessageFactory = new 
LocalizedMessageFactory("MF");
-        final String testMsg = "hello_world";
-        final Message message = localizedMessageFactory.newMessage(testMsg);
-        assertEquals("Hello world.", message.getFormattedMessage());
+        final Locale defaultLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
+        try {
+            final LocalizedMessageFactory localizedMessageFactory = new 
LocalizedMessageFactory("MF");
+            final String testMsg = "hello_world";
+            final Message message = 
localizedMessageFactory.newMessage(testMsg);
+            assertEquals("Hello world.", message.getFormattedMessage());
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
     }
 }
diff --git 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
index 292ce76..b8a1801 100644
--- 
a/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
+++ 
b/log4j-api-test/src/test/java/org/apache/logging/log4j/message/LocalizedMessageTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.logging.log4j.message;
 
-import java.io.Serializable;
-import java.util.Locale;
-
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.logging.log4j.test.junit.Mutable;
 import org.junit.jupiter.api.Test;
@@ -26,7 +23,10 @@ import org.junit.jupiter.api.parallel.ResourceAccessMode;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.api.parallel.Resources;
 
-import static org.junit.jupiter.api.Assertions.*;
+import java.io.Serializable;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests LocalizedMessage.
@@ -92,9 +92,16 @@ public class LocalizedMessageTest {
     }
        
        @Test
+    @ResourceLock(Resources.LOCALE)
     public void testMessageUsingBaseName() { // LOG4J2-2850
-        final String testMsg = "hello_world";
-        final LocalizedMessage msg = new LocalizedMessage("MF", testMsg, null);
-        assertEquals("Hello world.", msg.getFormattedMessage());
+        final Locale defaultLocale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
+        try {
+            final String testMsg = "hello_world";
+            final LocalizedMessage msg = new LocalizedMessage("MF", testMsg, 
null);
+            assertEquals("Hello world.", msg.getFormattedMessage());
+        } finally {
+            Locale.setDefault(defaultLocale);
+        }
     }
 }