http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java index 8458679..5d275d1 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java @@ -19,8 +19,7 @@ package org.apache.james.mailbox.store; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.Calendar; @@ -92,57 +91,57 @@ public class SearchUtilsTest { public void testMatchSizeLessThan() throws Exception { builder.size = SIZE; MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE - 1), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE + 1), row, - recent)); - assertTrue(messageSearches.isMatch( - SearchQuery.sizeLessThan(Integer.MAX_VALUE), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE - 1), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.sizeLessThan(SIZE + 1), row, + recent)).isTrue(); + assertThat(messageSearches.isMatch( + SearchQuery.sizeLessThan(Integer.MAX_VALUE), row, recent)).isTrue(); } @Test public void testMatchSizeMoreThan() throws Exception { builder.size = SIZE; MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE + 1), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .sizeGreaterThan(Integer.MAX_VALUE), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE - 1), row, + recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.sizeGreaterThan(SIZE + 1), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .sizeGreaterThan(Integer.MAX_VALUE), row, recent)).isFalse(); } @Test public void testMatchSizeEquals() throws Exception { builder.size = SIZE; MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE - 1), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE + 1), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.sizeEquals(Integer.MAX_VALUE), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE - 1), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.sizeEquals(SIZE + 1), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.sizeEquals(Integer.MAX_VALUE), + row, recent)).isFalse(); } @Test public void testMatchInternalDateEquals() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2000), DateResolution.Day), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(8, 9, 2001), DateResolution.Day), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2001), DateResolution.Day), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(10, 9, 2001), DateResolution.Day), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2002), DateResolution.Day), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2000), DateResolution.Day), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(8, 9, 2001), DateResolution.Day), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2001), DateResolution.Day), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(10, 9, 2001), DateResolution.Day), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateOn(getDate(9, 9, 2002), DateResolution.Day), + row, recent)).isFalse(); } @@ -150,407 +149,407 @@ public class SearchUtilsTest { public void testMatchInternalDateBefore() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch( - SearchQuery.internalDateBefore(getDate(9, 9, 2000), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.internalDateBefore(getDate(8, 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.internalDateBefore(getDate(9, 9, 2001), DateResolution.Day), row, recent)); - assertTrue(messageSearches.isMatch( - SearchQuery.internalDateBefore(getDate(10, 9, 2001), DateResolution.Day), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.internalDateBefore(getDate(9, 9, 2002), DateResolution.Day), - row, recent)); + assertThat(messageSearches.isMatch( + SearchQuery.internalDateBefore(getDate(9, 9, 2000), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.internalDateBefore(getDate(8, 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.internalDateBefore(getDate(9, 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.internalDateBefore(getDate(10, 9, 2001), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateBefore(getDate(9, 9, 2002), DateResolution.Day), + row, recent)).isTrue(); } @Test public void testMatchInternalDateAfter() throws Exception { builder.internalDate = SUN_SEP_9TH_2001; MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2000), DateResolution.Day), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(8, 9, 2001), DateResolution.Day), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2001), DateResolution.Day), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.internalDateAfter(getDate(10, 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2002), DateResolution.Day), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2000), DateResolution.Day), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(8, 9, 2001), DateResolution.Day), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2001), DateResolution.Day), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.internalDateAfter(getDate(10, 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.internalDateAfter(getDate(9, 9, 2002), DateResolution.Day), + row, recent)).isFalse(); } @Test public void testMatchHeaderDateAfter() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2000), DateResolution.Day), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, - 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, - 2001), DateResolution.Day), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2000), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + 9, 2001), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + 2001), DateResolution.Day), row, recent)).isFalse(); } @Test public void testShouldMatchCapsHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toUpperCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2000), DateResolution.Day), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, - 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, - 2001), DateResolution.Day), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2000), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + 9, 2001), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + 2001), DateResolution.Day), row, recent)).isFalse(); } @Test public void testShouldMatchLowersHeaderDateAfter() throws Exception { builder.header(DATE_FIELD.toLowerCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2000), DateResolution.Day), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, - 9, 2001),DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, - 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2000), DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(8, + 9, 2001),DateResolution.Day), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter("BOGUS", getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testMatchHeaderDateOn() throws Exception { builder.header(DATE_FIELD, RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, - 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, - 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2002), DateResolution.Day), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, - 2001), DateResolution.Day), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2002), DateResolution.Day), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + 2001), DateResolution.Day), row, recent)).isFalse(); } @Test public void testShouldMatchCapsHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toUpperCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, - 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, - 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, - 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2002), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testShouldMatchLowersHeaderDateOn() throws Exception { builder.header(DATE_FIELD.toLowerCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, - 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, - 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, - 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, - 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(8, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(10, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(9, 9, + 2002), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn("BOGUS", getDate(9, 9, + 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testMatchHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(8, 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, - 9, 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(8, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testShouldMatchCapsHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(8, 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, - 9, 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(8, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testShouldMatchLowersHeaderDateBefore() throws Exception { builder.header(DATE_FIELD.toLowerCase(Locale.US), RFC822_SUN_SEP_9TH_2001); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2000), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(8, 9, 2001), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(9, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, - getDate(10, 9, 2001), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, - 9, 2002), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, - 9, 2001), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2000), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(8, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(9, 9, 2001), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, + getDate(10, 9, 2001), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(9, + 9, 2002), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore("BOGUS", getDate(9, + 9, 2001), DateResolution.Day),row, recent)).isFalse(); } @Test public void testMatchHeaderContainsCaps() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase(Locale.US)); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - CUSTARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - RHUBARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - CUSTARD), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + CUSTARD), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + TEXT), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + TEXT), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + RHUBARD), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + CUSTARD), row, recent)).isFalse(); } @Test public void testMatchHeaderContainsLowers() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase(Locale.US)); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - CUSTARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - RHUBARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - CUSTARD), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + CUSTARD), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + TEXT), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + TEXT), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + RHUBARD), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + CUSTARD), row, recent)).isFalse(); } @Test public void testMatchHeaderContains() throws Exception { builder.header(SUBJECT_FIELD, TEXT.toUpperCase(Locale.US)); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - CUSTARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - RHUBARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - CUSTARD), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + CUSTARD), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + TEXT), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + TEXT), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + RHUBARD), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + CUSTARD), row, recent)).isFalse(); } @Test public void testShouldMatchLowerHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(Locale.US), TEXT); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - CUSTARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - RHUBARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - CUSTARD), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + CUSTARD), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + TEXT), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + TEXT), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + RHUBARD), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + CUSTARD), row, recent)).isFalse(); } @Test public void testShouldMatchCapsHeaderContains() throws Exception { builder.header(SUBJECT_FIELD.toUpperCase(Locale.US), TEXT); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - CUSTARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - TEXT), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - RHUBARD), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, - CUSTARD), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + CUSTARD), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(DATE_FIELD, + TEXT), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + TEXT), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + RHUBARD), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerContains(SUBJECT_FIELD, + CUSTARD), row, recent)).isFalse(); } @Test public void testMatchHeaderExists() throws Exception { builder.header(SUBJECT_FIELD, TEXT); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + row, recent)).isTrue(); } @Test public void testShouldMatchLowersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(Locale.US), TEXT); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + row, recent)).isTrue(); } @Test public void testShouldMatchUppersHeaderExists() throws Exception { builder.header(SUBJECT_FIELD.toLowerCase(Locale.US), TEXT); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(DATE_FIELD), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerExists(SUBJECT_FIELD), + row, recent)).isTrue(); } @Test public void testShouldMatchUidRange() throws Exception { builder.setKey(1, MessageUid.of(1729)); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1))), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1728), MessageUid.of(1728))), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1729))), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.of(1730))), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1728))), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1729))), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1800))), row, - recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE)), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), - MessageUid.MAX_VALUE, MessageUid.of(1), MessageUid.of(1728))), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE, - MessageUid.of(1), MessageUid.of(1729))), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .uid(range(MessageUid.of(1), MessageUid.of(1728), MessageUid.of(1800), MessageUid.of(1810))), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1), MessageUid.of(1729), MessageUid.of(1729))), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1), MessageUid.of(1800), MessageUid.of(1800))), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1))), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1728), MessageUid.of(1728))), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1729))), row, + recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.of(1730))), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1728))), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1729))), row, + recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1729), MessageUid.of(1800))), row, + recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery + .uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE)), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), + MessageUid.MAX_VALUE, MessageUid.of(1), MessageUid.of(1728))), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1730), MessageUid.MAX_VALUE, + MessageUid.of(1), MessageUid.of(1729))), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery + .uid(range(MessageUid.of(1), MessageUid.of(1728), MessageUid.of(1800), MessageUid.of(1810))), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1), MessageUid.of(1729), MessageUid.of(1729))), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.uid(range(MessageUid.of(1), MessageUid.of(1), MessageUid.of(1800), MessageUid.of(1800))), + row, recent)).isFalse(); } @Test public void testShouldMatchSeenFlagSet() throws Exception { builder.setFlags(true, false, false, false, false, false); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isFalse(); } @Test public void testShouldMatchAnsweredFlagSet() throws Exception { builder.setFlags(false, false, true, false, false, false); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.ANSWERED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.ANSWERED), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isFalse(); } @Test public void testShouldMatchFlaggedFlagSet() throws Exception { builder.setFlags(false, true, false, false, false, false); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isFalse(); } @Test public void testShouldMatchDraftFlagSet() throws Exception { builder.setFlags(false, false, false, true, false, false); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isFalse(); } @@ -558,18 +557,18 @@ public class SearchUtilsTest { public void testShouldMatchDeletedFlagSet() throws Exception { builder.setFlags(false, false, false, false, true, false); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isFalse(); } @Test @@ -577,18 +576,18 @@ public class SearchUtilsTest { builder.setFlags(false, false, false, false, false, false); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), - row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), - row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.FLAGGED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.DELETED), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsSet(Flags.Flag.RECENT), + row, recent)).isTrue(); } @Test @@ -596,18 +595,18 @@ public class SearchUtilsTest { builder.setFlags(false, true, true, true, true, true); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.DELETED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)).isFalse(); } @Test @@ -615,18 +614,18 @@ public class SearchUtilsTest { builder.setFlags(true, true, false, true, true, true); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.DELETED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)).isFalse(); } @Test @@ -634,18 +633,18 @@ public class SearchUtilsTest { builder.setFlags(true, false, true, true, true, true); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertTrue(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.DELETED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)).isFalse(); } @Test @@ -653,18 +652,18 @@ public class SearchUtilsTest { builder.setFlags(true, true, true, false, true, true); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.DELETED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)).isFalse(); } @Test @@ -672,18 +671,18 @@ public class SearchUtilsTest { builder.setFlags(true, true, true, true, false, true); MailboxMessage row = builder.build(); recent.add(row.getUid()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertTrue(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertFalse(messageSearches.isMatch( - SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.DELETED), row, recent)).isTrue(); + assertThat(messageSearches.isMatch( + SearchQuery.flagIsUnSet(Flags.Flag.RECENT), row, recent)).isFalse(); } @Test @@ -691,61 +690,61 @@ public class SearchUtilsTest { builder.setFlags(true, true, true, true, true, true); MailboxMessage row = builder.build(); recent.add(row.getUid().next()); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), - row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery - .flagIsUnSet(Flags.Flag.DELETED), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.RECENT), - row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.SEEN), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.FLAGGED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.ANSWERED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.DRAFT), + row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery + .flagIsUnSet(Flags.Flag.DELETED), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.flagIsUnSet(Flags.Flag.RECENT), + row, recent)).isTrue(); } @Test public void testShouldMatchAll() throws Exception { MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.all(), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.all(), row, recent)).isTrue(); } @Test public void testShouldMatchNot() throws Exception { MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.not(SearchQuery.all()), row, - recent)); - assertTrue(messageSearches.isMatch(SearchQuery.not(SearchQuery - .headerExists(DATE_FIELD)), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.not(SearchQuery.all()), row, + recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.not(SearchQuery + .headerExists(DATE_FIELD)), row, recent)).isTrue(); } @Test public void testShouldMatchOr() throws Exception { MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.or(SearchQuery.all(), - SearchQuery.headerExists(DATE_FIELD)), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.or(SearchQuery - .headerExists(DATE_FIELD), SearchQuery.all()), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery + assertThat(messageSearches.isMatch(SearchQuery.or(SearchQuery.all(), + SearchQuery.headerExists(DATE_FIELD)), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.or(SearchQuery + .headerExists(DATE_FIELD), SearchQuery.all()), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery .or(SearchQuery.headerExists(DATE_FIELD), SearchQuery - .headerExists(DATE_FIELD)), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.or(SearchQuery.all(), - SearchQuery.all()), row, recent)); + .headerExists(DATE_FIELD)), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.or(SearchQuery.all(), + SearchQuery.all()), row, recent)).isTrue(); } @Test public void testShouldMatchAnd() throws Exception { MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.and(SearchQuery.all(), - SearchQuery.headerExists(DATE_FIELD)), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.and(SearchQuery - .headerExists(DATE_FIELD), SearchQuery.all()), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery + assertThat(messageSearches.isMatch(SearchQuery.and(SearchQuery.all(), + SearchQuery.headerExists(DATE_FIELD)), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.and(SearchQuery + .headerExists(DATE_FIELD), SearchQuery.all()), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery .and(SearchQuery.headerExists(DATE_FIELD), SearchQuery - .headerExists(DATE_FIELD)), row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.and(SearchQuery.all(), - SearchQuery.all()), row, recent)); + .headerExists(DATE_FIELD)), row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.and(SearchQuery.all(), + SearchQuery.all()), row, recent)).isTrue(); } private SearchQuery.UidRange[] range(MessageUid low, MessageUid high) { @@ -764,13 +763,13 @@ public class SearchUtilsTest { public void testMatchHeaderDateOnWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(26, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(26, 3, + 2007), DateResolution.Day),row, recent)).isTrue(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(25, 3, - 2007), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(27, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(25, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateOn(DATE_FIELD, getDate(27, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); } @@ -778,34 +777,34 @@ public class SearchUtilsTest { public void testShouldMatchHeaderDateBeforeWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(26, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(26, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(27, 3, - 2007), DateResolution.Day),row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(25, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(27, 3, + 2007), DateResolution.Day),row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateBefore(DATE_FIELD, getDate(25, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); } @Test public void testShouldMatchHeaderDateAfterWithOffset() throws Exception { builder.header(DATE_FIELD, "Mon, 26 Mar 2007 00:00:00 +0300"); MailboxMessage row = builder.build(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(26, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(26, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); - assertFalse(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(27, 3, - 2007), DateResolution.Day),row, recent)); - assertTrue(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(25, 3, - 2007), DateResolution.Day),row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(27, 3, + 2007), DateResolution.Day),row, recent)).isFalse(); + assertThat(messageSearches.isMatch(SearchQuery.headerDateAfter(DATE_FIELD, getDate(25, 3, + 2007), DateResolution.Day),row, recent)).isTrue(); } @Test public void testShouldMatchAddressHeaderWithComments() throws Exception { builder.header("To", "<user-from (comment)@ (comment) domain.org>"); MailboxMessage row = builder.build(); - assertTrue(messageSearches.isMatch(SearchQuery.address(AddressType.To, "user-f...@domain.org"), row, recent)); - assertFalse(messageSearches.isMatch(SearchQuery.address(AddressType.From, "user-f...@domain.org"), row, recent)); + assertThat(messageSearches.isMatch(SearchQuery.address(AddressType.To, "user-f...@domain.org"), row, recent)).isTrue(); + assertThat(messageSearches.isMatch(SearchQuery.address(AddressType.From, "user-f...@domain.org"), row, recent)).isFalse(); } }
http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java index 7c5e800..2f8c3f6 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/DelegatingMailboxMessageTest.java @@ -19,8 +19,8 @@ package org.apache.james.mailbox.store.mail.model; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.store.MessageBuilder; @@ -33,7 +33,7 @@ public class DelegatingMailboxMessageTest { throws Exception { MailboxMessage one = buildMessage(100); MailboxMessage two = buildMessage(99); - assertTrue(one.compareTo(two) > 0); + assertThat(one.compareTo(two) > 0).isTrue(); } private MailboxMessage buildMessage(int uid) throws Exception { @@ -47,7 +47,7 @@ public class DelegatingMailboxMessageTest { throws Exception { MailboxMessage one = buildMessage(98); MailboxMessage two = buildMessage(99); - assertTrue(one.compareTo(two) < 0); + assertThat(one.compareTo(two) < 0).isTrue(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/mailet/standard/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java index 16c7325..22a72a8 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java @@ -19,6 +19,7 @@ package org.apache.james.transport.mailets; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -152,7 +153,7 @@ class OnlyTextTest { assertEquals("prova", mail.getMessage().getSubject()); assertEquals("Questa è una prova\ndi html\n", mail.getMessage() .getContent()); - assertTrue(mail.getMessage().isMimeType("text/plain")); + assertThat(mail.getMessage().isMimeType("text/plain")).isTrue(); // ----------------- @@ -177,7 +178,7 @@ class OnlyTextTest { assertEquals("prova", mail.getMessage().getSubject()); assertEquals("Questa è una prova\ndi html\n", mail.getMessage() .getContent()); - assertTrue(mail.getMessage().isMimeType("text/plain")); + assertThat(mail.getMessage().isMimeType("text/plain")).isTrue(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/api/IdRangeTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/api/IdRangeTest.java b/protocols/imap/src/test/java/org/apache/james/imap/api/IdRangeTest.java index a3a3642..92d2707 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/api/IdRangeTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/api/IdRangeTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.imap.api; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import java.util.ArrayList; import java.util.Iterator; @@ -47,7 +47,7 @@ public class IdRangeTest { checkIdRange(r,rIt.next()); checkIdRange(r2,rIt.next()); checkIdRange(r3,rIt.next()); - assertFalse(rIt.hasNext()); + assertThat(rIt.hasNext()).isFalse(); } @@ -67,7 +67,7 @@ public class IdRangeTest { Iterator<IdRange> rIt = merged.iterator(); checkIdRange(new IdRange(0, 4),rIt.next()); checkIdRange(r3,rIt.next()); - assertFalse(rIt.hasNext()); + assertThat(rIt.hasNext()).isFalse(); } @@ -86,7 +86,7 @@ public class IdRangeTest { assertEquals(1, merged.size()); Iterator<IdRange> rIt = merged.iterator(); checkIdRange(new IdRange(0, 10),rIt.next()); - assertFalse(rIt.hasNext()); + assertThat(rIt.hasNext()).isFalse(); } @Test @@ -104,7 +104,7 @@ public class IdRangeTest { assertEquals(1, merged.size()); Iterator<IdRange> rIt = merged.iterator(); checkIdRange(new IdRange(0, 15),rIt.next()); - assertFalse(rIt.hasNext()); + assertThat(rIt.hasNext()).isFalse(); } @Test @@ -122,7 +122,7 @@ public class IdRangeTest { assertEquals(1, merged.size()); Iterator<IdRange> rIt = merged.iterator(); checkIdRange(new IdRange(0, 2),rIt.next()); - assertFalse(rIt.hasNext()); + assertThat(rIt.hasNext()).isFalse(); } private void checkIdRange(IdRange r1, IdRange r2) { http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java index b4b135c..73049e7 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java @@ -19,9 +19,8 @@ package org.apache.james.imap.encode; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -60,13 +59,13 @@ public class FetchResponseEncoderNoExtensionsTest { @Test public void testShouldNotAcceptUnknownResponse() { - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); } @Test public void testShouldAcceptFetchResponse() { - assertTrue(encoder.isAcceptable(new FetchResponse(11, null, null, null, null, - null, null, null, null, null))); + assertThat(encoder.isAcceptable(new FetchResponse(11, null, null, null, null, + null, null, null, null, null))).isTrue(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java index b5fb7d6..de1ff1c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java @@ -19,9 +19,8 @@ package org.apache.james.imap.encode; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import javax.mail.Flags; @@ -53,13 +52,13 @@ public class FetchResponseEncoderTest { @Test public void testShouldNotAcceptUnknownResponse() { - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); } @Test public void testShouldAcceptFetchResponse() { - assertTrue(encoder.isAcceptable(new FetchResponse(11, null, null, null, null, - null, null, null, null, null))); + assertThat(encoder.isAcceptable(new FetchResponse(11, null, null, null, null, + null, null, null, null, null))).isTrue(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java index 50a8fea..f7615b7 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java @@ -20,7 +20,6 @@ package org.apache.james.imap.encode; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import org.apache.james.imap.api.ImapMessage; @@ -53,8 +52,8 @@ public class ListResponseEncoderTest { @Test public void encoderShouldNotAcceptLsubResponse() { assertThat(encoder.isAcceptable(new LSubResponse("name", true, '.'))).isFalse(); - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); - assertFalse(encoder.isAcceptable(null)); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); + assertThat(encoder.isAcceptable(null)).isFalse(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java index 0ad5f2b..18bdd05 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java @@ -19,9 +19,8 @@ package org.apache.james.imap.encode; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import org.apache.james.imap.api.ImapMessage; @@ -49,10 +48,10 @@ public class MailboxStatusResponseEncoderTest { @Test public void testIsAcceptable() { - assertTrue(encoder.isAcceptable(new MailboxStatusResponse(null, null, null, - null, null, null, "mailbox"))); - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); - assertFalse(encoder.isAcceptable(null)); + assertThat(encoder.isAcceptable(new MailboxStatusResponse(null, null, null, + null, null, null, "mailbox"))).isTrue(); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); + assertThat(encoder.isAcceptable(null)).isFalse(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java index 0fceca4..c70cb02 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java @@ -18,8 +18,7 @@ ****************************************************************/ package org.apache.james.imap.encode; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -167,9 +166,9 @@ public class NamespaceResponseEncoderTest { @Test public void testNamespaceResponseIsAcceptable() { - assertFalse(subject.isAcceptable(mock(ImapMessage.class))); - assertTrue(subject - .isAcceptable(new NamespaceResponse(null, null, null))); + assertThat(subject.isAcceptable(mock(ImapMessage.class))).isFalse(); + assertThat(subject + .isAcceptable(new NamespaceResponse(null, null, null))).isTrue(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java index 72b13f8..abdfd0c 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java @@ -19,9 +19,8 @@ package org.apache.james.imap.encode; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import org.apache.james.imap.api.ImapMessage; @@ -54,10 +53,10 @@ public class SearchResponseEncoderTest { @Test public void testIsAcceptable() { - assertTrue(encoder.isAcceptable(response)); - assertFalse(encoder.isAcceptable(new LSubResponse("name", true, '.'))); - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); - assertFalse(encoder.isAcceptable(null)); + assertThat(encoder.isAcceptable(response)).isTrue(); + assertThat(encoder.isAcceptable(new LSubResponse("name", true, '.'))).isFalse(); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); + assertThat(encoder.isAcceptable(null)).isFalse(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java b/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java index a3e212f..d7280e7 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/encode/XListResponseEncoderTest.java @@ -20,7 +20,6 @@ package org.apache.james.imap.encode; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import org.apache.james.imap.api.ImapMessage; @@ -60,8 +59,8 @@ public class XListResponseEncoderTest { @Test public void encoderShouldNotAcceptLsubResponse() { assertThat(encoder.isAcceptable(new LSubResponse("name", true, '.'))).isFalse(); - assertFalse(encoder.isAcceptable(mock(ImapMessage.class))); - assertFalse(encoder.isAcceptable(null)); + assertThat(encoder.isAcceptable(mock(ImapMessage.class))).isFalse(); + assertThat(encoder.isAcceptable(null)).isFalse(); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/63ab7ab8/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java ---------------------------------------------------------------------- diff --git a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java index dcd2818..e875212 100644 --- a/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java +++ b/protocols/imap/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.imap.main; -import static org.junit.Assert.assertFalse; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import java.io.ByteArrayInputStream; @@ -74,6 +74,6 @@ public class ImapRequestHandlerAdandonConnectionTest { // // Verify output // - assertFalse("Connection should be abandoned", result); + assertThat(result).describedAs("Connection should be abandoned").isFalse(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
