You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2012/05/04 20:19:40 UTC

svn commit: r1334109 - in /james/hupa/trunk/server/src: main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java

Author: manolo
Date: Fri May  4 18:19:39 2012
New Revision: 1334109

URL: http://svn.apache.org/viewvc?rev=1334109&view=rev
Log:
Fix tests. Test search feature

Modified:
    james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
    james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java

Modified: james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java?rev=1334109&r1=1334108&r2=1334109&view=diff
==============================================================================
--- james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java (original)
+++ james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java Fri May  4 18:19:39 2012
@@ -68,6 +68,7 @@ public class FetchMessagesHandler extend
     @Override
     protected MessageConvertArray getMessagesToConvert(com.sun.mail.imap.IMAPFolder f,
             FetchMessages action) throws MessagingException, ActionException {
+        
         String searchString = action.getSearchString();
         int start = action.getStart();
         int offset = action.getOffset();

Modified: james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java
URL: http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java?rev=1334109&r1=1334108&r2=1334109&view=diff
==============================================================================
--- james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java (original)
+++ james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/FetchMessagesHandlerTest.java Fri May  4 18:19:39 2012
@@ -72,7 +72,7 @@ public class FetchMessagesHandlerTest ex
         FetchMessagesResult result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
         assertEquals(0, result.getRealCount());
         
-        ByteArrayInputStream is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
+        ByteArrayInputStream is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata 1".getBytes());
         MimeMessage msg = new MimeMessage(session, is);
         serverfolder.addMessages(new Message[]{msg});
         result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "something"), null);
@@ -83,14 +83,17 @@ public class FetchMessagesHandlerTest ex
         assertEquals(1, result.getRealCount());
         assertEquals(1, result.getMessages().size());
 
-        is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata".getBytes());
+        is = new ByteArrayInputStream("From: a@foo.com\nTo: b@foo.com\nSubject: something\n\ndata 2".getBytes());
         msg = new MimeMessage(session, is);
         serverfolder.appendMessages(new Message[]{msg});
         
-        result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
+        result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "data"), null);
         assertEquals(2, result.getRealCount());
         assertEquals(2, result.getMessages().size());
         
+        result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "data 2"), null);
+        assertEquals(1, result.getRealCount());
+        
         result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, null), null);
         assertEquals(2, serverfolder.getMessageCount());
         assertEquals(2, serverfolder.getUnreadMessageCount());
@@ -102,7 +105,7 @@ public class FetchMessagesHandlerTest ex
         assertEquals(1, serverfolder.getUnreadMessageCount());
         
         serverfolder.appendMessages(new Message[]{msg});
-        result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "*"), null);
+        result = fetchMessagesHandler.execute(new FetchMessages(clientfolder, 0, 10, "data"), null);
         assertEquals(3, result.getRealCount());
         assertEquals(1, result.getRealUnreadCount());
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org