Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java (original) +++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/mail/MessageMapper.java Tue Jan 6 13:25:37 2009 @@ -20,7 +20,7 @@ import java.util.List; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAMessage; import org.apache.james.imap.mailbox.MessageRange; import org.apache.james.imap.mailbox.SearchQuery; import org.apache.james.imap.mailbox.StorageException; @@ -31,10 +31,10 @@ public abstract void commit() throws StorageException; - public abstract List<Message> findInMailbox(MessageRange set, long mailboxId) + public abstract List<JPAMessage> findInMailbox(MessageRange set, long mailboxId) throws StorageException; - public abstract List<Message> findMarkedForDeletionInMailbox( + public abstract List<JPAMessage> findMarkedForDeletionInMailbox( final MessageRange set, final long mailboxId) throws StorageException; @@ -45,19 +45,19 @@ throws StorageException; @SuppressWarnings("unchecked") - public abstract List<Message> searchMailbox(long mailboxId, + public abstract List<JPAMessage> searchMailbox(long mailboxId, SearchQuery query) throws StorageException; - public abstract void delete(Message message) throws StorageException; + public abstract void delete(JPAMessage message) throws StorageException; @SuppressWarnings("unchecked") - public abstract List<Message> findUnseenMessagesInMailboxOrderByUid( + public abstract List<JPAMessage> findUnseenMessagesInMailboxOrderByUid( final long mailboxId) throws StorageException; @SuppressWarnings("unchecked") - public abstract List<Message> findRecentMessagesInMailbox( + public abstract List<JPAMessage> findRecentMessagesInMailbox( final long mailboxId) throws StorageException; - public abstract void save(Message message) throws StorageException; + public abstract void save(JPAMessage message) throws StorageException; } \ No newline at end of file
Modified: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java (original) +++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java Tue Jan 6 13:25:37 2009 @@ -20,7 +20,7 @@ import java.util.List; -import org.apache.james.imap.jpa.user.model.Subscription; +import org.apache.james.imap.jpa.user.model.JPASubscription; public interface SubscriptionMapper { @@ -35,14 +35,14 @@ * @return <code>Subscription</code>, * or null when the user is not subscribed to the given mailbox */ - public abstract Subscription findFindMailboxSubscriptionForUser( + public abstract JPASubscription findFindMailboxSubscriptionForUser( final String user, final String mailbox); /** * Saves the given subscription. * @param subscription not null */ - public abstract void save(Subscription subscription); + public abstract void save(JPASubscription subscription); /** * Finds subscriptions for the given user. @@ -50,12 +50,12 @@ * @return not null */ @SuppressWarnings("unchecked") - public abstract List<Subscription> findSubscriptionsForUser(String user); + public abstract List<JPASubscription> findSubscriptionsForUser(String user); /** * Deletes the given subscription. * @param subscription not null */ - public abstract void delete(Subscription subscription); + public abstract void delete(JPASubscription subscription); } \ No newline at end of file Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java (original) +++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageBuilder.java Tue Jan 6 13:25:37 2009 @@ -24,8 +24,8 @@ import javax.mail.Flags; -import org.apache.james.imap.jpa.mail.model.Header; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAHeader; +import org.apache.james.imap.jpa.mail.model.JPAMessage; public class MessageBuilder { @@ -35,16 +35,16 @@ public int size = 8867; public Flags flags = new Flags(); public byte[] body = {}; - public final List<Header> headers = new ArrayList<Header>(); + public final List<JPAHeader> headers = new ArrayList<JPAHeader>(); public int lineNumber = 0; - public Message build() { - Message result = new Message(mailboxId, uid, internalDate, size, flags, body, headers); + public JPAMessage build() { + JPAMessage result = new JPAMessage(mailboxId, uid, internalDate, size, flags, body, headers); return result; } - public Header header(String field, String value) { - Header header = new Header(++lineNumber, field, value); + public JPAHeader header(String field, String value) { + JPAHeader header = new JPAHeader(++lineNumber, field, value); headers.add(header); return header; } Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java (original) +++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java Tue Jan 6 13:25:37 2009 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAMessage; public class MessageRowUtilsTest extends TestCase { @@ -35,12 +35,12 @@ public void testShouldReturnPositiveWhenFirstGreaterThanSecond() throws Exception { - Message one = buildMessage(100); - Message two = buildMessage(99); + JPAMessage one = buildMessage(100); + JPAMessage two = buildMessage(99); assertTrue(MessageRowUtils.getUidComparator().compare(one, two) > 0); } - private Message buildMessage(int uid) { + private JPAMessage buildMessage(int uid) { MessageBuilder builder = new MessageBuilder(); builder.uid = uid; return builder.build(); @@ -48,14 +48,14 @@ public void testShouldReturnNegativeWhenFirstLessThanSecond() throws Exception { - Message one = buildMessage(98); - Message two = buildMessage(99); + JPAMessage one = buildMessage(98); + JPAMessage two = buildMessage(99); assertTrue(MessageRowUtils.getUidComparator().compare(one, two) < 0); } public void testShouldReturnZeroWhenFirstEqualsSecond() throws Exception { - Message one = buildMessage(90); - Message two = buildMessage(90); + JPAMessage one = buildMessage(90); + JPAMessage two = buildMessage(90); assertEquals(0, MessageRowUtils.getUidComparator().compare(one, two)); } } Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java (original) +++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java Tue Jan 6 13:25:37 2009 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAMessage; import org.apache.james.imap.mailbox.SearchQuery; public class SearchUtilsMultipartMixedTest extends TestCase { @@ -103,7 +103,7 @@ + " Than both your poets can in praise devise.\r\n" + "\r\n--2.50290787509--\r\n" + "\r\n--1729--\r\n"; - Message row; + JPAMessage row; MessageSearches searches; Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java (original) +++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java Tue Jan 6 13:25:37 2009 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAMessage; import org.apache.james.imap.mailbox.SearchQuery; public class SearchUtilsRFC822Test extends TestCase { @@ -43,7 +43,7 @@ + "It has " + RHUBARD + ".\r\n" + "It has " + CUSTARD + ".\r\n" + "It needs naught else.\r\n"; - Message row; + JPAMessage row; MessageSearches searches; Modified: james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java?rev=732125&r1=732124&r2=732125&view=diff ============================================================================== --- james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java (original) +++ james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java Tue Jan 6 13:25:37 2009 @@ -28,7 +28,7 @@ import junit.framework.TestCase; import org.apache.james.api.imap.ImapConstants; -import org.apache.james.imap.jpa.mail.model.Message; +import org.apache.james.imap.jpa.mail.model.JPAMessage; import org.apache.james.imap.mailbox.SearchQuery; public class SearchUtilsTest extends TestCase { @@ -69,7 +69,7 @@ public void testMatchSizeLessThan() throws Exception { builder.size = SIZE; - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.sizeLessThan(SIZE - 1), row, recent)); assertFalse(searches.isMatch(SearchQuery.sizeLessThan(SIZE), row, @@ -82,7 +82,7 @@ public void testMatchSizeMoreThan() throws Exception { builder.size = SIZE; - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row, recent)); assertFalse(searches.isMatch(SearchQuery.sizeGreaterThan(SIZE), row, @@ -95,7 +95,7 @@ public void testMatchSizeEquals() throws Exception { builder.size = SIZE; - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.sizeEquals(SIZE - 1), row, recent)); assertTrue(searches.isMatch(SearchQuery.sizeEquals(SIZE), row, recent)); @@ -107,7 +107,7 @@ public void testMatchInternalDateEquals() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.internalDateOn(9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.internalDateOn(8, 9, 2001), @@ -122,7 +122,7 @@ public void testMatchInternalDateBefore() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch( SearchQuery.internalDateBefore(9, 9, 2000), row, recent)); assertFalse(searches.isMatch( @@ -137,7 +137,7 @@ public void testMatchInternalDateAfter() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.internalDateAfter(9, 9, 2000), row, recent)); assertTrue(searches.isMatch(SearchQuery.internalDateAfter(8, 9, 2001), @@ -152,7 +152,7 @@ public void testMatchHeaderDateAfter() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9, 9, 2000), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8, @@ -169,7 +169,7 @@ public void testShouldMatchCapsHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9, 9, 2000), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8, @@ -186,7 +186,7 @@ public void testShouldMatchLowersHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 9, 9, 2000), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, 8, @@ -203,7 +203,7 @@ public void testMatchHeaderDateOn() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9, @@ -220,7 +220,7 @@ public void testShouldMatchCapsHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9, @@ -237,7 +237,7 @@ public void testShouldMatchLowersHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, 8, 9, @@ -254,7 +254,7 @@ public void testMatchHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, @@ -271,7 +271,7 @@ public void testShouldMatchCapsHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, @@ -288,7 +288,7 @@ public void testShouldMatchLowersHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, 9, 9, 2000), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, @@ -305,7 +305,7 @@ public void testMatchHeaderContainsCaps() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, @@ -320,7 +320,7 @@ public void testMatchHeaderContainsLowers() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, @@ -335,7 +335,7 @@ public void testMatchHeaderContains() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, @@ -350,7 +350,7 @@ public void testShouldMatchLowerHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, @@ -365,7 +365,7 @@ public void testShouldMatchCapsHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toUpperCase(), TEXT); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent)); assertFalse(searches.isMatch(SearchQuery.headerContains(DATE_FIELD, @@ -380,7 +380,7 @@ public void testMatchHeaderExists() throws Exception { builder.header(SUBJECT_FIELD, TEXT); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), @@ -389,7 +389,7 @@ public void testShouldMatchLowersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), @@ -398,7 +398,7 @@ public void testShouldMatchUppersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent)); assertTrue(searches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), @@ -407,7 +407,7 @@ public void testShouldMatchUidRange() throws Exception { builder.setKey(1, 1729); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.uid(range(1, 1)), row, recent)); assertFalse(searches.isMatch(SearchQuery.uid(range(1728, 1728)), row, recent)); @@ -437,7 +437,7 @@ public void testShouldMatchSeenFlagSet() throws Exception { builder.setFlags(true, false, false, false, false, false); - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), @@ -454,7 +454,7 @@ public void testShouldMatchAnsweredFlagSet() throws Exception { builder.setFlags(false, false, true, false, false, false); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), @@ -471,7 +471,7 @@ public void testShouldMatchFlaggedFlagSet() throws Exception { builder.setFlags(false, true, false, false, false, false); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); assertTrue(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), @@ -488,7 +488,7 @@ public void testShouldMatchDraftFlagSet() throws Exception { builder.setFlags(false, false, false, true, false, false); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), @@ -505,7 +505,7 @@ public void testShouldMatchDeletedFlagSet() throws Exception { builder.setFlags(false, false, false, false, true, false); - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), @@ -522,7 +522,7 @@ public void testShouldMatchSeenRecentSet() throws Exception { builder.setFlags(false, false, false, false, false, false); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertFalse(searches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent)); @@ -540,7 +540,7 @@ public void testShouldMatchSeenFlagUnSet() throws Exception { builder.setFlags(false, true, true, true, true, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertTrue(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -558,7 +558,7 @@ public void testShouldMatchAnsweredFlagUnSet() throws Exception { builder.setFlags(true, true, false, true, true, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -576,7 +576,7 @@ public void testShouldMatchFlaggedFlagUnSet() throws Exception { builder.setFlags(true, false, true, true, true, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -594,7 +594,7 @@ public void testShouldMatchDraftFlagUnSet() throws Exception { builder.setFlags(true, true, true, false, true, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -612,7 +612,7 @@ public void testShouldMatchDeletedFlagUnSet() throws Exception { builder.setFlags(true, true, true, true, false, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid())); assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -630,7 +630,7 @@ public void testShouldMatchSeenRecentUnSet() throws Exception { builder.setFlags(true, true, true, true, true, true); - Message row = builder.build(); + JPAMessage row = builder.build(); recent.add(new Long(row.getUid() + 1)); assertFalse(searches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent)); @@ -647,12 +647,12 @@ } public void testShouldMatchAll() throws Exception { - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.all(), row, recent)); } public void testShouldMatchNot() throws Exception { - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.not(SearchQuery.all()), row, recent)); assertTrue(searches.isMatch(SearchQuery.not(SearchQuery @@ -660,7 +660,7 @@ } public void testShouldMatchOr() throws Exception { - Message row = builder.build(); + JPAMessage row = builder.build(); assertTrue(searches.isMatch(SearchQuery.or(SearchQuery.all(), SearchQuery.headerExists(DATE_FIELD)), row, recent)); assertTrue(searches.isMatch(SearchQuery.or(SearchQuery @@ -673,7 +673,7 @@ } public void testShouldMatchAnd() throws Exception { - Message row = builder.build(); + JPAMessage row = builder.build(); assertFalse(searches.isMatch(SearchQuery.and(SearchQuery.all(), SearchQuery.headerExists(DATE_FIELD)), row, recent)); assertFalse(searches.isMatch(SearchQuery.and(SearchQuery --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
