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:28 UTC
[james-project] 15/17: JAMES-2717 Replace embedded ES in
NodeMappingFactoryTest
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 35f7a69654664c44c2b03d49ba723937c005216e
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Wed May 8 17:09:22 2019 +0700
JAMES-2717 Replace embedded ES in NodeMappingFactoryTest
---
.../apache/james/backends/es/NodeMappingFactoryTest.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
index 60170a5..228b4ed 100644
--- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
+++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/NodeMappingFactoryTest.java
@@ -21,13 +21,10 @@ package org.apache.james.backends.es;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import org.apache.james.backends.es.utils.TestingClientProvider;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.rules.TemporaryFolder;
public class NodeMappingFactoryTest {
public static final String MESSAGE = "message";
@@ -35,17 +32,13 @@ public class NodeMappingFactoryTest {
public static final ReadAliasName ALIAS_NAME = new ReadAliasName("alias");
public static final TypeName TYPE_NAME = new TypeName("type");
- private TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EmbeddedElasticSearch embeddedElasticSearch = new EmbeddedElasticSearch(temporaryFolder);
-
@Rule
- public RuleChain ruleChain = RuleChain.outerRule(temporaryFolder).around(embeddedElasticSearch);
-
+ public DockerElasticSearchRule elasticSearch = new DockerElasticSearchRule();
private ClientProvider clientProvider;
@Before
public void setUp() throws Exception {
- clientProvider = new TestingClientProvider(embeddedElasticSearch.getNode());
+ clientProvider = elasticSearch.clientProvider();
new IndexCreationFactory(ElasticSearchConfiguration.DEFAULT_CONFIGURATION)
.useIndex(INDEX_NAME)
.addAlias(ALIAS_NAME)
@@ -71,7 +64,7 @@ public class NodeMappingFactoryTest {
TYPE_NAME,
getMappingsSources());
- embeddedElasticSearch.awaitForElasticSearch();
+ elasticSearch.awaitForElasticSearch();
NodeMappingFactory.applyMapping(clientProvider.get(),
INDEX_NAME,
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org