commit 9987b1534e31b0aa406943450e6b5746f3ab2c03
author Paul Westbrook <pwestbro@google.com> Thu Sep 30 14:56:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 30 14:56:34 2010 -0700
tree 9800b3a4bb07a34a8ea2c996fefbff5c66d5a668
parent ee0fc045dadc65de67af41dc26223dbffc87a574
parent 5dcaf7b0b92ad6867ed50801923fb29157edddaa

am 5dcaf7b0: am fcf1948a: Moved Rfc822 validator test

Merge commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa'

* commit '5dcaf7b0b92ad6867ed50801923fb29157edddaa':
  Moved Rfc822 validator test

core/tests/coretests/src/android/text/TextUtilsTest.java

diff --git a/core/tests/coretests/src/android/text/TextUtilsTest.java b/core/tests/coretests/src/android/text/TextUtilsTest.java
index 1beba53..e111662 100644
--- a/core/tests/coretests/src/android/text/TextUtilsTest.java
+++ b/core/tests/coretests/src/android/text/TextUtilsTest.java
@@ -30,7 +30,6 @@
 import android.text.util.Rfc822Tokenizer;
 import android.test.MoreAsserts;
 
-import com.android.common.Rfc822Validator;
 import com.google.android.collect.Lists;
 import com.google.android.collect.Maps;
 
@@ -238,39 +237,6 @@
         }
     }
 
-    //==============================================================================================
-    // Email validator
-    //==============================================================================================
-    
-    @SmallTest
-    public void testEmailValidator() {
-        Rfc822Validator validator = new Rfc822Validator("gmail.com");
-        String[] validEmails = new String[] {
-            "a@b.com", "a@b.fr", "a+b@c.com", "a@b.info",
-        };
-        
-        for (String email : validEmails) {
-            assertTrue(email + " should be a valid email address", validator.isValid(email));
-        }
-        
-        String[] invalidEmails = new String[] {
-            "a", "a@b", "a b", "a@b.12"
-        };
-
-        for (String email : invalidEmails) {
-            assertFalse(email + " should not be a valid email address", validator.isValid(email));
-        }
-        
-        Map<String, String> fixes = Maps.newHashMap();
-        fixes.put("a", "<a@gmail.com>");
-        fixes.put("a b", "<ab@gmail.com>");
-        fixes.put("a@b", "<a@b>");
-        
-        for (Map.Entry<String, String> e : fixes.entrySet()) {
-            assertEquals(e.getValue(), validator.fixText(e.getKey()).toString());
-        }
-    }
-
     @SmallTest
     public void testRfc822TokenizerFullAddress() {
         Rfc822Token[] tokens = Rfc822Tokenizer.tokenize("Foo Bar (something) <foo@google.com>");