This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit acf750d6b7e45a23d340fe4b2ff1b54649d261b9
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Jan 21 11:31:20 2020 +0700
JAMES-2997 Renable and relocate search tests
---
.../store/{ => search}/SearchUtilsMultipartMixedTest.java | 13 ++++++-------
.../mailbox/store/{ => search}/SearchUtilsRFC822Test.java | 12 +++++-------
.../james/mailbox/store/{ => search}/SearchUtilsTest.java | 14 ++++++--------
3 files changed, 17 insertions(+), 22 deletions(-)
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsMultipartMixedTest.java
similarity index 97%
rename from
mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
rename to
mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsMultipartMixedTest.java
index 126ff8a..c39e743 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsMultipartMixedTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store;
+package org.apache.james.mailbox.store.search;
import static org.assertj.core.api.Assertions.assertThat;
@@ -27,18 +27,17 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
+import org.apache.james.mailbox.AttachmentContentLoader;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.store.MessageBuilder;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.search.MessageSearches;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class SearchUtilsMultipartMixedTest {
-/*
static final String SAMPLE_INNER_MAIL_BODY_ONE = "far a modern quill doth
come too";
static final String SAMPLE_PART_ONE = "The better angel is a man right
fair,\r\n";
@@ -132,7 +131,9 @@ class SearchUtilsMultipartMixedTest {
SearchQuery query = null;
TextExtractor textExtractor = null;
MailboxSession session = null;
- messageSearches = new MessageSearches(messages, query, textExtractor,
(attachment, ignore) -> attachment.getStream(), session);
+
+ AttachmentContentLoader attachmentContentLoader = null;
+ messageSearches = new MessageSearches(messages, query, textExtractor,
attachmentContentLoader, session);
}
@@ -229,6 +230,4 @@ class SearchUtilsMultipartMixedTest {
assertThat(messageSearches.isMatch(SearchQuery
.mailContains(SAMPLE_PART_TWO_FIELD), row, recent)).isTrue();
}
-
- */
}
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsRFC822Test.java
similarity index 95%
rename from
mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
rename to
mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsRFC822Test.java
index c02ff3b..5c33cff 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsRFC822Test.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store;
+package org.apache.james.mailbox.store.search;
import static org.assertj.core.api.Assertions.assertThat;
@@ -27,18 +27,17 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
+import org.apache.james.mailbox.AttachmentContentLoader;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.SearchQuery;
+import org.apache.james.mailbox.store.MessageBuilder;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.search.MessageSearches;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class SearchUtilsRFC822Test {
-/*
static final String FROM_ADDRESS = "Harry <ha...@example.org";
static final String SUBJECT_PART = "Mixed";
@@ -72,7 +71,8 @@ class SearchUtilsRFC822Test {
SearchQuery query = null;
TextExtractor textExtractor = null;
MailboxSession session = null;
- messageSearches = new MessageSearches(messages, query, textExtractor,
(attachment, ignore) -> attachment.getStream(), session);
+ AttachmentContentLoader attachmentContentLoader = null;
+ messageSearches = new MessageSearches(messages, query, textExtractor,
attachmentContentLoader, session);
}
@@ -127,6 +127,4 @@ class SearchUtilsRFC822Test {
assertThat(messageSearches.isMatch(SearchQuery.mailContains(SUBJECT_PART),
row, recent)).isTrue();
}
-
- */
}
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/search/SearchUtilsTest.java
similarity index 99%
rename from
mailbox/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java
rename to
mailbox/store/src/test/java/org/apache/james/mailbox/store/search/SearchUtilsTest.java
index 579201d..f622d1f 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/search/SearchUtilsTest.java
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.store;
+package org.apache.james.mailbox.store.search;
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,20 +31,19 @@ import java.util.TimeZone;
import javax.mail.Flags;
+import org.apache.james.mailbox.AttachmentContentLoader;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.extractor.TextExtractor;
-import org.apache.james.mailbox.model.Attachment;
import org.apache.james.mailbox.model.SearchQuery;
import org.apache.james.mailbox.model.SearchQuery.AddressType;
import org.apache.james.mailbox.model.SearchQuery.DateResolution;
+import org.apache.james.mailbox.store.MessageBuilder;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import org.apache.james.mailbox.store.search.MessageSearches;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class SearchUtilsTest {
-/*
static final String RHUBARD = "Rhubard";
static final String CUSTARD = "Custard";
@@ -87,7 +86,9 @@ class SearchUtilsTest {
SearchQuery query = null;
TextExtractor textExtractor = null;
MailboxSession session = null;
- messageSearches = new MessageSearches(messages, query, textExtractor,
(attachment, ignore) -> attachment.getStream(), session);
+
+ AttachmentContentLoader attachmentContentLoader = null;
+ messageSearches = new MessageSearches(messages, query, textExtractor,
attachmentContentLoader, session);
}
@Test
@@ -809,7 +810,4 @@ class SearchUtilsTest {
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();
}
-
-
- */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
