From b07a903afabcd90a7ad66edf63d513a7e9933216 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Mon, 19 Jun 2017 20:57:47 +0200 Subject: [PATCH] test: make sure analysis-common is also installed as a plugin Original commit: elastic/x-pack-elasticsearch@3c3141a734c6b14ce70b7db73287c16f2f0bfaa3 --- .../xpack/monitoring/test/MonitoringIntegTestCase.java | 4 +++- .../watcher/test/AbstractWatcherIntegrationTestCase.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java index ebe109c9b37..936bb97de2a 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/test/MonitoringIntegTestCase.java @@ -7,6 +7,7 @@ package org.elasticsearch.xpack.monitoring.test; import io.netty.util.internal.SystemPropertyUtil; import org.elasticsearch.ElasticsearchException; +import org.elasticsearch.analysis.common.CommonAnalysisPlugin; import org.elasticsearch.client.Client; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; @@ -159,7 +160,8 @@ public abstract class MonitoringIntegTestCase extends ESIntegTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(XPackPlugin.class, MockPainlessScriptEngine.TestPlugin.class, MockIngestPlugin.class); + return Arrays.asList(XPackPlugin.class, MockPainlessScriptEngine.TestPlugin.class, MockIngestPlugin.class, + CommonAnalysisPlugin.class); } @Override diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index 4d70888a5b8..c03351d8a38 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -13,6 +13,7 @@ import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResp import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.support.IndicesOptions; +import org.elasticsearch.analysis.common.CommonAnalysisPlugin; import org.elasticsearch.client.Client; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.cluster.ClusterState; @@ -205,6 +206,7 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase } else { types.add(XPackPlugin.class); } + types.add(CommonAnalysisPlugin.class); return types; }