Author: tchemit Date: 2012-08-01 00:27:06 +0200 (Wed, 01 Aug 2012) New Revision: 2386 Url: http://nuiton.org/repositories/revision/nuiton-utils/2386 Log: fixes #2218: StringUtil#isEmail fails if this is upperCase Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2012-07-31 14:03:23 UTC (rev 2385) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2012-07-31 22:27:06 UTC (rev 2386) @@ -67,7 +67,7 @@ * @since 2.1 */ public static boolean isEmail(String str) { - return str.matches("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9\\-]*[a-z0-9])?$"); + return str.matches("^[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+((\\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)?)+@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\\-]*[a-zA-Z0-9])?$"); } /** Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2012-07-31 14:03:23 UTC (rev 2385) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/StringUtilTest.java 2012-07-31 22:27:06 UTC (rev 2386) @@ -206,7 +206,33 @@ @Test public void testIsEmail() { assertFalse(StringUtil.isEmail("abc.def+ghimonte.st")); + assertFalse(StringUtil.isEmail("abc.def+ghimonte.st")); + assertTrue(StringUtil.isEmail("a@monte.st")); + assertTrue(StringUtil.isEmail("a@monte.st".toUpperCase())); assertTrue(StringUtil.isEmail("abc.def+ghi@monte.st")); + assertTrue(StringUtil.isEmail("abc.def+ghi@monte.st".toUpperCase())); + assertTrue(StringUtil.isEmail("aBc.def+ghi@monte.st")); + assertTrue(StringUtil.isEmail("aBC.def+ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.def+ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.Def+ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEf+ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+Ghi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHi@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@Monte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MOnte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONte.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONTe.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONTE.st")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONTE.St")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONTE.ST")); + assertTrue(StringUtil.isEmail("ABC.DEF+GHI@MONTE.STT")); + assertTrue(StringUtil.isEmail("abC.Def+Ghi@Monte.st")); + assertTrue(StringUtil.isEmail("abC.Def+Ghi@MOnte.st")); + assertTrue(StringUtil.isEmail("abC.Def+Ghi@Monte.St")); + assertTrue(StringUtil.isEmail("abC.Def+Ghi@Monte.SSt")); + assertTrue(StringUtil.isEmail("abC.Def+Ghi@Monte.SST")); } } // StringUtilTest