Author: carnold
Date: Thu Feb 22 15:29:10 2007
New Revision: 510707
URL: http://svn.apache.org/viewvc?view=rev&rev=510707
Log:
Bug 40937: Use String.toUpper/Lower case with locale
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/Level.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/LevelTest.java
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PriorityTest.java
Modified:
logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/Level.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/Level.java?view=diff&rev=510707&r1=510706&r2=510707
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/Level.java
(original)
+++ logging/log4j/branches/v1_2-branch/src/java/org/apache/log4j/Level.java Thu
Feb 22 15:29:10 2007
@@ -166,6 +166,10 @@
if(s.equals("FATAL")) return Level.FATAL;
if(s.equals("OFF")) return Level.OFF;
if(s.equals("TRACE")) return Level.TRACE;
+ //
+ // For Turkish i problem, see bug 40937
+ //
+ if(s.equals("\u0130NFO")) return Level.INFO;
return defaultLevel;
}
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/LevelTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/LevelTest.java?view=diff&rev=510707&r1=510706&r2=510707
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/LevelTest.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/LevelTest.java
Thu Feb 22 15:29:10 2007
@@ -19,6 +19,7 @@
import junit.framework.TestCase;
import org.apache.log4j.util.SerializationTestHelper;
+import java.util.Locale;
/**
@@ -238,5 +239,27 @@
Level level = Level.toLevel(null, Level.FATAL);
assertEquals("FATAL", level.toString());
}
+
+ /**
+ * Test that dotless lower I + "nfo" is recognized as INFO.
+ */
+ public void testDotlessLowerI() {
+ Level level = Level.toLevel("\u0131nfo");
+ assertEquals("INFO", level.toString());
+ }
+
+ /**
+ * Test that dotted lower I + "nfo" is recognized as INFO
+ * even in Turkish locale.
+ */
+ public void testDottedLowerI() {
+ Locale defaultLocale = Locale.getDefault();
+ Locale turkey = new Locale("tr");
+ Locale.setDefault(turkey);
+ Level level = Level.toLevel("info");
+ Locale.setDefault(defaultLocale);
+ assertEquals("INFO", level.toString());
+ }
+
}
Modified:
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PriorityTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PriorityTest.java?view=diff&rev=510707&r1=510706&r2=510707
==============================================================================
---
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PriorityTest.java
(original)
+++
logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/PriorityTest.java
Thu Feb 22 15:29:10 2007
@@ -18,6 +18,8 @@
import junit.framework.TestCase;
+import java.util.Locale;
+
/**
* Tests of Priority.
@@ -182,4 +184,28 @@
public void testToPriorityIntPriority() {
assertTrue(Priority.toPriority(17, Priority.DEBUG) == Priority.DEBUG);
}
+
+ /**
+ * Test that dotless lower I + "nfo" is recognized as INFO.
+ * @deprecated
+ */
+ public void testDotlessLowerI() {
+ Priority level = Priority.toPriority("\u0131nfo");
+ assertEquals("INFO", level.toString());
+ }
+
+ /**
+ * Test that dotted lower I + "nfo" is recognized as INFO
+ * even in Turkish locale.
+ * @deprecated
+ */
+ public void testDottedLowerI() {
+ Locale defaultLocale = Locale.getDefault();
+ Locale turkey = new Locale("tr");
+ Locale.setDefault(turkey);
+ Priority level = Priority.toPriority("info");
+ Locale.setDefault(defaultLocale);
+ assertEquals("INFO", level.toString());
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
