Author: jbq
Date: Tue Mar 6 05:41:15 2007
New Revision: 515118
URL: http://svn.apache.org/viewvc?view=rev&rev=515118
Log:
WICKET-277 EmailAddressPatternValidator does not correctly identify TLDs with
more than 3 letters
Sync email pattern to trunk and add test for email address with uppercase
letters
Added:
incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/
incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
- copied, changed from r514598,
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/validation/EmailAddressPatternValidator.java
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/validation/EmailAddressPatternValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/validation/EmailAddressPatternValidator.java?view=diff&rev=515118&r1=515117&r2=515118
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/validation/EmailAddressPatternValidator.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/form/validation/EmailAddressPatternValidator.java
Tue Mar 6 05:41:15 2007
@@ -30,26 +30,26 @@
public class EmailAddressPatternValidator extends PatternValidator
{
private static final long serialVersionUID = 1L;
-
+
/** Singleton instance */
- private static final EmailAddressPatternValidator instance = new
EmailAddressPatternValidator();
-
-
+ private static final EmailAddressPatternValidator INSTANCE = new
EmailAddressPatternValidator();
+
/**
* @return Instance of emailadress validator
- */
- public static EmailAddressPatternValidator getInstance()
+ */
+ public static EmailAddressPatternValidator getInstance()
{
- return instance;
+ return INSTANCE;
}
-
+
/**
* Protected constructor to force use of static singleton accessor
method.
* Or override it to implement resourceKey(Component)
*/
protected EmailAddressPatternValidator()
{
- super("^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)[EMAIL
PROTECTED](\\.[A-Za-z0-9-]+)*((\\.[A-Za-z]{2,}){1}$)",
Pattern.CASE_INSENSITIVE);
+ super("^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)[EMAIL
PROTECTED](\\.[A-Za-z0-9-]+)*((\\.[A-Za-z]{2,}){1}$)",
+ Pattern.CASE_INSENSITIVE);
}
/**
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java?view=diff&rev=515118&r1=515117&r2=515118
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
Tue Mar 6 05:41:15 2007
@@ -48,7 +48,7 @@
{
EmailAddressPatternValidator test = new
EmailAddressPatternValidator();
String[] emails = new String[] { "[EMAIL PROTECTED]", "[EMAIL
PROTECTED]",
- "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" };
+ "[EMAIL PROTECTED]", "[EMAIL PROTECTED]",
"[EMAIL PROTECTED]" };
for (int i = 0; i < emails.length; i++)
{
assertTrue(emails[i] + " should be valid",
test.getPattern().matcher(emails[i])
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java?view=diff&rev=515118&r1=515117&r2=515118
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/validation/validator/EmailAddressPatternValidator.java
Tue Mar 6 05:41:15 2007
@@ -24,7 +24,6 @@
* @author Chris Turner
* @author Jonathan Locke
* @author Martijn Dashorst
- *
*/
public class EmailAddressPatternValidator extends PatternValidator
{
@@ -33,7 +32,6 @@
/** Singleton instance */
private static final EmailAddressPatternValidator INSTANCE = new
EmailAddressPatternValidator();
-
/**
* @return Instance of emailadress validator
*/
@@ -48,7 +46,7 @@
*/
protected EmailAddressPatternValidator()
{
- super("^[_a-z0-9-]+(\\.[_a-z0-9-]+)[EMAIL
PROTECTED](\\.[a-z0-9-]+)*(\\.[a-z]{2,3})$",
+ super("^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)[EMAIL
PROTECTED](\\.[A-Za-z0-9-]+)*((\\.[A-Za-z]{2,}){1}$)",
Pattern.CASE_INSENSITIVE);
}
Copied:
incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
(from r514598,
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java)
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java?view=diff&rev=515118&p1=incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java&r1=514598&p2=incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java&r2=515118
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/markup/html/form/validation/EmailValidatorTest.java
(original)
+++
incubator/wicket/trunk/wicket/src/test/java/wicket/validation/validator/EmailValidatorTest.java
Tue Mar 6 05:41:15 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package wicket.markup.html.form.validation;
+package wicket.validation.validator;
import junit.framework.TestCase;
@@ -48,7 +48,7 @@
{
EmailAddressPatternValidator test = new
EmailAddressPatternValidator();
String[] emails = new String[] { "[EMAIL PROTECTED]", "[EMAIL
PROTECTED]",
- "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" };
+ "[EMAIL PROTECTED]", "[EMAIL PROTECTED]",
"[EMAIL PROTECTED]" };
for (int i = 0; i < emails.length; i++)
{
assertTrue(emails[i] + " should be valid",
test.getPattern().matcher(emails[i])
