Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-941: Test failure in LocaleUtilsTest when building with JDK 8 - make problem more explicit by checking for empty strings 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1555040 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benedikt Ritter 2014-01-03 09:43:49 +00:00
parent d230e3a426
commit c99a4a3ee2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/apache/commons/lang3/LocaleUtils.java
View File

@ -90,6 +90,9 @@ public class LocaleUtils {
if (str == null) {
return null;
}
if (str.isEmpty()) {
throw new IllegalArgumentException("Cannot create locale from empty string");
}
if (str.contains("#")) { // LANG-879 - Cannot handle Java 7 script & extensions
throw new IllegalArgumentException("Invalid locale format: " + str);
}

4
src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java
View File

@ -137,6 +137,10 @@ public class LocaleUtilsTest {
// Valid format but lang doesnt exist, should make instance anyway
assertValidToLocale("qq");
try {
LocaleUtils.toLocale("");
fail("Should fail if str is empty");
} catch (final IllegalArgumentException iae) {}
try {
LocaleUtils.toLocale("Us");
fail("Should fail if not lowercase");