From 6071db89ea1e75d1aee387a0260a54a0ca4ad3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Tue, 11 Aug 2015 12:19:39 +0200
Subject: [PATCH] Fix BaseQueryTestCase after merge with master

---
 .../org/elasticsearch/index/query/BaseQueryTestCase.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java b/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java
index a41bf5afc07..6d7881267c2 100644
--- a/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java
+++ b/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java
@@ -52,6 +52,7 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreModule;
 import org.elasticsearch.index.query.support.QueryParsers;
 import org.elasticsearch.index.settings.IndexSettingsModule;
 import org.elasticsearch.index.similarity.SimilarityModule;
+import org.elasticsearch.indices.analysis.IndicesAnalysisService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
 import org.elasticsearch.indices.query.IndicesQueriesModule;
@@ -67,8 +68,6 @@ import org.joda.time.DateTimeZone;
 import org.junit.*;
 
 import java.io.IOException;
-import java.util.Arrays;
-
 import static org.hamcrest.Matchers.*;
 
 public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> extends ESTestCase {
@@ -116,7 +115,7 @@ public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> ext
                 new ScriptModule(settings),
                 new IndexSettingsModule(index, settings),
                 new IndexCacheModule(settings),
-                new AnalysisModule(settings),
+                new AnalysisModule(settings, new IndicesAnalysisService(settings)),
                 new SimilarityModule(settings),
                 new IndexNameModule(index),
                 new FunctionScoreModule(),
@@ -432,7 +431,7 @@ public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> ext
         }
         return new Tuple(fieldName, value);
     }
-    
+
     protected static Fuzziness randomFuzziness(String fieldName) {
         Fuzziness fuzziness = Fuzziness.AUTO;
         switch (fieldName) {