Index: src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java =================================================================== --- src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (revision 1416871) +++ src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (working copy) @@ -64,7 +64,9 @@ */ public class MessageSearches implements Iterable{ - private Collection uids; + private Iterator> messages; + private SearchQuery query; + private Logger log; public MessageSearches(Iterator> messages, SearchQuery query) { @@ -72,10 +74,18 @@ } public MessageSearches(Iterator> messages, SearchQuery query, Logger log) { - uids = search(query, messages, log); + this.messages = messages; + this.query = query; + this.log = log; } - - private static Collection search(SearchQuery query, Iterator> messages, Logger log) { + + /** + * Empty constructor only for tests (which test isMatch()) + */ + public MessageSearches() { + } + + private Collection search() { TreeSet> matched = new TreeSet>(CombinedComparator.create(query.getSorts())); while (messages.hasNext()) { Message m = messages.next(); @@ -107,7 +117,7 @@ * @return true if the row matches the given criteria, false otherwise * @throws MailboxException */ - public static boolean isMatch(final SearchQuery query, final Message message, Logger log) + protected boolean isMatch(final SearchQuery query, final Message message, Logger log) throws MailboxException { final List criteria = query.getCriterias(); final Collection recentMessageUids = query.getRecentMessageUids(); @@ -138,7 +148,7 @@ * @return true if the row matches the given criterion, false otherwise * @throws MailboxException */ - public static boolean isMatch(SearchQuery.Criterion criterion, Message message, + public boolean isMatch(SearchQuery.Criterion criterion, Message message, final Collection recentMessageUids, Logger log) throws MailboxException { final boolean result; if (criterion instanceof SearchQuery.InternalDateCriterion) { @@ -174,7 +184,7 @@ return result; } - private static boolean matches(SearchQuery.TextCriterion criterion, Message message, Logger log) throws MailboxException { + protected boolean matches(SearchQuery.TextCriterion criterion, Message message, Logger log) throws MailboxException { try { final SearchQuery.ContainsOperator operator = criterion .getOperator(); @@ -194,14 +204,14 @@ } } - private static boolean bodyContains(String value, Message message, Logger log) + protected boolean bodyContains(String value, Message message, Logger log) throws IOException, MimeException { final InputStream input = message.getFullContent(); final boolean result = isInMessage(value, input, false, log); return result; } - private static boolean isInMessage(String value, final InputStream input, + protected boolean isInMessage(String value, final InputStream input, boolean header, Logger log) throws IOException, MimeException { final MessageSearcher searcher = new MessageSearcher(value, true, header); @@ -212,14 +222,14 @@ return result; } - private static boolean messageContains(String value, Message message, Logger log) + protected boolean messageContains(String value, Message message, Logger log) throws IOException, MimeException { final InputStream input = message.getFullContent(); final boolean result = isInMessage(value, input, true, log); return result; } - private static boolean matches(SearchQuery.ConjunctionCriterion criterion, + private boolean matches(SearchQuery.ConjunctionCriterion criterion, Message message, final Collection recentMessageUids, Logger log) throws MailboxException { final List criteria = criterion.getCriteria(); switch (criterion.getType()) { @@ -234,7 +244,7 @@ } } - private static boolean and(final List criteria, final Message message, + private boolean and(final List criteria, final Message message, final Collection recentMessageUids, Logger log) throws MailboxException { boolean result = true; for (Iterator it = criteria.iterator(); it.hasNext();) { @@ -248,7 +258,7 @@ return result; } - private static boolean or(final List criteria, final Message message, + private boolean or(final List criteria, final Message message, final Collection recentMessageUids, Logger log) throws MailboxException { boolean result = false; for (Iterator it = criteria.iterator(); it.hasNext();) { @@ -262,7 +272,7 @@ return result; } - private static boolean nor(final List criteria, final Message message, + private boolean nor(final List criteria, final Message message, final Collection recentMessageUids, Logger log) throws MailboxException { boolean result = true; for (Iterator it = criteria.iterator(); it.hasNext();) { @@ -276,7 +286,7 @@ return result; } - private static boolean matches(SearchQuery.FlagCriterion criterion, + private boolean matches(SearchQuery.FlagCriterion criterion, Message message, final Collection recentMessageUids) { final SearchQuery.BooleanOperator operator = criterion.getOperator(); final boolean isSet = operator.isSet(); @@ -301,7 +311,7 @@ return result; } - private static boolean matches(SearchQuery.CustomFlagCriterion criterion, + private boolean matches(SearchQuery.CustomFlagCriterion criterion, Message message, final Collection recentMessageUids) { final SearchQuery.BooleanOperator operator = criterion.getOperator(); final boolean isSet = operator.isSet(); @@ -309,7 +319,7 @@ final boolean result = isSet == message.createFlags().contains(flag); return result; } - private static boolean matches(SearchQuery.UidCriterion criterion, Message message) { + private boolean matches(SearchQuery.UidCriterion criterion, Message message) { final SearchQuery.InOperator operator = criterion.getOperator(); final NumericRange[] ranges = operator.getRange(); final long uid = message.getUid(); @@ -325,7 +335,7 @@ return result; } - private static boolean matches(SearchQuery.HeaderCriterion criterion, Message message, Logger log) throws MailboxException, IOException { + private boolean matches(SearchQuery.HeaderCriterion criterion, Message message, Logger log) throws MailboxException, IOException { final SearchQuery.HeaderOperator operator = criterion.getOperator(); final String headerName = criterion.getHeaderName(); final boolean result; @@ -353,7 +363,7 @@ * @throws MailboxException * @throws IOException */ - private static boolean matchesAddress(final SearchQuery.AddressOperator operator, + private boolean matchesAddress(final SearchQuery.AddressOperator operator, final String headerName, final Message message, Logger log) throws MailboxException, IOException { final String text = operator.getAddress().toUpperCase(Locale.ENGLISH); final List
headers = ResultUtils.createHeaders(message); @@ -386,7 +396,7 @@ return false; } - private static boolean exists(String headerName, Message message) throws MailboxException, IOException { + private boolean exists(String headerName, Message message) throws MailboxException, IOException { boolean result = false; final List
headers = ResultUtils.createHeaders(message); @@ -400,7 +410,7 @@ return result; } - private static boolean matches(final SearchQuery.ContainsOperator operator, + private boolean matches(final SearchQuery.ContainsOperator operator, final String headerName, final Message message) throws MailboxException, IOException { final String text = operator.getValue().toUpperCase(); boolean result = false; @@ -420,7 +430,7 @@ return result; } - private static boolean matches(final SearchQuery.DateOperator operator, final String headerName, final Message message) throws MailboxException { + private boolean matches(final SearchQuery.DateOperator operator, final String headerName, final Message message) throws MailboxException { final Date date = operator.getDate(); final DateResolution res = operator.getDateResultion(); @@ -451,7 +461,7 @@ } } - private static String headerValue(final String headerName, final Message message) throws MailboxException, IOException { + private String headerValue(final String headerName, final Message message) throws MailboxException, IOException { final List
headers = ResultUtils.createHeaders(message); String value = null; for (Header header:headers) { @@ -464,7 +474,7 @@ return value; } - private static Date toISODate(String value) throws ParseException { + private Date toISODate(String value) throws ParseException { final StringReader reader = new StringReader(value); final DateTime dateTime = new DateTimeParser(reader).parseAll(); Calendar cal = getGMT(); @@ -472,7 +482,7 @@ return cal.getTime(); } - private static boolean matches(SearchQuery.SizeCriterion criterion, Message message) + private boolean matches(SearchQuery.SizeCriterion criterion, Message message) throws UnsupportedSearchException { final SearchQuery.NumericOperator operator = criterion.getOperator(); final long size = message.getFullContentOctets(); @@ -489,7 +499,7 @@ } } - private static boolean matches(SearchQuery.ModSeqCriterion criterion, Message message) throws UnsupportedSearchException { + private boolean matches(SearchQuery.ModSeqCriterion criterion, Message message) throws UnsupportedSearchException { final SearchQuery.NumericOperator operator = criterion.getOperator(); final long modSeq = message.getModSeq(); final long value = operator.getValue(); @@ -505,14 +515,14 @@ } } - private static boolean matches(SearchQuery.InternalDateCriterion criterion, + private boolean matches(SearchQuery.InternalDateCriterion criterion, Message message) throws UnsupportedSearchException { final SearchQuery.DateOperator operator = criterion.getOperator(); final boolean result = matchesInternalDate(operator, message); return result; } - private static boolean matchesInternalDate( + private boolean matchesInternalDate( final SearchQuery.DateOperator operator, final Message message) throws UnsupportedSearchException { final Date date = operator.getDate(); @@ -532,14 +542,14 @@ } - private static boolean on(Date date1, + private boolean on(Date date1, final Date date2, DateResolution res) { String d1 = createDateString(date1, res); String d2 = createDateString(date2, res); return d1.compareTo(d2) == 0; } - private static boolean before(Date date1, + private boolean before(Date date1, final Date date2, DateResolution res) { String d1 = createDateString(date1, res); String d2 = createDateString(date2, res); @@ -547,7 +557,7 @@ return d1.compareTo(d2) < 0; } - private static boolean after(Date date1, + private boolean after(Date date1, final Date date2, DateResolution res) { String d1 = createDateString(date1, res); String d2 = createDateString(date2, res); @@ -557,7 +567,7 @@ - private static String createDateString(Date date, DateResolution res) { + private String createDateString(Date date, DateResolution res) { SimpleDateFormat format; switch (res) { case Year: @@ -588,7 +598,7 @@ } - private static Calendar getGMT() { + private Calendar getGMT() { return Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH); } @@ -598,7 +608,7 @@ * */ public Iterator iterator() { - return uids.iterator(); + return search().iterator(); } } Index: src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java =================================================================== --- src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java (revision 1416871) +++ src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java (working copy) @@ -129,95 +129,95 @@ @Test public void testShouldNotFindWhatIsNotThere() throws Exception { - assertFalse(MessageSearches.isMatch(SearchQuery.bodyContains("BOGUS"), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.bodyContains("BOGUS"), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.mailContains("BOGUS"), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.mailContains("BOGUS"), row, recent, log)); } @Test public void testBodyShouldFindTextInBody() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_INNER_MAIL_BODY_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE), + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO), + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO), row, recent, log)); } @Test public void testBodyShouldFindTextInBodyCaseInsensitive() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_INNER_MAIL_BODY_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE), + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO), + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_INNER_MAIL_BODY_ONE.toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_INNER_MAIL_BODY_ONE.toUpperCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_ONE .toUpperCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(SAMPLE_PART_TWO .toUpperCase()), row, recent, log)); } @Test public void testBodyShouldNotFindTextInHeaders() throws Exception { - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_INNER_MAIL_FIELD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .bodyContains(SAMPLE_PART_TWO_FIELD), row, recent, log)); } @Test public void testTextShouldFindTextInBody() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_BODY_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO), row, recent, log)); } @Test public void testTextShouldFindTextInBodyCaseInsensitive() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_BODY_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_BODY_ONE.toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_BODY_ONE.toUpperCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_ONE .toUpperCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SAMPLE_PART_TWO .toUpperCase()), row, recent, log)); } @Test public void testTextShouldFindTextInHeaders() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_FIELD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_INNER_MAIL_BODY_ONE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .mailContains(SAMPLE_PART_TWO_FIELD), row, recent, log)); } } Index: src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java =================================================================== --- src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java (revision 1416871) +++ src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java (working copy) @@ -67,53 +67,53 @@ @Test public void testBodyShouldMatchPhraseInBody() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(CUSTARD), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .bodyContains(CUSTARD + CUSTARD), row, recent, log)); } @Test public void testBodyMatchShouldBeCaseInsensitive() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(RHUBARD), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(RHUBARD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(RHUBARD + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(RHUBARD .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.bodyContains(RHUBARD + assertTrue(new MessageSearches().isMatch(SearchQuery.bodyContains(RHUBARD .toLowerCase()), row, recent, log)); } @Test public void testBodyShouldNotMatchPhraseOnlyInHeader() throws Exception { - assertFalse(MessageSearches.isMatch(SearchQuery.bodyContains(FROM_ADDRESS), + assertFalse(new MessageSearches().isMatch(SearchQuery.bodyContains(FROM_ADDRESS), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.bodyContains(SUBJECT_PART), + assertFalse(new MessageSearches().isMatch(SearchQuery.bodyContains(SUBJECT_PART), row, recent, log)); } @Test public void testTextShouldMatchPhraseInBody() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(CUSTARD), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .mailContains(CUSTARD + CUSTARD), row, recent, log)); } @Test public void testTextMatchShouldBeCaseInsensitive() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(RHUBARD), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(RHUBARD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(RHUBARD + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(RHUBARD .toLowerCase()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(RHUBARD + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(RHUBARD .toLowerCase()), row, recent, log)); } @Test public void testBodyShouldMatchPhraseOnlyInHeader() throws Exception { - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(FROM_ADDRESS), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(FROM_ADDRESS), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.mailContains(SUBJECT_PART), + assertTrue(new MessageSearches().isMatch(SearchQuery.mailContains(SUBJECT_PART), row, recent, log)); } } Index: src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java =================================================================== --- src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java (revision 1416871) +++ src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java (working copy) @@ -83,13 +83,13 @@ public void testMatchSizeLessThan() throws Exception { builder.size = SIZE; Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeLessThan(SIZE - 1), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeLessThan(SIZE - 1), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeLessThan(SIZE), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeLessThan(SIZE), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.sizeLessThan(SIZE + 1), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.sizeLessThan(SIZE + 1), row, recent, log)); - assertTrue(MessageSearches.isMatch( + assertTrue(new MessageSearches().isMatch( SearchQuery.sizeLessThan(Integer.MAX_VALUE), row, recent, log)); } @@ -97,13 +97,13 @@ public void testMatchSizeMoreThan() throws Exception { builder.size = SIZE; Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeGreaterThan(SIZE), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE + 1), + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeGreaterThan(SIZE + 1), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .sizeGreaterThan(Integer.MAX_VALUE), row, recent, log)); } @@ -111,12 +111,12 @@ public void testMatchSizeEquals() throws Exception { builder.size = SIZE; Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeEquals(SIZE - 1), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeEquals(SIZE - 1), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.sizeEquals(SIZE), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeEquals(SIZE + 1), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.sizeEquals(SIZE), row, recent, log)); + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeEquals(SIZE + 1), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.sizeEquals(Integer.MAX_VALUE), + assertFalse(new MessageSearches().isMatch(SearchQuery.sizeEquals(Integer.MAX_VALUE), row, recent, log)); } @@ -124,15 +124,15 @@ public void testMatchInternalDateEquals() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2000), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateOn(getDate(8, 9, 2001), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateOn(getDate(8, 9, 2001), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2001), DateResolution.Day), + assertTrue(new MessageSearches().isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateOn(getDate(10, 9, 2001), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateOn(getDate(10, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2002), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); } @@ -141,15 +141,15 @@ public void testMatchInternalDateBefore() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; Message row = builder.build(); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.internalDateBefore(getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.internalDateBefore(getDate(8, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.internalDateBefore(getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch( + assertTrue(new MessageSearches().isMatch( SearchQuery.internalDateBefore(getDate(10, 9, 2001), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.internalDateBefore(getDate(9, 9, 2002), DateResolution.Day), + assertTrue(new MessageSearches().isMatch(SearchQuery.internalDateBefore(getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); } @@ -157,15 +157,15 @@ public void testMatchInternalDateAfter() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2000), DateResolution.Day), + assertTrue(new MessageSearches().isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.internalDateAfter(getDate(8, 9, 2001), DateResolution.Day), + assertTrue(new MessageSearches().isMatch(SearchQuery.internalDateAfter(getDate(8, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2001), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.internalDateAfter(getDate(10, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2002), DateResolution.Day), + assertFalse(new MessageSearches().isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); } @@ -173,17 +173,17 @@ public void testMatchHeaderDateAfter() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); } @@ -191,17 +191,17 @@ public void testShouldMatchCapsHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); } @@ -209,17 +209,17 @@ public void testShouldMatchLowersHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, 9, 2001),DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -227,17 +227,17 @@ public void testMatchHeaderDateOn() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, 2001), DateResolution.Day), row, recent, log)); } @@ -245,17 +245,17 @@ public void testShouldMatchCapsHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toUpperCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -263,17 +263,17 @@ public void testShouldMatchLowersHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -281,17 +281,17 @@ public void testMatchHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -299,17 +299,17 @@ public void testShouldMatchCapsHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -317,17 +317,17 @@ public void testShouldMatchLowersHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(), RFC822_SUN_SEP_9TH_2001); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2000), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(8, 9, 2001), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(10, 9, 2001), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, 9, 2002), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, 9, 2001), DateResolution.Day),row, recent, log)); } @@ -335,15 +335,15 @@ public void testMatchHeaderContainsCaps() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, RHUBARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, CUSTARD), row, recent, log)); } @@ -351,15 +351,15 @@ public void testMatchHeaderContainsLowers() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, RHUBARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, CUSTARD), row, recent, log)); } @@ -367,15 +367,15 @@ public void testMatchHeaderContains() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase()); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, RHUBARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, CUSTARD), row, recent, log)); } @@ -383,15 +383,15 @@ public void testShouldMatchLowerHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, RHUBARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, CUSTARD), row, recent, log)); } @@ -399,15 +399,15 @@ public void testShouldMatchCapsHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toUpperCase(), TEXT); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, CUSTARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(DATE_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, TEXT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, RHUBARD), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerContains(SUBJECT_FIELD, CUSTARD), row, recent, log)); } @@ -415,9 +415,9 @@ public void testMatchHeaderExists() throws Exception { builder.header(SUBJECT_FIELD, TEXT); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + assertTrue(new MessageSearches().isMatch(SearchQuery.headerExists(SUBJECT_FIELD), row, recent, log)); } @@ -425,9 +425,9 @@ public void testShouldMatchLowersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + assertTrue(new MessageSearches().isMatch(SearchQuery.headerExists(SUBJECT_FIELD), row, recent, log)); } @@ -435,9 +435,9 @@ public void testShouldMatchUppersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(), TEXT); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerExists(DATE_FIELD), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + assertTrue(new MessageSearches().isMatch(SearchQuery.headerExists(SUBJECT_FIELD), row, recent, log)); } @@ -445,30 +445,30 @@ public void testShouldMatchUidRange() throws Exception { builder.setKey(1, 1729); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1, 1)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1728, 1728)), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1, 1)), row, recent, log)); + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1728, 1728)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.uid(range(1729, 1729)), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.uid(range(1729, 1729)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1730, 1730)), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1730, 1730)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1, 1728)), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1, 1728)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.uid(range(1, 1729)), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.uid(range(1, 1729)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.uid(range(1729, 1800)), row, + assertTrue(new MessageSearches().isMatch(SearchQuery.uid(range(1729, 1800)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .uid(range(1730, Long.MAX_VALUE)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1730, + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1730, Long.MAX_VALUE, 1, 1728)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.uid(range(1730, Long.MAX_VALUE, + assertTrue(new MessageSearches().isMatch(SearchQuery.uid(range(1730, Long.MAX_VALUE, 1, 1729)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .uid(range(1, 1728, 1800, 1810)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.uid(range(1, 1, 1729, 1729)), + assertTrue(new MessageSearches().isMatch(SearchQuery.uid(range(1, 1, 1729, 1729)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.uid(range(1, 1, 1800, 1800)), + assertFalse(new MessageSearches().isMatch(SearchQuery.uid(range(1, 1, 1800, 1800)), row, recent, log)); } @@ -476,17 +476,17 @@ public void testShouldMatchSeenFlagSet() throws Exception { builder.setFlags(true, false, false, false, false, false); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -494,17 +494,17 @@ public void testShouldMatchAnsweredFlagSet() throws Exception { builder.setFlags(false, false, true, false, false, false); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.ANSWERED), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -512,17 +512,17 @@ public void testShouldMatchFlaggedFlagSet() throws Exception { builder.setFlags(false, true, false, false, false, false); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -530,17 +530,17 @@ public void testShouldMatchDraftFlagSet() throws Exception { builder.setFlags(false, false, false, true, false, false); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -549,17 +549,17 @@ public void testShouldMatchDeletedFlagSet() throws Exception { builder.setFlags(false, false, false, false, true, false); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -568,17 +568,17 @@ builder.setFlags(false, false, false, false, false, false); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), row, recent, log)); } @@ -587,17 +587,17 @@ builder.setFlags(false, true, true, true, true, true); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @@ -606,17 +606,17 @@ builder.setFlags(true, true, false, true, true, true); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @@ -625,17 +625,17 @@ builder.setFlags(true, false, true, true, true, true); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertTrue(MessageSearches.isMatch( + assertTrue(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @@ -644,17 +644,17 @@ builder.setFlags(true, true, true, false, true, true); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @@ -663,17 +663,17 @@ builder.setFlags(true, true, true, true, false, true); Message row = builder.build(); recent.add(new Long(row.getUid())); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertTrue(MessageSearches.isMatch( + assertTrue(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertFalse(MessageSearches.isMatch( + assertFalse(new MessageSearches().isMatch( SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @@ -682,60 +682,60 @@ builder.setFlags(true, true, true, true, true, true); Message row = builder.build(); recent.add(new Long(row.getUid() + 1)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.FLAGGED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.ANSWERED), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + assertFalse(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .flagIsUnSet(Flags.Flag.DELETED), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.RECENT), + assertTrue(new MessageSearches().isMatch(SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent, log)); } @Test public void testShouldMatchAll() throws Exception { Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.all(), row, recent, log)); + assertTrue(new MessageSearches().isMatch(SearchQuery.all(), row, recent, log)); } @Test public void testShouldMatchNot() throws Exception { Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.not(SearchQuery.all()), row, + assertFalse(new MessageSearches().isMatch(SearchQuery.not(SearchQuery.all()), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.not(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery.not(SearchQuery .headerExists(DATE_FIELD)), row, recent, log)); } @Test public void testShouldMatchOr() throws Exception { Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.or(SearchQuery.all(), + assertTrue(new MessageSearches().isMatch(SearchQuery.or(SearchQuery.all(), SearchQuery.headerExists(DATE_FIELD)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.or(SearchQuery + assertTrue(new MessageSearches().isMatch(SearchQuery.or(SearchQuery .headerExists(DATE_FIELD), SearchQuery.all()), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .or(SearchQuery.headerExists(DATE_FIELD), SearchQuery .headerExists(DATE_FIELD)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.or(SearchQuery.all(), + assertTrue(new MessageSearches().isMatch(SearchQuery.or(SearchQuery.all(), SearchQuery.all()), row, recent, log)); } @Test public void testShouldMatchAnd() throws Exception { Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.and(SearchQuery.all(), + assertFalse(new MessageSearches().isMatch(SearchQuery.and(SearchQuery.all(), SearchQuery.headerExists(DATE_FIELD)), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.and(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery.and(SearchQuery .headerExists(DATE_FIELD), SearchQuery.all()), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery + assertFalse(new MessageSearches().isMatch(SearchQuery .and(SearchQuery.headerExists(DATE_FIELD), SearchQuery .headerExists(DATE_FIELD)), row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.and(SearchQuery.all(), + assertTrue(new MessageSearches().isMatch(SearchQuery.and(SearchQuery.all(), SearchQuery.all()), row, recent, log)); } @@ -758,12 +758,12 @@ public void testMatchHeaderDateOnWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(26, 3, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(26, 3, 2007), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(25, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(25, 3, 2007), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(27, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(27, 3, 2007), DateResolution.Day),row, recent, log)); } @@ -772,12 +772,12 @@ public void testShouldMatchHeaderDateBeforeWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(26, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(26, 3, 2007), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(27, 3, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(27, 3, 2007), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(25, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(25, 3, 2007), DateResolution.Day),row, recent, log)); } @@ -785,12 +785,12 @@ public void testShouldMatchHeaderDateAfterWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); Message row = builder.build(); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(26, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(26, 3, 2007), DateResolution.Day),row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(27, 3, + assertFalse(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(27, 3, 2007), DateResolution.Day),row, recent, log)); - assertTrue(MessageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(25, 3, + assertTrue(new MessageSearches().isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(25, 3, 2007), DateResolution.Day),row, recent, log)); } @@ -798,8 +798,8 @@ public void testShouldMatchAddressHeaderWithComments() throws Exception { builder.header("To", ""); Message row = builder.build(); - assertTrue(MessageSearches.isMatch(SearchQuery.address(AddressType.To, "user-from@domain.org"), row, recent, log)); - assertFalse(MessageSearches.isMatch(SearchQuery.address(AddressType.From, "user-from@domain.org"), row, recent, log)); + assertTrue(new MessageSearches().isMatch(SearchQuery.address(AddressType.To, "user-from@domain.org"), row, recent, log)); + assertFalse(new MessageSearches().isMatch(SearchQuery.address(AddressType.From, "user-from@domain.org"), row, recent, log)); } }