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 2019/05/10 11:30:23 UTC
[james-project] 10/17: JAMES-2717 Replace embedded ES in
ElasticSearchIntegrationTest
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 530bdc9966a0764c1963f1aa4ce72b265cee9b41
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Wed May 8 16:53:01 2019 +0700
JAMES-2717 Replace embedded ES in ElasticSearchIntegrationTest
---
.../ElasticSearchIntegrationTest.java | 33 ++++++++++------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
index 3286408..3a96813 100644
--- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
+++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/ElasticSearchIntegrationTest.java
@@ -26,10 +26,9 @@ import java.time.ZoneId;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
+import org.apache.james.backends.es.DockerElasticSearchRule;
import org.apache.james.backends.es.ElasticSearchConfiguration;
import org.apache.james.backends.es.ElasticSearchIndexer;
-import org.apache.james.backends.es.EmbeddedElasticSearch;
-import org.apache.james.backends.es.utils.TestingClientProvider;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MailboxSessionUtil;
import org.apache.james.mailbox.MessageManager;
@@ -56,8 +55,6 @@ import org.elasticsearch.client.Client;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
import com.google.common.base.Strings;
@@ -66,14 +63,11 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
private static final int BATCH_SIZE = 1;
private static final int SEARCH_SIZE = 1;
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
-
- @Rule
- public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
-
@ClassRule
public static TikaContainerSingletonRule tika = TikaContainerSingletonRule.rule;
+
+ @Rule
+ public DockerElasticSearchRule elasticSearch = new DockerElasticSearchRule();
private TikaTextExtractor textExtractor;
@Override
@@ -89,14 +83,17 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
@Override
protected void await() {
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
}
@Override
protected void initializeMailboxManager() {
Client client = MailboxIndexCreationUtil.prepareDefaultClient(
- new TestingClientProvider(embeddedElasticSearch.getNode()).get(),
- ElasticSearchConfiguration.DEFAULT_CONFIGURATION);
+ elasticSearch.clientProvider().get(),
+ ElasticSearchConfiguration.builder()
+ .addHost(elasticSearch.getTcpHost())
+ .build());
+
InMemoryMessageId.Factory messageIdFactory = new InMemoryMessageId.Factory();
ThreadFactory threadFactory = NamedThreadFactory.withClassName(getClass());
@@ -141,7 +138,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.setBody(Strings.repeat("0à2345678é", 3200), StandardCharsets.UTF_8)),
session);
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
assertThat(messageManager.search(new SearchQuery(SearchQuery.address(SearchQuery.AddressType.To, recipient)), session))
.containsExactly(composedMessageId.getUid());
@@ -160,7 +157,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.setBody(Strings.repeat("0123456789", 3300), StandardCharsets.UTF_8)),
session);
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
assertThat(messageManager.search(new SearchQuery(SearchQuery.address(SearchQuery.AddressType.To, recipient)), session))
.containsExactly(composedMessageId.getUid());
@@ -179,7 +176,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.setBody(Strings.repeat("0123456789 ", 5000), StandardCharsets.UTF_8)),
session);
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
assertThat(messageManager.search(new SearchQuery(SearchQuery.bodyContains("0123456789")), session))
.containsExactly(composedMessageId.getUid());
@@ -198,7 +195,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.setBody(Strings.repeat("0123456789 ", 5000) + " matchMe", StandardCharsets.UTF_8)),
session);
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
assertThat(messageManager.search(new SearchQuery(SearchQuery.bodyContains("matchMe")), session))
.containsExactly(composedMessageId.getUid());
@@ -218,7 +215,7 @@ public class ElasticSearchIntegrationTest extends AbstractMessageSearchIndexTest
.setBody(reasonableLongTerm, StandardCharsets.UTF_8)),
session);
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
assertThat(messageManager.search(new SearchQuery(SearchQuery.bodyContains(reasonableLongTerm)), session))
.containsExactly(composedMessageId.getUid());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org