honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/AbstractIntegrationTest/ElasticsearchIntegrationTest

This commit is contained in:
Simon Willnauer 2013-11-08 23:56:44 +01:00
parent 985916038e
commit fb7a234040
138 changed files with 360 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
View File

@ -40,7 +40,7 @@ import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Set;
@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class IndexAliasesTests extends AbstractIntegrationTest {
public class IndexAliasesTests extends ElasticsearchIntegrationTest {
@Test
public void testAliases() throws Exception {

4
src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.HashMap;
@ -37,7 +37,7 @@ import java.util.HashMap;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.Matchers.notNullValue;
public class SimpleBlocksTests extends AbstractIntegrationTest {
public class SimpleBlocksTests extends ElasticsearchIntegrationTest {
@Test
public void verifyIndexAndClusterReadOnly() throws Exception {

4
src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class BroadcastActionsTests extends AbstractIntegrationTest {
public class BroadcastActionsTests extends ElasticsearchIntegrationTest {
@Test
public void testBroadcastOperations() throws IOException {

4
src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java
View File

@ -22,12 +22,12 @@ package org.elasticsearch.cluster;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
public class ClusterHealthTests extends AbstractIntegrationTest {
public class ClusterHealthTests extends ElasticsearchIntegrationTest {
@Test

8
src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
View File

@ -33,9 +33,9 @@ import org.elasticsearch.common.inject.Singleton;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.plugins.AbstractPlugin;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.threadpool.ThreadPool;
import org.junit.Test;
@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class ClusterServiceTests extends AbstractIntegrationTest {
public class ClusterServiceTests extends ElasticsearchIntegrationTest {
@Test
public void testTimeoutUpdateTask() throws Exception {

8
src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
View File

@ -27,9 +27,9 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.Discovery;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.util.concurrent.TimeUnit;
@ -39,7 +39,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
import static org.hamcrest.Matchers.equalTo;
@ClusterScope(scope = Scope.TEST, numNodes=0)
public class MinimumMasterNodesTests extends AbstractIntegrationTest {
public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest {
@Test
public void simpleMinimumMasterNodes() throws Exception {

8
src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
View File

@ -27,9 +27,9 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.discovery.Discovery;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.util.HashMap;
@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.greaterThan;
/**
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class NoMasterNodeTests extends AbstractIntegrationTest {
public class NoMasterNodeTests extends ElasticsearchIntegrationTest {
@Test
public void testNoMasterActions() throws Exception {

8
src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
View File

@ -23,9 +23,9 @@ import org.elasticsearch.action.UnavailableShardsException;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.Priority;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.client.Requests.createIndexRequest;
@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class SimpleDataNodesTests extends AbstractIntegrationTest {
public class SimpleDataNodesTests extends ElasticsearchIntegrationTest {
@Test
public void testDataNodes() throws Exception {

8
src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
View File

@ -23,9 +23,9 @@ import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.discovery.MasterNotDiscoveredException;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class SpecificMasterNodesTests extends AbstractIntegrationTest {
public class SpecificMasterNodesTests extends ElasticsearchIntegrationTest {
protected final ImmutableSettings.Builder settingsBuilder() {
return ImmutableSettings.builder().put("discovery.type", "zen");

8
src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
View File

@ -22,9 +22,9 @@ package org.elasticsearch.cluster;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class UpdateSettingsValidationTests extends AbstractIntegrationTest {
public class UpdateSettingsValidationTests extends ElasticsearchIntegrationTest {
@Test
public void testUpdateSettingsValidation() throws Exception {

8
src/test/java/org/elasticsearch/cluster/ack/AckTests.java
View File

@ -39,18 +39,18 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.warmer.IndexWarmersMetaData;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Map;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import static org.elasticsearch.test.AbstractIntegrationTest.Scope.SUITE;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE;
import static org.hamcrest.Matchers.*;
@ClusterScope(scope = SUITE)
public class AckTests extends AbstractIntegrationTest {
public class AckTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

8
src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
View File

@ -31,9 +31,9 @@ import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class AwarenessAllocationTests extends AbstractIntegrationTest {
public class AwarenessAllocationTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(AwarenessAllocationTests.class);

8
src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
View File

@ -33,9 +33,9 @@ import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.io.File;
@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class ClusterRerouteTests extends AbstractIntegrationTest {
public class ClusterRerouteTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class);

8
src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
View File

@ -27,16 +27,16 @@ import org.elasticsearch.cluster.routing.allocation.decider.ThrottlingAllocation
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.Matchers.equalTo;
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class FilteringAllocationTests extends AbstractIntegrationTest {
public class FilteringAllocationTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(FilteringAllocationTests.class);

8
src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
View File

@ -25,15 +25,15 @@ import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocatorModule;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.Matchers.instanceOf;
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class ShardsAllocatorModuleTests extends AbstractIntegrationTest {
public class ShardsAllocatorModuleTests extends ElasticsearchIntegrationTest {
public void testLoadDefaultShardsAllocator() {

4
src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.cluster.allocation;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.routing.RoutingNode;
import org.elasticsearch.common.Priority;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Map;
@ -30,7 +30,7 @@ import java.util.Map.Entry;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.Matchers.equalTo;
public class SimpleAllocationTests extends AbstractIntegrationTest {
public class SimpleAllocationTests extends ElasticsearchIntegrationTest {
/**
* Test for

8
src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
View File

@ -23,9 +23,9 @@ import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsResponse
import org.elasticsearch.cluster.metadata.AliasAction;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
@ClusterScope(scope=Scope.SUITE, numNodes=2)
public class ClusterSearchShardsTests extends AbstractIntegrationTest {
public class ClusterSearchShardsTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

4
src/test/java/org/elasticsearch/codecs/CodecTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public class CodecTests extends AbstractIntegrationTest {
public class CodecTests extends ElasticsearchIntegrationTest {
@Test
public void testFieldsWithCustomPostingsFormat() throws Exception {

4
src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class WriteConsistencyLevelTests extends AbstractIntegrationTest {
public class WriteConsistencyLevelTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.*;
import org.elasticsearch.index.query.CommonTermsQueryBuilder.Operator;
import org.elasticsearch.index.query.MatchQueryBuilder.Type;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.ISODateTimeFormat;
@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleQueryTests extends AbstractIntegrationTest {
public class SimpleQueryTests extends ElasticsearchIntegrationTest {
@Test
public void passQueryAsStringTest() throws Exception {

4
src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
View File

@ -4,7 +4,7 @@ import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.concurrent.ExecutionException;
@ -15,7 +15,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
public class SimpleCountTests extends AbstractIntegrationTest {
public class SimpleCountTests extends ElasticsearchIntegrationTest {
@Test
public void testCountRandomPreference() throws InterruptedException, ExecutionException {

4
src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.action.support.IgnoreIndices;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Assert;
import org.junit.Test;
@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
public class DeleteByQueryTests extends AbstractIntegrationTest {
public class DeleteByQueryTests extends ElasticsearchIntegrationTest {
@Test
public void testDeleteAllNoIndices() {

8
src/test/java/org/elasticsearch/discovery/DiscoveryTests.java
View File

@ -22,15 +22,15 @@ package org.elasticsearch.discovery;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
@ClusterScope(scope=Scope.SUITE, numNodes=2)
public class DiscoveryTests extends AbstractIntegrationTest {
public class DiscoveryTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

4
src/test/java/org/elasticsearch/document/BulkTests.java
View File

@ -12,7 +12,7 @@ import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.concurrent.CyclicBarrier;
@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.*;
/**
*/
public class BulkTests extends AbstractIntegrationTest {
public class BulkTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/document/DocumentActionsTests.java
View File

@ -36,7 +36,7 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading;
import org.elasticsearch.action.support.replication.ReplicationType;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.nullValue;
/**
*
*/
public class DocumentActionsTests extends AbstractIntegrationTest {
public class DocumentActionsTests extends ElasticsearchIntegrationTest {
protected void createIndex() {
wipeIndex(getConcreteIndexName());

4
src/test/java/org/elasticsearch/explain/ExplainActionTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.explain.ExplainResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.joda.time.format.ISODateTimeFormat;
@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public class ExplainActionTests extends AbstractIntegrationTest {
public class ExplainActionTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.flt;
import org.elasticsearch.action.search.SearchPhaseExecutionException;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class FuzzyLikeThisActionTests extends AbstractIntegrationTest {
public class FuzzyLikeThisActionTests extends ElasticsearchIntegrationTest {
@Test
// See issue https://github.com/elasticsearch/elasticsearch/issues/3252

8
src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java
View File

@ -38,9 +38,9 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.IndexAlreadyExistsException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.client.Requests.*;
@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class IndexGatewayTests extends AbstractIntegrationTest {
public class IndexGatewayTests extends ElasticsearchIntegrationTest {
private String storeType;
private final SetOnce<Settings> settings = new SetOnce<Settings>();

6
src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java
View File

@ -35,8 +35,8 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.gateway.Gateway;
import org.elasticsearch.test.*;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster.RestartCallback;
import org.junit.Test;
@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.nullValue;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class LocalGatewayIndexStateTests extends AbstractIntegrationTest {
public class LocalGatewayIndexStateTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(LocalGatewayIndexStateTests.class);

8
src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java
View File

@ -26,9 +26,9 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster.RestartCallback;
import org.junit.Test;
@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo;
*
*/
@ClusterScope(numNodes=0, scope=Scope.TEST)
public class QuorumLocalGatewayTests extends AbstractIntegrationTest {
public class QuorumLocalGatewayTests extends ElasticsearchIntegrationTest {
@Test
@Slow

8
src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java
View File

@ -35,9 +35,9 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster.RestartCallback;
import org.junit.Test;
@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(numNodes = 0, scope = Scope.TEST)
public class SimpleRecoveryLocalGatewayTests extends AbstractIntegrationTest {
public class SimpleRecoveryLocalGatewayTests extends ElasticsearchIntegrationTest {
private ImmutableSettings.Builder settingsBuilder() {

8
src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java
View File

@ -26,9 +26,9 @@ import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.gateway.GatewayService;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.hasItem;
*
*/
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class RecoverAfterNodesTests extends AbstractIntegrationTest {
public class RecoverAfterNodesTests extends ElasticsearchIntegrationTest {
private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(1);

4
src/test/java/org/elasticsearch/get/GetActionTests.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.engine.VersionConflictEngineException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Map;
@ -41,7 +41,7 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.*;
public class GetActionTests extends AbstractIntegrationTest {
public class GetActionTests extends ElasticsearchIntegrationTest {
@Test
public void simpleGetTests() {

4
src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
import org.junit.Test;
@ -31,7 +31,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutionException;
public class IndexRequestBuilderTests extends AbstractIntegrationTest {
public class IndexRequestBuilderTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerIntegrationTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.indices.analysis.PreBuiltAnalyzers;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.lang.reflect.Field;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class PreBuiltAnalyzerIntegrationTests extends AbstractIntegrationTest {
public class PreBuiltAnalyzerIntegrationTests extends ElasticsearchIntegrationTest {
@Test
public void testThatPreBuiltAnalyzersAreNotClosedOnIndexClose() throws Exception {

4
src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.index.engine.Segment;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -39,7 +39,7 @@ import java.util.Collection;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
public class RobinEngineIntegrationTest extends AbstractIntegrationTest {
public class RobinEngineIntegrationTest extends ElasticsearchIntegrationTest {
@Test
public void testSetIndexCompoundOnFlush() {

4
src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -37,7 +37,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.search.facet.FacetBuilders.termsFacet;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
public class FieldDataFilterIntegrationTests extends AbstractIntegrationTest {
public class FieldDataFilterIntegrationTests extends ElasticsearchIntegrationTest {
@Test
public void testRegexpFilter() throws IOException {

4
src/test/java/org/elasticsearch/indexing/IndexActionTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.indexing;
import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.index.VersionType;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.ArrayList;
@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
/**
*
*/
public class IndexActionTests extends AbstractIntegrationTest {
public class IndexActionTests extends ElasticsearchIntegrationTest {
@Test
public void testCreatedFlag() throws Exception {

8
src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java
View File

@ -30,9 +30,9 @@ import org.elasticsearch.cluster.routing.RoutingNode;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.discovery.Discovery;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster;
import org.junit.Test;
@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class IndexLifecycleActionTests extends AbstractIntegrationTest {
public class IndexLifecycleActionTests extends ElasticsearchIntegrationTest {
@Slow
@Test

4
src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java
View File

@ -24,12 +24,12 @@ import org.elasticsearch.action.search.MultiSearchResponse;
import org.elasticsearch.action.support.IgnoreIndices;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
public class IgnoreIndicesTests extends AbstractIntegrationTest {
public class IgnoreIndicesTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder;
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class AnalyzeActionTests extends AbstractIntegrationTest {
public class AnalyzeActionTests extends ElasticsearchIntegrationTest {
@Test
public void simpleAnalyzerTests() throws Exception {

8
src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java
View File

@ -25,9 +25,9 @@ import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.indices.analysis.HunspellService;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.notNullValue;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class HunspellServiceTests extends AbstractIntegrationTest {
public class HunspellServiceTests extends ElasticsearchIntegrationTest {
@Test
public void testLocaleDirectoryWithNodeLevelConfig() throws Exception {

8
src/test/java/org/elasticsearch/indices/cache/CacheTests.java vendored
View File

@ -27,9 +27,9 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*;
/**
*/
@ClusterScope(scope=Scope.SUITE, numNodes=1)
public class CacheTests extends AbstractIntegrationTest {
public class CacheTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

4
src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java
View File

@ -24,13 +24,13 @@ import org.elasticsearch.action.admin.indices.exists.types.TypesExistsResponse;
import org.elasticsearch.action.support.IgnoreIndices;
import org.elasticsearch.client.Client;
import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.equalTo;
public class TypesExistsTests extends AbstractIntegrationTest {
public class TypesExistsTests extends ElasticsearchIntegrationTest {
@Test
public void testSimple() throws Exception {

8
src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java
View File

@ -27,9 +27,9 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.service.IndexService;
import org.elasticsearch.index.shard.service.IndexShard;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.lang.ref.WeakReference;
@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.nullValue;
/**
*/
@ClusterScope(scope=Scope.TEST, numNodes=1)
public class IndicesLeaksTests extends AbstractIntegrationTest {
public class IndicesLeaksTests extends ElasticsearchIntegrationTest {
@SuppressWarnings({"ConstantConditions", "unchecked"})

4
src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.HashMap;
@ -36,7 +36,7 @@ import java.util.concurrent.CountDownLatch;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.hamcrest.Matchers.emptyIterable;
public class ConcurrentDynamicTemplateTests extends AbstractIntegrationTest {
public class ConcurrentDynamicTemplateTests extends ElasticsearchIntegrationTest {
private final String mappingType = "test-mapping";

4
src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.indices.mapping;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleDeleteMappingTests extends AbstractIntegrationTest {
public class SimpleDeleteMappingTests extends ElasticsearchIntegrationTest {
@Test
public void simpleDeleteMapping() throws Exception {

4
src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java
View File

@ -23,7 +23,7 @@ import com.google.common.base.Predicate;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleGetFieldMappingsTests extends AbstractIntegrationTest {
public class SimpleGetFieldMappingsTests extends ElasticsearchIntegrationTest {
@Test
public void getMappingsWhereThereAreNone() {

4
src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleGetMappingsTests extends AbstractIntegrationTest {
public class SimpleGetMappingsTests extends ElasticsearchIntegrationTest {
@Test
public void getMappingsWhereThereAreNone() {

4
src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java
View File

@ -13,7 +13,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.MergeMappingException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -27,7 +27,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
import static org.hamcrest.Matchers.*;
public class UpdateMappingTests extends AbstractIntegrationTest {
public class UpdateMappingTests extends ElasticsearchIntegrationTest {
@Test
public void dynamicUpdates() throws Exception {

4
src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class UpdateNumberOfReplicasTests extends AbstractIntegrationTest {
public class UpdateNumberOfReplicasTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
View File

@ -25,14 +25,14 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.engine.VersionConflictEngineException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
public class UpdateSettingsTests extends AbstractIntegrationTest {
public class UpdateSettingsTests extends ElasticsearchIntegrationTest {
@Test
public void testOpenCloseUpdateSettings() throws Exception {

8
src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java
View File

@ -25,16 +25,16 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexResponse;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
@ClusterScope(scope=Scope.SUITE, numNodes=2)
public class CloseIndexDisableCloseAllTests extends AbstractIntegrationTest {
public class CloseIndexDisableCloseAllTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

4
src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java
View File

@ -30,14 +30,14 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.junit.Test;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
public class OpenCloseIndexTests extends AbstractIntegrationTest {
public class OpenCloseIndexTests extends ElasticsearchIntegrationTest {
@Test
public void testSimpleCloseOpen() {

4
src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.SettingsException;
import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.nullValue;
/**
*
*/
public class SimpleIndexStateTests extends AbstractIntegrationTest {
public class SimpleIndexStateTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(SimpleIndexStateTests.class);

8
src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java
View File

@ -30,9 +30,9 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.BytesStreamInput;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.io.IOException;
@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope = Scope.SUITE, numNodes = 2)
public class SimpleIndexStatsTests extends AbstractIntegrationTest {
public class SimpleIndexStatsTests extends ElasticsearchIntegrationTest {
@Test
public void simpleStats() throws Exception {

8
src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java
View File

@ -24,9 +24,9 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster;
import org.junit.Test;
@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class IndicesStoreTests extends AbstractIntegrationTest {
public class IndicesStoreTests extends ElasticsearchIntegrationTest {
private static final Settings SETTINGS = settingsBuilder().put("gateway.type", "local").build();
@Test

8
src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java
View File

@ -23,9 +23,9 @@ import org.apache.lucene.store.Directory;
import org.elasticsearch.env.Environment;
import org.elasticsearch.index.shard.service.InternalIndexShard;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.io.File;
@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes = 1)
public class SimpleDistributorTests extends AbstractIntegrationTest {
public class SimpleDistributorTests extends ElasticsearchIntegrationTest {
public final static String[] STORE_TYPES = {"fs", "simplefs", "niofs", "mmapfs"};

4
src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.indices.IndexTemplateAlreadyExistsException;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Arrays;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleIndexTemplateTests extends AbstractIntegrationTest {
public class SimpleIndexTemplateTests extends ElasticsearchIntegrationTest {
@Test

8
src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java
View File

@ -30,9 +30,9 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.warmer.IndexWarmersMetaData;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.elasticsearch.test.TestCluster.RestartCallback;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
@ClusterScope(numNodes=0, scope=Scope.TEST)
public class LocalGatewayIndicesWarmerTests extends AbstractIntegrationTest {
public class LocalGatewayIndicesWarmerTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(LocalGatewayIndicesWarmerTests.class);

4
src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.warmer.IndexWarmerMissingException;
import org.elasticsearch.search.warmer.IndexWarmersMetaData;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
/**
*/
public class SimpleIndicesWarmerTests extends AbstractIntegrationTest {
public class SimpleIndicesWarmerTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/mget/SimpleMgetTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder;
import org.elasticsearch.action.get.MultiGetResponse;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.search.fetch.source.FetchSourceContext;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -33,7 +33,7 @@ import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.*;
public class SimpleMgetTests extends AbstractIntegrationTest {
public class SimpleMgetTests extends ElasticsearchIntegrationTest {
@Test
public void testThatMgetShouldWorkWithOneIndexMissing() throws IOException {

4
src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.client.Requests.*;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue;
/**
*
*/
public class MoreLikeThisActionTests extends AbstractIntegrationTest {
public class MoreLikeThisActionTests extends ElasticsearchIntegrationTest {
@Test
public void testSimpleMoreLikeThis() throws Exception {

4
src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
View File

@ -39,7 +39,7 @@ import org.elasticsearch.search.facet.statistical.StatisticalFacet;
import org.elasticsearch.search.facet.termsstats.TermsStatsFacet;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
import org.junit.Assert;
import org.junit.Test;
@ -52,7 +52,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
import static org.hamcrest.Matchers.*;
public class SimpleNestedTests extends AbstractIntegrationTest {
public class SimpleNestedTests extends ElasticsearchIntegrationTest {
@Test
public void simpleNested() throws Exception {

8
src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java
View File

@ -33,9 +33,9 @@ import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.nodesinfo.plugin.dummy1.TestPlugin;
import org.elasticsearch.nodesinfo.plugin.dummy2.TestNoVersionPlugin;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.io.File;
@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.*;
*
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class SimpleNodesInfoTests extends AbstractIntegrationTest {
public class SimpleNodesInfoTests extends ElasticsearchIntegrationTest {
static final class Fields {
static final String SITE_PLUGIN = "dummy";

4
src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Random;
@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class ConcurrentPercolatorTests extends AbstractIntegrationTest {
public class ConcurrentPercolatorTests extends ElasticsearchIntegrationTest {
@Test
public void testSimpleConcurrentPercolator() throws Exception {

4
src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder;
import org.elasticsearch.action.percolate.MultiPercolateResponse;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*;
/**
*/
public class MultiPercolatorTests extends AbstractIntegrationTest {
public class MultiPercolatorTests extends ElasticsearchIntegrationTest {
@Test
public void testBasics() throws Exception {

4
src/test/java/org/elasticsearch/percolator/PercolatorFacetsTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.action.percolate.PercolateResponse;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder;
@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class PercolatorFacetsTests extends AbstractIntegrationTest {
public class PercolatorFacetsTests extends ElasticsearchIntegrationTest {
@Test
public void testFacets() throws Exception {

4
src/test/java/org/elasticsearch/percolator/PercolatorTests.java
View File

@ -46,7 +46,7 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.functionscore.factor.FactorBuilder;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.search.highlight.HighlightBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.*;
@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class PercolatorTests extends AbstractIntegrationTest {
public class PercolatorTests extends ElasticsearchIntegrationTest {
@Test
public void testSimple1() throws Exception {

8
src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
@ -48,13 +48,13 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.*;
import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray;
import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import static org.elasticsearch.test.AbstractIntegrationTest.Scope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
import static org.hamcrest.Matchers.*;
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class RecoveryPercolatorTests extends AbstractIntegrationTest {
public class RecoveryPercolatorTests extends ElasticsearchIntegrationTest {
@Test
@Slow

8
src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java
View File

@ -6,9 +6,9 @@ import org.elasticsearch.action.percolate.PercolateResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.*;
/**
*/
@ClusterScope(scope = Scope.TEST)
public class TTLPercolatorTests extends AbstractIntegrationTest {
public class TTLPercolatorTests extends ElasticsearchIntegrationTest {
private static final long PURGE_INTERVAL = 200;

8
src/test/java/org/elasticsearch/plugin/PluginManagerTests.java
View File

@ -26,15 +26,15 @@ import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.junit.annotations.Network;
import org.elasticsearch.node.internal.InternalSettingsPreparer;
import org.elasticsearch.plugins.PluginManager;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.helper.HttpClient;
import org.elasticsearch.rest.helper.HttpClientResponse;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -46,7 +46,7 @@ import java.net.URL;
import static org.hamcrest.CoreMatchers.*;
@ClusterScope(scope = Scope.TEST, numNodes = 0)
public class PluginManagerTests extends AbstractIntegrationTest {
public class PluginManagerTests extends ElasticsearchIntegrationTest {
private static final Settings SETTINGS = ImmutableSettings.settingsBuilder()
.put("discovery.zen.ping.multicast.enabled", false)
.put("force.http.enabled", true)

8
src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java
View File

@ -27,9 +27,9 @@ import org.elasticsearch.plugin.responseheader.TestResponseHeaderPlugin;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.helper.HttpClient;
import org.elasticsearch.rest.helper.HttpClientResponse;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.util.Map;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo;
* Test a rest action that sets special response headers
*/
@ClusterScope(scope = Scope.SUITE, numNodes = 1)
public class ResponseHeaderPluginTests extends AbstractIntegrationTest {
public class ResponseHeaderPluginTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

8
src/test/java/org/elasticsearch/plugin/SitePluginTests.java
View File

@ -24,9 +24,9 @@ import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.helper.HttpClient;
import org.elasticsearch.rest.helper.HttpClientResponse;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.io.File;
@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo;
* We want to test site plugins
*/
@ClusterScope(scope = Scope.SUITE, numNodes = 1)
public class SitePluginTests extends AbstractIntegrationTest {
public class SitePluginTests extends ElasticsearchIntegrationTest {
@Override

8
src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
View File

@ -24,10 +24,10 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.collect.MapBuilder;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC
*
*/
@ClusterScope(scope = Scope.TEST, numNodes = 0, transportClientRatio = 0.0)
public class FullRollingRestartTests extends AbstractIntegrationTest {
public class FullRollingRestartTests extends ElasticsearchIntegrationTest {
protected void assertTimeout(ClusterHealthRequestBuilder requestBuilder) {
ClusterHealthResponse clusterHealth = requestBuilder.get();

4
src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java
View File

@ -33,8 +33,8 @@ import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.shard.DocsStats;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.junit.Test;
import java.util.Arrays;
@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class RecoveryWhileUnderLoadTests extends AbstractIntegrationTest {
public class RecoveryWhileUnderLoadTests extends ElasticsearchIntegrationTest {
private final ESLogger logger = Loggers.getLogger(RecoveryWhileUnderLoadTests.class);

8
src/test/java/org/elasticsearch/recovery/RelocationTests.java
View File

@ -35,9 +35,9 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.equalTo;
*/
@ClusterScope(scope=Scope.TEST, numNodes=0)
public class RelocationTests extends AbstractIntegrationTest {
public class RelocationTests extends ElasticsearchIntegrationTest {
private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(5, TimeUnit.MINUTES);

4
src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.client.Requests.*;
@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class SimpleRecoveryTests extends AbstractIntegrationTest {
public class SimpleRecoveryTests extends ElasticsearchIntegrationTest {
@Override
public Settings getSettings() {

4
src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.routing;
import org.elasticsearch.ElasticSearchIllegalArgumentException;
import org.elasticsearch.common.Priority;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.Map;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue;
/**
*
*/
public class AliasResolveRoutingTests extends AbstractIntegrationTest {
public class AliasResolveRoutingTests extends ElasticsearchIntegrationTest {
@Test
public void testResolveIndexRouting() throws Exception {

4
src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction;
@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.instanceOf;
/**
*
*/
public class AliasRoutingTests extends AbstractIntegrationTest {
public class AliasRoutingTests extends ElasticsearchIntegrationTest {
@Test
public void testAliasCrudRouting() throws Exception {

4
src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.mapper.MapperParsingException;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.instanceOf;
/**
*
*/
public class SimpleRoutingTests extends AbstractIntegrationTest {
public class SimpleRoutingTests extends ElasticsearchIntegrationTest {
@Test

4
src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
* This test basically verifies that search with a single shard active (cause we indexed to it) and other
* shards possibly not active at all (cause they haven't allocated) will still work.
*/
public class SearchWhileCreatingIndexTests extends AbstractIntegrationTest {
public class SearchWhileCreatingIndexTests extends ElasticsearchIntegrationTest {
@Test
@Slow

4
src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -39,7 +39,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
import static org.hamcrest.Matchers.equalTo;
public class SearchWhileRelocatingTests extends AbstractIntegrationTest {
public class SearchWhileRelocatingTests extends ElasticsearchIntegrationTest {
@LuceneTestCase.AwaitsFix(bugUrl = "problem with search searching on 1 shard (no replica), " +
"and between getting the cluster state to do the search, and executing it, " +

4
src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.store.MockDirectoryHelper;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -41,7 +41,7 @@ import java.util.concurrent.ExecutionException;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
public class SearchWithRandomExceptionsTests extends AbstractIntegrationTest {
public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTest {
@Test
public void testRandomExceptions() throws IOException, InterruptedException, ExecutionException {

4
src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.instanceOf;
/**
*
*/
public class TransportSearchFailuresTests extends AbstractIntegrationTest {
public class TransportSearchFailuresTests extends ElasticsearchIntegrationTest {
@Test
public void testFailedSearchWithWrongQuery() throws Exception {

4
src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java
View File

@ -38,7 +38,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.facet.FacetBuilders;
import org.elasticsearch.search.facet.query.QueryFacet;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class TransportTwoNodesSearchTests extends AbstractIntegrationTest {
public class TransportTwoNodesSearchTests extends ElasticsearchIntegrationTest {
private Set<String> prepareData() throws Exception {
Set<String> fullExpectedIds = Sets.newHashSet();

4
src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
View File

@ -39,7 +39,7 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleChildQuerySearchTests extends AbstractIntegrationTest {
public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
@Test
public void multiLevelChild() throws Exception {

4
src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
View File

@ -27,7 +27,7 @@ import org.elasticsearch.common.compress.lzf.LZFCompressor;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class SearchSourceCompressTests extends AbstractIntegrationTest {
public class SearchSourceCompressTests extends ElasticsearchIntegrationTest {
@Test
public void testSourceCompressionLZF() throws IOException {

4
src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.common.Priority;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class CustomScoreSearchTests extends AbstractIntegrationTest {
public class CustomScoreSearchTests extends ElasticsearchIntegrationTest {
@Test
public void testScoreExplainBug_2283() throws Exception {

4
src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java
View File

@ -10,7 +10,7 @@ import org.elasticsearch.common.text.Text;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.facet.terms.TermsFacet;
import org.elasticsearch.search.facet.terms.TermsFacetBuilder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.*;
@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*/
public class ExtendedFacetsTests extends AbstractIntegrationTest {
public class ExtendedFacetsTests extends ElasticsearchIntegrationTest {
@Override
public Settings getSettings() {

4
src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java
View File

@ -43,7 +43,7 @@ import org.elasticsearch.search.facet.terms.TermsFacet.Entry;
import org.elasticsearch.search.facet.terms.doubles.InternalDoubleTermsFacet;
import org.elasticsearch.search.facet.terms.longs.InternalLongTermsFacet;
import org.elasticsearch.search.facet.termsstats.TermsStatsFacet;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SimpleFacetsTests extends AbstractIntegrationTest {
public class SimpleFacetsTests extends ElasticsearchIntegrationTest {
private int numRuns = -1;
@Override

8
src/test/java/org/elasticsearch/search/facet/terms/ShardSizeTermsFacetTests.java
View File

@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.List;
@ -32,8 +32,8 @@ import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.search.facet.FacetBuilders.termsFacet;
import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import static org.elasticsearch.test.AbstractIntegrationTest.Scope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.is;
*
*/
@ClusterScope(scope = Scope.SUITE)
public class ShardSizeTermsFacetTests extends AbstractIntegrationTest {
public class ShardSizeTermsFacetTests extends ElasticsearchIntegrationTest {
/**
* to properly test the effect/functionality of shard_size, we need to force having 2 shards and also

4
src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.io.IOException;
@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is;
/**
*
*/
public class UnmappedFieldsTermsFacetsTests extends AbstractIntegrationTest {
public class UnmappedFieldsTermsFacetsTests extends ElasticsearchIntegrationTest {
@Override
public Settings getSettings() {

8
src/test/java/org/elasticsearch/search/facet/termsstats/ShardSizeTermsStatsFacetTests.java
View File

@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.search.facet.Facets;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import java.util.List;
@ -32,8 +32,8 @@ import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.search.facet.FacetBuilders.termsStatsFacet;
import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import static org.elasticsearch.test.AbstractIntegrationTest.Scope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.is;
*
*/
@ClusterScope(scope = Scope.SUITE)
public class ShardSizeTermsStatsFacetTests extends AbstractIntegrationTest {
public class ShardSizeTermsStatsFacetTests extends ElasticsearchIntegrationTest {
/**
* to properly test the effect/functionality of shard_size, we need to force having 2 shards and also

4
src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.common.joda.Joda;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
import org.junit.Test;
@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class SearchFieldsTests extends AbstractIntegrationTest {
public class SearchFieldsTests extends ElasticsearchIntegrationTest {
@Override
public Settings getSettings() {

4
src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder;
import org.elasticsearch.index.query.functionscore.gauss.GaussDecayFunctionBuilder;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.joda.time.DateTime;
import org.junit.Test;
@ -49,7 +49,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
import static org.hamcrest.Matchers.*;
public class DecayFunctionScoreTests extends AbstractIntegrationTest {
public class DecayFunctionScoreTests extends ElasticsearchIntegrationTest {
@Test
public void testDistanceScoreGeoLinGaussExp() throws Exception {

8
src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.index.query.functionscore.DecayFunctionParser;
import org.elasticsearch.index.query.functionscore.FunctionScoreModule;
import org.elasticsearch.plugins.AbstractPlugin;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
import org.junit.Test;
@ -43,15 +43,15 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
import static org.elasticsearch.index.query.QueryBuilders.termQuery;
import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope;
import static org.elasticsearch.test.AbstractIntegrationTest.Scope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
import static org.hamcrest.Matchers.equalTo;
/**
*
*/
@ClusterScope(scope = Scope.SUITE, numNodes = 1)
public class FunctionScorePluginTests extends AbstractIntegrationTest {
public class FunctionScorePluginTests extends ElasticsearchIntegrationTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {

4
src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.search.functionscore;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.CoreMatchers;
import org.junit.Ignore;
import org.junit.Test;
@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
public class RandomScoreFunctionTests extends AbstractIntegrationTest {
public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest {
@Test
public void consistentHitsWithSameSeed() throws Exception {

4
src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.Priority;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
public class GeoBoundingBoxTests extends AbstractIntegrationTest {
public class GeoBoundingBoxTests extends ElasticsearchIntegrationTest {
@Test
public void simpleBoundingBoxTest() throws Exception {

4
src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.common.Priority;
import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet;
import org.elasticsearch.test.AbstractIntegrationTest;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*;
/**
*
*/
public class GeoDistanceFacetTests extends AbstractIntegrationTest {
public class GeoDistanceFacetTests extends ElasticsearchIntegrationTest {
@Test
public void simpleGeoFacetTests() throws Exception {

Some files were not shown because too many files have changed in this diff Show More