Author: norman
Date: Mon May 16 08:38:16 2011
New Revision: 1103650

URL: http://svn.apache.org/viewvc?rev=1103650&view=rev
Log:
Canonicalized the addresses into RFC 2822 normalized form when search for 
addresses. See MAILBOX-67

Modified:
    
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java

Modified: 
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
URL: 
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java?rev=1103650&r1=1103649&r2=1103650&view=diff
==============================================================================
--- 
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
 (original)
+++ 
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
 Mon May 16 08:38:16 2011
@@ -49,6 +49,7 @@ import org.apache.james.mailbox.MailboxP
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.SearchQuery.AddressType;
 import org.apache.james.mailbox.SearchQuery.Criterion;
 import org.apache.james.mailbox.SearchQuery.DateResolution;
 import org.jmock.Expectations;
@@ -233,8 +234,8 @@ public class SearchProcessorTest {
     @Test
     public void testBCC() throws Exception {
         expectsGetSelectedMailbox();
-        check(SearchKey.buildBcc(ADDRESS), SearchQuery.headerContains(
-                ImapConstants.RFC822_BCC, ADDRESS));
+        check(SearchKey.buildBcc(ADDRESS), SearchQuery.address(
+                AddressType.Bcc, ADDRESS));
     }
 
     @Test
@@ -253,8 +254,8 @@ public class SearchProcessorTest {
     @Test
     public void testCC() throws Exception {
         expectsGetSelectedMailbox();
-        check(SearchKey.buildCc(ADDRESS), SearchQuery.headerContains(
-                ImapConstants.RFC822_CC, ADDRESS));
+        check(SearchKey.buildCc(ADDRESS), SearchQuery.address(
+                AddressType.Cc, ADDRESS));
     }
 
     @Test
@@ -278,8 +279,8 @@ public class SearchProcessorTest {
     @Test
     public void testFROM() throws Exception {
         expectsGetSelectedMailbox();
-        check(SearchKey.buildFrom(ADDRESS), SearchQuery.headerContains(
-                ImapConstants.RFC822_FROM, ADDRESS));
+        check(SearchKey.buildFrom(ADDRESS), SearchQuery.address(
+                AddressType.From, ADDRESS));
     }
 
     @Test
@@ -413,8 +414,8 @@ public class SearchProcessorTest {
     @Test
     public void testTO() throws Exception {
         expectsGetSelectedMailbox();
-        check(SearchKey.buildTo(ADDRESS), SearchQuery.headerContains(
-                ImapConstants.RFC822_TO, ADDRESS));
+        check(SearchKey.buildTo(ADDRESS), SearchQuery.address(
+                AddressType.To, ADDRESS));
     }
 
     @Test



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to