You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/02/15 00:01:24 UTC

[06/13] james-project git commit: JAMES-1934 Adding test demonstrating HasAttachment criterion do not return inlined images

JAMES-1934 Adding test demonstrating HasAttachment criterion do not return inlined images


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7d7665ab
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7d7665ab
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7d7665ab

Branch: refs/heads/master
Commit: 7d7665ab0b14b226f3c2a308345765ce25fa74b8
Parents: 810c764
Author: Benoit Tellier <bt...@linagora.com>
Authored: Wed Feb 8 17:36:02 2017 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Feb 15 06:59:45 2017 +0700

----------------------------------------------------------------------
 .../store/search/AbstractMessageSearchIndexTest.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/7d7665ab/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
index f64f88d..4e1d4fc 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/AbstractMessageSearchIndexTest.java
@@ -68,6 +68,7 @@ public abstract class AbstractMessageSearchIndexTest {
     private ComposedMessageId m8;
     private ComposedMessageId m9;
     private ComposedMessageId mailWithAttachment;
+    private ComposedMessageId mailWithInlinedAttachment;
     private ComposedMessageId mOther;
 
     @Before
@@ -155,8 +156,6 @@ public abstract class AbstractMessageSearchIndexTest {
             session,
             true,
             new Flags(Flags.Flag.SEEN));
-        // sentDate: Tue, 2 Jun 2015 12:00:55 +0200
-        // Internal date : 2014/09/02 00:00:00.000
         m9 = inboxMessageManager.appendMessage(
             ClassLoader.getSystemResourceAsStream("eml/frnog.eml"),
             new Date(1409608800000L),
@@ -171,6 +170,13 @@ public abstract class AbstractMessageSearchIndexTest {
             true,
             new Flags("Hello you"));
 
+        mailWithInlinedAttachment = myFolderMessageManager.appendMessage(
+            ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"),
+            new Date(1409608900000L),
+            session,
+            true,
+            new Flags("Hello you"));
+
         await();
     }
 
@@ -245,7 +251,7 @@ public abstract class AbstractMessageSearchIndexTest {
         SearchQuery searchQuery = new SearchQuery();
         searchQuery.andCriteria(SearchQuery.hasNoAttachment());
         assertThat(messageSearchIndex.search(session, mailbox2, searchQuery))
-            .containsOnly(mOther.getUid());
+            .containsOnly(mOther.getUid(), mailWithInlinedAttachment.getUid());
     }
 
     @Test
@@ -935,6 +941,6 @@ public abstract class AbstractMessageSearchIndexTest {
         List<MessageId> actual = messageSearchIndex.search(session, MultimailboxesSearchQuery.from(searchQuery).build(), LIMIT);
 
         assertThat(actual).containsOnly(m1.getMessageId(), m2.getMessageId(), m3.getMessageId(), m4.getMessageId(), m5.getMessageId(),
-            m6.getMessageId(), m7.getMessageId(), m8.getMessageId(), m9.getMessageId(), mOther.getMessageId(), mailWithAttachment.getMessageId());
+            m6.getMessageId(), m7.getMessageId(), m8.getMessageId(), m9.getMessageId(), mOther.getMessageId(), mailWithAttachment.getMessageId(), mailWithInlinedAttachment.getMessageId());
     }
 }


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