From 9756202d0f92ed60347119de69d1a7d6ab5c15da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Tue, 4 Aug 2015 10:57:12 +0200 Subject: [PATCH] Adapted BaseQueryTestCase to renanming of parant class to ESTestCase --- .../index/query/BaseQueryTestCase.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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 1e39eeeab78..5571c39a3b1 100644 --- a/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java @@ -55,19 +55,28 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestSearchContext; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; import java.io.IOException; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; @Ignore -public abstract class BaseQueryTestCase> extends ElasticsearchTestCase { +public abstract class BaseQueryTestCase> extends ESTestCase { protected static final String OBJECT_FIELD_NAME = "mapped_object"; protected static final String DATE_FIELD_NAME = "mapped_date"; @@ -382,6 +391,6 @@ public abstract class BaseQueryTestCase> ext } protected String getRandomType() { - return (currentTypes.length == 0) ? MetaData.ALL : randomFrom(currentTypes); + return (currentTypes.length == 0) ? MetaData.ALL : randomFrom(currentTypes); } }