[hibernate-commits] Hibernate SVN: r12766 - in trunk/HibernateExt/validator/src: test/org/hibernate/validator/test and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: d.plentz
Date: 2007-07-15 22:20:28 -0400 (Sun, 15 Jul 2007)
New Revision: 12766

Modified:
   trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java
   trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java
Log:
[HV-14] Minor typo in regular expression in class EmailValidator

Modified: trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java
===================================================================
--- trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java	2007-07-16 00:36:41 UTC (rev 12765)
+++ trunk/HibernateExt/validator/src/java/org/hibernate/validator/EmailValidator.java	2007-07-16 02:20:28 UTC (rev 12766)
@@ -10,7 +10,8 @@
  * @author Emmanuel Bernard
  */
 public class EmailValidator implements Validator<Email>, Serializable {
-	private static String ATOM = "[^\\x00-\\x1F^\\(^\\)^\\<^\\>^\\@^\\,^\\(;^\\:^\\\\^\\\"^\\.^\\[^\\]^\\s]";
+	//TODO: Implement this http://www.ex-parrot.com/~pdw/Mail-RFC822-Address.html regex in java
+	private static String ATOM = "[^\\x00-\\x1F^\\(^\\)^\\<^\\>^\\@^\\,^\\;^\\:^\\\\^\\\"^\\.^\\[^\\]^\\s]";
 	private static String DOMAIN = "(" + ATOM + "+(\\." + ATOM + "+)*";
 	private static String IP_DOMAIN = "\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\]";
 
@@ -20,17 +21,13 @@
 		if ( value == null ) return true;
 		if ( !( value instanceof String ) ) return false;
 		String string = (String) value;
-      if ( string.length() == 0 ) return true;
-      Matcher m = pattern.matcher( string );
+		if ( string.length() == 0 ) return true;
+		Matcher m = pattern.matcher( string );
 		return m.matches();
 	}
 
 	public void initialize(Email parameters) {
 		pattern = java.util.regex.Pattern.compile(
-				"^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*$",
-				java.util.regex.Pattern.CASE_INSENSITIVE
-		);
-		pattern = java.util.regex.Pattern.compile(
 				"^" + ATOM + "+(\\." + ATOM + "+)*@"
 						 + DOMAIN
 						 + "|"

Modified: trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java
===================================================================
--- trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java	2007-07-16 00:36:41 UTC (rev 12765)
+++ trunk/HibernateExt/validator/src/test/org/hibernate/validator/test/EmailTest.java	2007-07-16 02:20:28 UTC (rev 12766)
@@ -11,29 +11,28 @@
 	private ClassValidator<User> userValidator;
 
 	public void testEmail() throws Exception {
-		userValidator = new ClassValidator<User>( User.class );
-		isRightEmail( "emmanuel at hibernate.org" );
-      isRightEmail( "" );
-      isRightEmail( null );
-      isWrongEmail( "emmanuel.hibernate.org" );
-		isRightEmail( "emmanuel at hibernate" );
-		isRightEmail( "emma-n_uel at hibernate" );
-		isWrongEmail( "emma nuel at hibernate.org" );
-		isWrongEmail( "emma(nuel at hibernate.org" );
-		isWrongEmail( "emmanuel@" );
-		isRightEmail( "emma+nuel at hibernate.org" );
-		isRightEmail( "emma=nuel at hibernate.org" );
-		isWrongEmail( "emma\nnuel at hibernate.org" );
-		isWrongEmail( "emma at nuel@hibernate.org" );
-		isRightEmail( "emmanuel@[123.12.2.11]" );
+		userValidator = new ClassValidator<User>(User.class);
+		isRightEmail("emmanuel at hibernate.org");
+		isRightEmail("");
+		isRightEmail(null);
+		isRightEmail("emmanuel at hibernate");
+		isRightEmail("emma-n_uel at hibernate");
+		isRightEmail("emma+nuel at hibernate.org");
+		isRightEmail("emma=nuel at hibernate.org");
+		isRightEmail("emmanuel@[123.12.2.11]");
+		isWrongEmail("emmanuel.hibernate.org");
+		isWrongEmail("emma nuel at hibernate.org");
+		isWrongEmail("emma(nuel at hibernate.org");
+		isWrongEmail("emmanuel@");
+		isWrongEmail("emma\nnuel at hibernate.org");
+		isWrongEmail("emma at nuel@hibernate.org");
 	}
 
 	private void isRightEmail(String email) {
-		assertEquals( "Wrong email", 0, userValidator.getPotentialInvalidValues( "email", email ).length );
+		assertEquals("Wrong email", 0, userValidator.getPotentialInvalidValues("email", email).length);
 	}
 
 	private void isWrongEmail(String email) {
-		assertEquals( "Right email", 1, userValidator.getPotentialInvalidValues( "email", email ).length );
-		;
+		assertEquals("Right email", 1, userValidator.getPotentialInvalidValues("email", email).length);
 	}
 }