From 5f1efba28cb50547d7bd0cb2c1874d201c18e23d Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Sun, 13 Oct 2013 22:37:40 +0200 Subject: [PATCH] s/ElasticSearch/Elasticsearch in src/test --- .../miscellaneous/TruncateTokenFilterTests.java | 4 ++-- .../miscellaneous/UniqueTokenFilterTests.java | 4 ++-- .../elasticsearch/ElasticSearchExceptionTests.java | 4 ++-- src/test/java/org/elasticsearch/VersionTests.java | 4 ++-- .../action/bulk/BulkRequestTests.java | 4 ++-- .../percolate/MultiPercolatorRequestTests.java | 4 ++-- .../action/search/MultiSearchRequestTests.java | 4 ++-- .../org/elasticsearch/cluster/DiskUsageTests.java | 4 ++-- .../metadata/MappingMetaDataParserTests.java | 4 ++-- .../cluster/metadata/MetaDataTests.java | 4 ++-- .../metadata/ToAndFromJsonMetaDataTests.java | 4 ++-- .../cluster/node/DiscoveryNodeFiltersTests.java | 4 ++-- .../routing/allocation/AddIncrementallyTests.java | 4 ++-- .../allocation/AllocatePostApiFlagTests.java | 4 ++-- .../allocation/AllocationCommandsTests.java | 4 ++-- .../allocation/AwarenessAllocationTests.java | 4 ++-- .../allocation/BalanceConfigurationTests.java | 4 ++-- .../allocation/ClusterRebalanceRoutingTests.java | 4 ++-- .../ConcurrentRebalanceRoutingTests.java | 4 ++-- .../allocation/DeadNodesAllocationTests.java | 4 ++-- .../routing/allocation/DisableAllocationTests.java | 4 ++-- ...ElectReplicaAsPrimaryDuringRelocationTests.java | 4 ++-- .../routing/allocation/FailedNodeRoutingTests.java | 4 ++-- .../allocation/FailedShardsRoutingTests.java | 4 ++-- .../routing/allocation/FilterRoutingTests.java | 4 ++-- .../routing/allocation/IndexBalanceTests.java | 4 ++-- .../allocation/PreferPrimaryAllocationTests.java | 4 ++-- .../allocation/PrimaryElectionRoutingTests.java | 4 ++-- ...rimaryNotRelocatedWhileBeingRecoveredTests.java | 4 ++-- .../allocation/RandomAllocationDeciderTests.java | 4 ++-- .../allocation/RebalanceAfterActiveTests.java | 4 ++-- .../ReplicaAllocatedAfterPrimaryTests.java | 4 ++-- .../routing/allocation/RoutingAllocationTests.java | 4 ++-- .../routing/allocation/SameShardRoutingTests.java | 4 ++-- .../routing/allocation/ShardVersioningTests.java | 4 ++-- .../allocation/ShardsLimitAllocationTests.java | 4 ++-- .../SingleShardNoReplicasRoutingTests.java | 4 ++-- .../SingleShardOneReplicaRoutingTests.java | 4 ++-- .../TenShardsOneReplicaRoutingTests.java | 4 ++-- .../allocation/ThrottlingAllocationTests.java | 4 ++-- .../allocation/UpdateNumberOfReplicasTests.java | 4 ++-- .../decider/DiskThresholdDeciderTests.java | 4 ++-- .../serialization/ClusterSerializationTests.java | 4 ++-- .../cluster/settings/ClusterSettingsTests.java | 4 ++-- .../cluster/settings/SettingsValidatorTests.java | 4 ++-- .../cluster/structure/RoutingIteratorTests.java | 4 ++-- .../common/compress/CompressedStringTests.java | 4 ++-- .../common/geo/GeoJSONShapeParserTests.java | 8 ++++---- .../common/geo/ShapeBuilderTests.java | 8 ++++---- .../org/elasticsearch/common/io/StreamsTests.java | 4 ++-- .../common/io/streams/BytesStreamsTests.java | 4 ++-- .../common/io/streams/HandlesStreamsTests.java | 4 ++-- .../common/joda/DateMathParserTests.java | 4 ++-- .../common/lucene/all/SimpleAllTests.java | 4 ++-- .../lucene/search/MatchAllDocsFilterTests.java | 4 ++-- .../lucene/search/MoreLikeThisQueryTests.java | 4 ++-- .../lucene/search/MultiPhrasePrefixQueryTests.java | 4 ++-- .../common/lucene/search/TermsFilterTests.java | 4 ++-- .../lucene/search/XBooleanFilterLuceneTests.java | 4 ++-- .../common/lucene/search/XBooleanFilterTests.java | 4 ++-- .../lucene/store/InputStreamIndexInputTests.java | 4 ++-- .../common/lucene/uid/VersionsTests.java | 4 ++-- .../elasticsearch/common/path/PathTrieTests.java | 4 ++-- .../org/elasticsearch/common/regex/RegexTests.java | 4 ++-- .../common/settings/ImmutableSettingsTests.java | 4 ++-- .../settings/loader/JsonSettingsLoaderTests.java | 4 ++-- .../settings/loader/YamlSettingsLoaderTests.java | 4 ++-- .../common/unit/ByteSizeUnitTests.java | 4 ++-- .../common/unit/ByteSizeValueTests.java | 4 ++-- .../common/unit/DistanceUnitTests.java | 4 ++-- .../elasticsearch/common/unit/TimeValueTests.java | 4 ++-- .../common/util/SlicedDoubleListTests.java | 4 ++-- .../common/util/SlicedLongListTests.java | 4 ++-- .../common/util/SlicedObjectListTests.java | 4 ++-- .../common/util/concurrent/EsExecutorsTests.java | 4 ++-- .../util/concurrent/PrioritizedExecutorsTests.java | 4 ++-- .../xcontent/builder/BuilderRawFieldTests.java | 4 ++-- .../xcontent/builder/XContentBuilderTests.java | 4 ++-- .../common/xcontent/smile/JsonVsSmileTests.java | 4 ++-- .../xcontent/support/XContentHelperTests.java | 4 ++-- .../xcontent/support/XContentMapValuesTests.java | 4 ++-- .../count/query/SimpleQueryTests.java | 2 +- .../count/simple/SimpleCountTests.java | 4 ++-- .../deleteByQuery/DeleteByQueryTests.java | 2 +- .../deps/jackson/JacksonLocationTests.java | 4 ++-- .../elasticsearch/deps/joda/SimpleJodaTests.java | 4 ++-- .../deps/joda/TimeZoneRoundingTests.java | 4 ++-- .../deps/lucene/SimpleLuceneTests.java | 4 ++-- .../deps/lucene/VectorHighlighterTests.java | 4 ++-- .../zen/ping/multicast/MulticastZenPingTests.java | 4 ++-- .../zen/ping/unicast/UnicastZenPingTests.java | 4 ++-- .../java/org/elasticsearch/document/BulkTests.java | 4 ++-- .../document/DocumentActionsTests.java | 2 +- .../flt/FuzzyLikeThisActionTests.java | 2 +- .../gateway/local/QuorumLocalGatewayTests.java | 4 ++-- .../local/SimpleRecoveryLocalGatewayTests.java | 2 +- .../index/IndexRequestBuilderTests.java | 4 ++-- .../org/elasticsearch/index/VersionTypeTests.java | 4 ++-- .../index/aliases/IndexAliasesServiceTests.java | 4 ++-- .../index/analysis/AnalysisModuleTests.java | 4 ++-- .../index/analysis/CJKFilterFactoryTests.java | 4 ++-- .../index/analysis/CharFilterTests.java | 4 ++-- .../index/analysis/CompoundAnalysisTests.java | 4 ++-- .../analysis/HunspellTokenFilterFactoryTests.java | 4 ++-- .../index/analysis/KeepFilterFactoryTests.java | 4 ++-- .../LimitTokenCountFilterFactoryTests.java | 4 ++-- .../index/analysis/NGramTokenizerFactoryTests.java | 4 ++-- .../index/analysis/NumericAnalyzerTests.java | 4 ++-- .../analysis/PatternCaptureTokenFilterTests.java | 4 ++-- .../analysis/ShingleTokenFilterFactoryTests.java | 4 ++-- .../index/analysis/StopAnalyzerTests.java | 4 ++-- .../index/analysis/StopTokenFilterTests.java | 4 ++-- .../WordDelimiterTokenFilterFactoryTests.java | 4 ++-- .../CommonGramsTokenFilterFactoryTests.java | 4 ++-- .../index/cache/filter/FilterCacheTests.java | 4 ++-- .../index/cache/id/SimpleIdCacheTests.java | 4 ++-- .../org/elasticsearch/index/codec/CodecTests.java | 4 ++-- .../postingformat/DefaultPostingsFormatTests.java | 4 ++-- .../SnapshotDeletionPolicyTests.java | 4 ++-- .../index/engine/robin/RobinEngineTests.java | 4 ++-- .../index/fielddata/AbstractFieldDataTests.java | 4 ++-- .../fielddata/FieldDataFilterIntegrationTests.java | 2 +- .../fielddata/ordinals/MultiOrdinalsTests.java | 4 ++-- .../fielddata/ordinals/SingleOrdinalsTests.java | 4 ++-- .../index/gateway/CommitPointsTests.java | 4 ++-- .../org/elasticsearch/index/mapper/UidTests.java | 4 ++-- .../index/mapper/all/SimpleAllMapperTests.java | 4 ++-- .../index/mapper/analyzer/AnalyzerMapperTests.java | 4 ++-- .../index/mapper/boost/BoostMappingTests.java | 4 ++-- .../mapper/boost/CustomBoostMappingTests.java | 4 ++-- .../index/mapper/boost/FieldLevelBoostTests.java | 4 ++-- .../mapper/camelcase/CamelCaseFieldNameTests.java | 4 ++-- .../completion/CompletionFieldMapperTests.java | 4 ++-- .../index/mapper/compound/CompoundTypesTests.java | 4 ++-- .../index/mapper/date/SimpleDateMappingTests.java | 4 ++-- .../index/mapper/dynamic/DynamicMappingTests.java | 4 ++-- .../GenericStoreDynamicTemplateTests.java | 4 ++-- .../pathmatch/PathMatchDynamicTemplateTests.java | 4 ++-- .../simple/SimpleDynamicTemplatesTests.java | 4 ++-- .../index/mapper/geo/GeoShapeFieldMapperTests.java | 4 ++-- .../mapper/geo/GeohashMappingGeoPointTests.java | 4 ++-- .../geo/LatLonAndGeohashMappingGeoPointTests.java | 4 ++-- .../mapper/geo/LatLonMappingGeoPointTests.java | 4 ++-- .../index/mapper/id/IdMappingTests.java | 4 ++-- .../index/mapper/index/IndexTypeMapperTests.java | 4 ++-- .../index/mapper/ip/SimpleIpMappingTests.java | 4 ++-- .../index/mapper/merge/TestMergeMapperTests.java | 4 ++-- .../index/mapper/multifield/MultiFieldTests.java | 4 ++-- .../multifield/merge/JavaMultiFieldMergeTests.java | 4 ++-- .../index/mapper/nested/NestedMappingTests.java | 4 ++-- .../index/mapper/numeric/SimpleNumericTests.java | 4 ++-- .../mapper/object/NullValueObjectMappingTests.java | 4 ++-- .../mapper/object/SimpleObjectMappingTests.java | 4 ++-- .../overridetype/OverrideTypeMappingTests.java | 4 ++-- .../index/mapper/parent/ParentMappingTests.java | 4 ++-- .../index/mapper/path/PathMapperTests.java | 4 ++-- .../mapper/routing/RoutingTypeMapperTests.java | 4 ++-- .../index/mapper/simple/SimpleMapperTests.java | 4 ++-- .../index/mapper/size/SizeMappingTests.java | 4 ++-- .../mapper/source/CompressSourceMappingTests.java | 4 ++-- .../mapper/source/DefaultSourceMappingTests.java | 4 ++-- .../mapper/string/SimpleStringMappingTests.java | 4 ++-- .../mapper/timestamp/TimestampMappingTests.java | 4 ++-- .../index/mapper/ttl/TTLMappingTests.java | 4 ++-- .../typelevels/ParseDocumentTypeLevelsTests.java | 4 ++-- .../typelevels/ParseMappingTypeLevelTests.java | 4 ++-- .../index/query/GeoShapeQueryBuilderTests.java | 4 ++-- .../index/query/SimpleIndexQueryParserTests.java | 6 +++--- .../query/guice/IndexQueryParserModuleTests.java | 4 ++-- .../query/plugin/IndexQueryParserPlugin2Tests.java | 4 ++-- .../query/plugin/IndexQueryParserPluginTests.java | 4 ++-- .../index/search/geo/GeoDistanceTests.java | 4 ++-- .../index/search/geo/GeoHashUtilsTests.java | 4 ++-- .../index/search/geo/GeoUtilsTests.java | 4 ++-- .../index/similarity/SimilarityTests.java | 4 ++-- .../index/store/distributor/DistributorTests.java | 4 ++-- .../store/memory/SimpleByteBufferStoreTests.java | 4 ++-- .../mapping/ConcurrentDynamicTemplateTests.java | 2 +- .../indices/mapping/UpdateMappingTests.java | 4 ++-- .../settings/UpdateNumberOfReplicasTests.java | 2 +- .../indices/settings/UpdateSettingsTests.java | 2 +- .../indices/template/SimpleIndexTemplateTests.java | 4 ++-- .../junit/listeners/ReproduceInfoPrinter.java | 4 ++-- .../elasticsearch/mlt/MoreLikeThisActionTests.java | 2 +- .../elasticsearch/nested/SimpleNestedTests.java | 8 ++++---- .../org/elasticsearch/node/InternalNodeTests.java | 4 ++-- .../internal/InternalSettingsPerparerTests.java | 4 ++-- .../percolator/ConcurrentPercolatorTests.java | 2 +- .../percolator/MultiPercolatorTests.java | 2 +- .../elasticsearch/percolator/PercolatorTests.java | 2 +- .../percolator/RecoveryPercolatorTests.java | 2 +- .../percolator/TTLPercolatorTests.java | 2 +- .../recovery/RecoveryWhileUnderLoadTests.java | 4 ++-- .../elasticsearch/rest/util/RestUtilsTests.java | 4 ++-- .../elasticsearch/script/NativeScriptTests.java | 4 ++-- .../basic/SearchWhileCreatingIndexTests.java | 2 +- .../search/basic/SearchWhileRelocatingTests.java | 2 +- .../search/basic/TransportTwoNodesSearchTests.java | 2 +- .../search/child/SimpleChildQuerySearchTests.java | 4 ++-- .../search/customscore/CustomScoreSearchTests.java | 4 ++-- .../search/facet/SimpleFacetsTests.java | 2 +- .../search/fields/SearchFieldsTests.java | 2 +- .../functionscore/DecayFunctionScoreTests.java | 2 +- .../functionscore/FunctionScorePluginTests.java | 4 ++-- .../functionscore/RandomScoreFunctionTests.java | 2 +- .../search/geo/GeoDistanceFacetTests.java | 2 +- .../elasticsearch/search/geo/GeoDistanceTests.java | 2 +- .../elasticsearch/search/geo/GeoFilterTests.java | 2 +- .../search/geo/GeoShapeIntegrationTests.java | 2 +- .../highlight/CustomHighlighterSearchTests.java | 2 +- .../search/highlight/HighlighterSearchTests.java | 8 ++++---- .../SimpleIndicesBoostSearchTests.java | 4 ++-- .../search/matchedqueries/MatchedQueriesTests.java | 2 +- .../search/msearch/SimpleMultiSearchTests.java | 2 +- .../search/query/SimpleQueryTests.java | 2 +- .../search/rescore/QueryRescorerTests.java | 2 +- .../search/simple/SimpleSearchTests.java | 4 ++-- .../elasticsearch/search/sort/SimpleSortTests.java | 2 +- .../suggest/CompletionPostingsFormatTest.java | 4 ++-- .../suggest/CompletionSuggestSearchTests.java | 10 +++++----- .../search/suggest/CompletionTokenStreamTest.java | 4 ++-- .../search/suggest/SuggestSearchTests.java | 14 +++++++------- .../phrase/NoisyChannelSpellCheckerTests.java | 4 ++-- .../GetTermVectorCheckDocFreqTests.java | 4 ++-- .../termvectors/GetTermVectorTests.java | 14 +++++++------- .../termvectors/TermVectorUnitTests.java | 4 ++-- .../test/AbstractIntegrationTest.java | 10 +++++----- ...tCase.java => ElasticsearchLuceneTestCase.java} | 4 ++-- ...rchTestCase.java => ElasticsearchTestCase.java} | 4 ++-- ...dFilter.java => ElasticsearchThreadFilter.java} | 2 +- ....java => ElasticsearchTokenStreamTestCase.java} | 4 ++-- ...ssertions.java => ElasticsearchAssertions.java} | 14 +++++++------- ...rtions.java => ElasticsearchGeoAssertions.java} | 2 +- ...rchMatchers.java => ElasticsearchMatchers.java} | 2 +- .../test/transport/AssertingLocalTransport.java | 8 ++++---- .../fielddata/IndexFieldDataServiceTests.java | 4 ++-- .../threadpool/UpdateThreadPoolSettingsTests.java | 4 ++-- .../transport/AbstractSimpleTransportTests.java | 4 ++-- .../transport/netty/KeyedLockTests.java | 4 ++-- .../java/org/elasticsearch/update/UpdateTests.java | 2 +- .../validate/SimpleValidateQueryTests.java | 2 +- .../versioning/SimpleVersioningTests.java | 2 +- 242 files changed, 478 insertions(+), 478 deletions(-) rename src/test/java/org/elasticsearch/test/{ElasticSearchLuceneTestCase.java => ElasticsearchLuceneTestCase.java} (92%) rename src/test/java/org/elasticsearch/test/{ElasticSearchTestCase.java => ElasticsearchTestCase.java} (98%) rename src/test/java/org/elasticsearch/test/{ElasticSearchThreadFilter.java => ElasticsearchThreadFilter.java} (93%) rename src/test/java/org/elasticsearch/test/{ElasticSearchTokenStreamTestCase.java => ElasticsearchTokenStreamTestCase.java} (91%) rename src/test/java/org/elasticsearch/test/hamcrest/{ElasticSearchAssertions.java => ElasticsearchAssertions.java} (97%) rename src/test/java/org/elasticsearch/test/hamcrest/{ElasticSearchGeoAssertions.java => ElasticsearchGeoAssertions.java} (99%) rename src/test/java/org/elasticsearch/test/hamcrest/{ElasticSearchMatchers.java => ElasticsearchMatchers.java} (98%) diff --git a/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java index c38869b7e54..223d1e7bce8 100644 --- a/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java +++ b/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class TruncateTokenFilterTests extends ElasticSearchTestCase { +public class TruncateTokenFilterTests extends ElasticsearchTestCase { @Test public void simpleTest() throws IOException { diff --git a/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java b/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java index 25f5a326a1a..634b5849ae8 100644 --- a/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java +++ b/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class UniqueTokenFilterTests extends ElasticSearchTestCase { +public class UniqueTokenFilterTests extends ElasticsearchTestCase { @Test public void simpleTest() throws IOException { diff --git a/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java b/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java index dadd71d9b0a..a7d8d335a24 100644 --- a/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java +++ b/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java @@ -22,14 +22,14 @@ package org.elasticsearch; import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.transport.RemoteTransportException; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class ElasticSearchExceptionTests extends ElasticSearchTestCase { +public class ElasticSearchExceptionTests extends ElasticsearchTestCase { @Test public void testStatus() { diff --git a/src/test/java/org/elasticsearch/VersionTests.java b/src/test/java/org/elasticsearch/VersionTests.java index 01898c11e67..daf145c336b 100644 --- a/src/test/java/org/elasticsearch/VersionTests.java +++ b/src/test/java/org/elasticsearch/VersionTests.java @@ -19,7 +19,7 @@ package org.elasticsearch; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.Version.V_0_20_0; @@ -27,7 +27,7 @@ import static org.elasticsearch.Version.V_0_90_0; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class VersionTests extends ElasticSearchTestCase { +public class VersionTests extends ElasticsearchTestCase { @Test public void testVersions() throws Exception { diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java index f82445996ec..3571553a717 100644 --- a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java +++ b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; @@ -32,7 +32,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class BulkRequestTests extends ElasticSearchTestCase { +public class BulkRequestTests extends ElasticsearchTestCase { @Test public void testSimpleBulk1() throws Exception { diff --git a/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java b/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java index 1d9e400de49..2a0fdf7bbb2 100644 --- a/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java +++ b/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class MultiPercolatorRequestTests extends ElasticSearchTestCase { +public class MultiPercolatorRequestTests extends ElasticsearchTestCase { @Test public void testParseBulkRequests() throws Exception { diff --git a/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java index fa293382b1f..74af6a410c2 100644 --- a/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java +++ b/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.search; import org.elasticsearch.common.io.Streams; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class MultiSearchRequestTests extends ElasticSearchTestCase { +public class MultiSearchRequestTests extends ElasticsearchTestCase { @Test public void simpleAdd() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java index 518f790eafe..e5073343ff2 100644 --- a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java +++ b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.cluster; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class DiskUsageTests extends ElasticSearchTestCase { +public class DiskUsageTests extends ElasticsearchTestCase { @Test public void diskUsageCalcTest() { diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java index daabf75e946..c76e040f2a8 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.common.compress.CompressedString; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -30,7 +30,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class MappingMetaDataParserTests extends ElasticSearchTestCase { +public class MappingMetaDataParserTests extends ElasticsearchTestCase { @Test public void testParseIdAlone() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java index 59e92a510ff..8533ad99393 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java @@ -23,7 +23,7 @@ import com.google.common.collect.Sets; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static com.google.common.collect.Sets.newHashSet; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class MetaDataTests extends ElasticSearchTestCase { +public class MetaDataTests extends ElasticsearchTestCase { @Test public void convertWildcardsJustIndicesTests() { diff --git a/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java index 8b67ab05d2d..b5c89344ae1 100644 --- a/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ToAndFromJsonMetaDataTests extends ElasticSearchTestCase { +public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase { @Test public void testSimpleJsonFromAndTo() throws IOException { diff --git a/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java index eb2d88665db..c7ed416f24e 100644 --- a/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java +++ b/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.Version; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.DummyTransportAddress; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.node.DiscoveryNodeFilters.OpType.AND; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DiscoveryNodeFiltersTests extends ElasticSearchTestCase { +public class DiscoveryNodeFiltersTests extends ElasticsearchTestCase { @Test public void nameMatch() { diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java index 9f3e73057e7..c3d6f21e8b4 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java @@ -12,7 +12,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllo import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTest import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; -public class AddIncrementallyTests extends ElasticSearchTestCase { +public class AddIncrementallyTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(AddIncrementallyTests.class); @Test diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java index ddb441ef78a..644829342c3 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class AllocatePostApiFlagTests extends ElasticSearchTestCase { +public class AllocatePostApiFlagTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(AllocatePostApiFlagTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index c8e7dd9ec52..467c1a54ce2 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class AllocationCommandsTests extends ElasticSearchTestCase { +public class AllocationCommandsTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(AllocationCommandsTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java index f2d20348252..ea926cacda3 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class AwarenessAllocationTests extends ElasticSearchTestCase { +public class AwarenessAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(AwarenessAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index 4fa7d95ae8e..0fff4e08e07 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.gateway.none.NoneGatewayAllocator; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -53,7 +53,7 @@ import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTest import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; -public class BalanceConfigurationTests extends ElasticSearchTestCase { +public class BalanceConfigurationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(BalanceConfigurationTests.class); // TODO maybe we can randomize these numbers somehow diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index 7313a33e6a4..a4b42307fc7 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -40,7 +40,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class ClusterRebalanceRoutingTests extends ElasticSearchTestCase { +public class ClusterRebalanceRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ClusterRebalanceRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java index 930a2e9d577..4cddecb676b 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -40,7 +40,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class ConcurrentRebalanceRoutingTests extends ElasticSearchTestCase { +public class ConcurrentRebalanceRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ConcurrentRebalanceRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java index 873724a186a..faf7c29bfad 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DeadNodesAllocationTests extends ElasticSearchTestCase { +public class DeadNodesAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(DeadNodesAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java index ebdb35f4fec..42be141824a 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.DisableAllocationDec import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DisableAllocationTests extends ElasticSearchTestCase { +public class DisableAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(DisableAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java index 6bb27df3294..2ee9ac4ad52 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ElectReplicaAsPrimaryDuringRelocationTests extends ElasticSearchTestCase { +public class ElectReplicaAsPrimaryDuringRelocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ElectReplicaAsPrimaryDuringRelocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index d611a5df372..4d806854b8c 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -42,7 +42,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class FailedNodeRoutingTests extends ElasticSearchTestCase { +public class FailedNodeRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(FailedNodeRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java index 387d19530c8..055a60b5d25 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class FailedShardsRoutingTests extends ElasticSearchTestCase { +public class FailedShardsRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(FailedShardsRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java index fc6d927ffd7..99a0ad98874 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class FilterRoutingTests extends ElasticSearchTestCase { +public class FilterRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(FilterRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java index ab246cc5398..275ca63c8a6 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class IndexBalanceTests extends ElasticSearchTestCase { +public class IndexBalanceTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(IndexBalanceTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java index ef8352fa280..30033e465eb 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class PreferPrimaryAllocationTests extends ElasticSearchTestCase { +public class PreferPrimaryAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(PreferPrimaryAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java index 777f9d439a1..7c4dc00e1e1 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PrimaryElectionRoutingTests extends ElasticSearchTestCase { +public class PrimaryElectionRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(PrimaryElectionRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java index a919b9eb8ed..fa5eeed00f4 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PrimaryNotRelocatedWhileBeingRecoveredTests extends ElasticSearchTestCase { +public class PrimaryNotRelocatedWhileBeingRecoveredTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(PrimaryNotRelocatedWhileBeingRecoveredTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index 2a781eebe33..8da2913877a 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders; import org.elasticsearch.cluster.routing.allocation.decider.Decision; import org.elasticsearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTest import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class RandomAllocationDeciderTests extends ElasticSearchTestCase { +public class RandomAllocationDeciderTests extends ElasticsearchTestCase { /* This test will make random allocation decision on a growing and shrinking * cluster leading to a random distribution of the shards. After a certain diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java index 1591ab409c0..308914db8e8 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class RebalanceAfterActiveTests extends ElasticSearchTestCase { +public class RebalanceAfterActiveTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(RebalanceAfterActiveTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java index 802fee9f9e8..0e4a16e226b 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ReplicaAllocatedAfterPrimaryTests extends ElasticSearchTestCase { +public class ReplicaAllocatedAfterPrimaryTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ReplicaAllocatedAfterPrimaryTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java index ea7cf69262d..c55cf145020 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java @@ -23,13 +23,13 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.common.transport.TransportAddress; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Ignore; import java.util.Map; @Ignore("Not a test") -public class RoutingAllocationTests extends ElasticSearchTestCase { +public class RoutingAllocationTests extends ElasticsearchTestCase { public static DiscoveryNode newNode(String nodeId) { return new DiscoveryNode(nodeId, DummyTransportAddress.INSTANCE, Version.CURRENT); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java index d26041dee6e..66b691bb140 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java @@ -9,7 +9,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.SameShardAllocationD import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.transport.InetSocketTransportAddress; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SameShardRoutingTests extends ElasticSearchTestCase { +public class SameShardRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(SameShardRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java index 46738562177..3213012480a 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -40,7 +40,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class ShardVersioningTests extends ElasticSearchTestCase { +public class ShardVersioningTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ShardVersioningTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java index 2997fd54c42..4c9f756f2f3 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocatio import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class ShardsLimitAllocationTests extends ElasticSearchTestCase { +public class ShardsLimitAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ShardsLimitAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java index 7081f3a4d1b..c2822b01b6d 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.List; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SingleShardNoReplicasRoutingTests extends ElasticSearchTestCase { +public class SingleShardNoReplicasRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(SingleShardNoReplicasRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java index a17655ef850..cc6e8912de6 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SingleShardOneReplicaRoutingTests extends ElasticSearchTestCase { +public class SingleShardOneReplicaRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(SingleShardOneReplicaRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java index 1bbb7783c17..2f1f78c32b0 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class TenShardsOneReplicaRoutingTests extends ElasticSearchTestCase { +public class TenShardsOneReplicaRoutingTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(TenShardsOneReplicaRoutingTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java index 6db4f00a767..f878c46304b 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ThrottlingAllocationTests extends ElasticSearchTestCase { +public class ThrottlingAllocationTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(ThrottlingAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java index 1af71954d7d..222dbb8c4f6 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java @@ -6,7 +6,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -23,7 +23,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class UpdateNumberOfReplicasTests extends ElasticSearchTestCase { +public class UpdateNumberOfReplicasTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(UpdateNumberOfReplicasTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index b58b0830173..7b1c08df551 100644 --- a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocators; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Arrays; @@ -49,7 +49,7 @@ import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTest import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class DiskThresholdDeciderTests extends ElasticSearchTestCase { +public class DiskThresholdDeciderTests extends ElasticsearchTestCase { @Test public void diskThresholdTest() { diff --git a/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java index ed8f8fe6f95..f3a811e75c1 100644 --- a/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java +++ b/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.transport.DummyTransportAddress; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ClusterSerializationTests extends ElasticSearchTestCase { +public class ClusterSerializationTests extends ElasticsearchTestCase { @Test public void testClusterStateSerialization() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java index c35fb0cfb67..a94a7f3bdb6 100644 --- a/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java +++ b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class ClusterSettingsTests extends ElasticSearchTestCase { +public class ClusterSettingsTests extends ElasticsearchTestCase { @Test public void clusterNonExistingSettingsUpdate() { diff --git a/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java b/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java index c148efe74a3..fdce950fa8d 100644 --- a/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java +++ b/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.settings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SettingsValidatorTests extends ElasticSearchTestCase { +public class SettingsValidatorTests extends ElasticsearchTestCase { @Test public void testValidators() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java index 0cfd97ce079..9dcb1348df2 100644 --- a/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java +++ b/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.operation.hash.djb.DjbHashFunction; import org.elasticsearch.cluster.routing.operation.plain.PlainOperationRouting; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -44,7 +44,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -public class RoutingIteratorTests extends ElasticSearchTestCase { +public class RoutingIteratorTests extends ElasticsearchTestCase { @Test public void testEmptyIterator() { diff --git a/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java b/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java index bfb0635b589..a868a3fdc9f 100644 --- a/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java +++ b/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.compress; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.not; /** * */ -public class CompressedStringTests extends ElasticSearchTestCase { +public class CompressedStringTests extends ElasticsearchTestCase { @Test public void simpleTestsLZF() throws IOException { diff --git a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java index 87c49290947..f49eb3e1419 100644 --- a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java +++ b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java @@ -27,8 +27,8 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticSearchTestCase; -import org.elasticsearch.test.hamcrest.ElasticSearchGeoAssertions; +import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import java.util.List; /** * Tests for {@link GeoJSONShapeParser} */ -public class GeoJSONShapeParserTests extends ElasticSearchTestCase { +public class GeoJSONShapeParserTests extends ElasticsearchTestCase { private final static GeometryFactory GEOMETRY_FACTORY = new GeometryFactory(); @@ -250,7 +250,7 @@ public class GeoJSONShapeParserTests extends ElasticSearchTestCase { private void assertGeometryEquals(Shape expected, String geoJson) throws IOException { XContentParser parser = JsonXContent.jsonXContent.createParser(geoJson); parser.nextToken(); - ElasticSearchGeoAssertions.assertEquals(ShapeBuilder.parse(parser).build(), expected); + ElasticsearchGeoAssertions.assertEquals(ShapeBuilder.parse(parser).build(), expected); } } diff --git a/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java index 001ec941d05..84988a216cd 100644 --- a/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java +++ b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java @@ -26,16 +26,16 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Polygon; import org.elasticsearch.common.geo.builders.ShapeBuilder; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; -import static org.elasticsearch.test.hamcrest.ElasticSearchGeoAssertions.assertMultiLineString; -import static org.elasticsearch.test.hamcrest.ElasticSearchGeoAssertions.assertMultiPolygon; +import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.assertMultiLineString; +import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.assertMultiPolygon; import static org.junit.Assert.assertEquals; /** * Tests for {@link ShapeBuilder} */ -public class ShapeBuilderTests extends ElasticSearchTestCase { +public class ShapeBuilderTests extends ElasticsearchTestCase { @Test public void testNewPoint() { diff --git a/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/src/test/java/org/elasticsearch/common/io/StreamsTests.java index fd5a01d94d2..ddbb751ebda 100644 --- a/src/test/java/org/elasticsearch/common/io/StreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/StreamsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.io; import com.google.common.base.Charsets; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.*; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Unit tests for {@link org.elasticsearch.common.io.Streams}. */ -public class StreamsTests extends ElasticSearchTestCase { +public class StreamsTests extends ElasticsearchTestCase { @Test public void testCopyFromInputStream() throws IOException { diff --git a/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java index 0d1f0539e25..f8c51430fcc 100644 --- a/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.common.io.streams; import org.apache.lucene.util.Constants; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.junit.Assume.assumeTrue; /** * */ -public class BytesStreamsTests extends ElasticSearchTestCase { +public class BytesStreamsTests extends ElasticsearchTestCase { @Test public void testSimpleStreams() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java index 2749e460407..25f7c558491 100644 --- a/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.HandlesStreamInput; import org.elasticsearch.common.io.stream.HandlesStreamOutput; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class HandlesStreamsTests extends ElasticSearchTestCase { +public class HandlesStreamsTests extends ElasticsearchTestCase { @Test public void testSharedStringHandles() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java index 5d5aec7b2f0..f472c401067 100644 --- a/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java +++ b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java @@ -1,6 +1,6 @@ package org.elasticsearch.common.joda; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.concurrent.TimeUnit; @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DateMathParserTests extends ElasticSearchTestCase { +public class DateMathParserTests extends ElasticsearchTestCase { @Test public void dataMathTests() { diff --git a/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java index 41bb2a987fb..f90866df273 100644 --- a/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleAllTests extends ElasticSearchTestCase { +public class SimpleAllTests extends ElasticsearchTestCase { @Test public void testAllEntriesRead() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java index 767ad92e7c2..1a1eb585d7f 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class MatchAllDocsFilterTests extends ElasticSearchTestCase { +public class MatchAllDocsFilterTests extends ElasticsearchTestCase { @Test public void testMatchAllDocsFilter() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java index f800acfb716..29d4d28088a 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class MoreLikeThisQueryTests extends ElasticSearchTestCase { +public class MoreLikeThisQueryTests extends ElasticsearchTestCase { @Test public void testSimple() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java index 1ec5bff71de..9cf642b1bb0 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java @@ -26,13 +26,13 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class MultiPhrasePrefixQueryTests extends ElasticSearchTestCase { +public class MultiPhrasePrefixQueryTests extends ElasticsearchTestCase { @Test public void simpleTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java index 4861d1fe7d0..eeb5eb542db 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java @@ -32,7 +32,7 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.FixedBitSet; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.docset.DocIdSets; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class TermsFilterTests extends ElasticSearchTestCase { +public class TermsFilterTests extends ElasticsearchTestCase { @Test public void testTermFilter() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java index 87562f86586..cc5d0a42634 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java @@ -13,7 +13,7 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -26,7 +26,7 @@ import static org.hamcrest.core.IsEqual.equalTo; /** * Tests ported from Lucene. */ -public class XBooleanFilterLuceneTests extends ElasticSearchTestCase { +public class XBooleanFilterLuceneTests extends ElasticsearchTestCase { private Directory directory; private AtomicReader reader; diff --git a/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java index 27c79e30d56..02ea4b1c2ac 100644 --- a/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java @@ -15,7 +15,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.FixedBitSet; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -28,7 +28,7 @@ import static org.hamcrest.core.IsEqual.equalTo; /** */ -public class XBooleanFilterTests extends ElasticSearchTestCase { +public class XBooleanFilterTests extends ElasticsearchTestCase { private Directory directory; private AtomicReader reader; diff --git a/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java index 5dfdd42cca6..61c60922f01 100644 --- a/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.lessThan; /** * */ -public class InputStreamIndexInputTests extends ElasticSearchTestCase { +public class InputStreamIndexInputTests extends ElasticsearchTestCase { @Test public void testSingleReadSingleByteLimit() throws IOException { diff --git a/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java b/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java index d3312bafc16..e4c440e9bf5 100644 --- a/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.mapper.internal.VersionFieldMapper; import org.elasticsearch.index.merge.policy.IndexUpgraderMergePolicy; -import org.elasticsearch.test.ElasticSearchLuceneTestCase; +import org.elasticsearch.test.ElasticsearchLuceneTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -47,7 +47,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class VersionsTests extends ElasticSearchLuceneTestCase { +public class VersionsTests extends ElasticsearchLuceneTestCase { public static DirectoryReader reopen(DirectoryReader reader) throws IOException { return reopen(reader, true); diff --git a/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/src/test/java/org/elasticsearch/common/path/PathTrieTests.java index d7d01478497..96d25ef36b7 100644 --- a/src/test/java/org/elasticsearch/common/path/PathTrieTests.java +++ b/src/test/java/org/elasticsearch/common/path/PathTrieTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.path; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PathTrieTests extends ElasticSearchTestCase { +public class PathTrieTests extends ElasticsearchTestCase { @Test public void testPath() { diff --git a/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/src/test/java/org/elasticsearch/common/regex/RegexTests.java index fc2fdb7bd6b..1272a16d821 100644 --- a/src/test/java/org/elasticsearch/common/regex/RegexTests.java +++ b/src/test/java/org/elasticsearch/common/regex/RegexTests.java @@ -18,14 +18,14 @@ */ package org.elasticsearch.common.regex; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Random; import java.util.regex.Pattern; import static org.hamcrest.Matchers.equalTo; -public class RegexTests extends ElasticSearchTestCase { +public class RegexTests extends ElasticsearchTestCase { @Test public void testFlags() { diff --git a/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java b/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java index 9a363e6587b..145b936fe66 100644 --- a/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java +++ b/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.settings; import org.elasticsearch.common.settings.bar.BarTestClass; import org.elasticsearch.common.settings.foo.FooTestClass; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class ImmutableSettingsTests extends ElasticSearchTestCase{ +public class ImmutableSettingsTests extends ElasticsearchTestCase{ @Test public void testGetAsClass() { diff --git a/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java index e2df888fe26..e9794e97eaf 100644 --- a/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java +++ b/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JsonSettingsLoaderTests extends ElasticSearchTestCase { +public class JsonSettingsLoaderTests extends ElasticsearchTestCase { @Test public void testSimpleJsonSettings() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java index ef97acd1d2a..7fd92de45b9 100644 --- a/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java +++ b/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class YamlSettingsLoaderTests extends ElasticSearchTestCase { +public class YamlSettingsLoaderTests extends ElasticsearchTestCase { @Test public void testSimpleYamlSettings() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java index 0dcb5188517..640175d1e06 100644 --- a/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java +++ b/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.unit.ByteSizeUnit.*; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ByteSizeUnitTests extends ElasticSearchTestCase { +public class ByteSizeUnitTests extends ElasticsearchTestCase { @Test public void testBytes() { diff --git a/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java index 7b0a9bd7128..17d6437b923 100644 --- a/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class ByteSizeValueTests extends ElasticSearchTestCase { +public class ByteSizeValueTests extends ElasticsearchTestCase { @Test public void testActual() { diff --git a/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java index ca849f56095..229592e074b 100644 --- a/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java +++ b/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class DistanceUnitTests extends ElasticSearchTestCase { +public class DistanceUnitTests extends ElasticsearchTestCase { @Test public void testSimpleDistanceUnit() { diff --git a/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java index d01555eb550..1ee28753035 100644 --- a/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.joda.time.PeriodType; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.lessThan; /** * */ -public class TimeValueTests extends ElasticSearchTestCase { +public class TimeValueTests extends ElasticsearchTestCase { @Test public void testSimple() { diff --git a/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java index 8b8282d667d..1b2d0b289e6 100644 --- a/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.util; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for {@link SlicedDoubleList} */ -public class SlicedDoubleListTests extends ElasticSearchTestCase { +public class SlicedDoubleListTests extends ElasticsearchTestCase { @Test public void testCapacity() { diff --git a/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java index b51421fef2a..34b308e6533 100644 --- a/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.util; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for {@link SlicedLongList} */ -public class SlicedLongListTests extends ElasticSearchTestCase { +public class SlicedLongListTests extends ElasticsearchTestCase { @Test public void testCapacity() { diff --git a/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java index 8662cc4e72a..9faf17015db 100644 --- a/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.util; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for {@link SlicedObjectList} */ -public class SlicedObjectListTests extends ElasticSearchTestCase { +public class SlicedObjectListTests extends ElasticsearchTestCase { public class TestList extends SlicedObjectList { diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java index d923893252e..24941cfa63d 100644 --- a/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java +++ b/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.util.concurrent; import com.google.common.base.Predicate; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.lessThan; /** */ -public class EsExecutorsTests extends ElasticSearchTestCase { +public class EsExecutorsTests extends ElasticsearchTestCase { private TimeUnit randomTimeUnit() { return TimeUnit.values()[between(0, TimeUnit.values().length - 1)]; diff --git a/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java index 9ec697cfcbc..4c7eb585ef1 100644 --- a/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java +++ b/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.util.concurrent; import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PrioritizedExecutorsTests extends ElasticSearchTestCase { +public class PrioritizedExecutorsTests extends ElasticsearchTestCase { @Test public void testPriorityQueue() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java index 2974d16e961..c533b3cd883 100644 --- a/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class BuilderRawFieldTests extends ElasticSearchTestCase { +public class BuilderRawFieldTests extends ElasticsearchTestCase { @Test public void testJsonRawField() throws IOException { diff --git a/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java index 2a36d38a96c..b70028a13af 100644 --- a/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentGenerator; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.*; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class XContentBuilderTests extends ElasticSearchTestCase { +public class XContentBuilderTests extends ElasticsearchTestCase { @Test public void verifyReuseJsonGenerator() throws Exception { diff --git a/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java index bc93cc5c845..4f5dfa3a96a 100644 --- a/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentGenerator; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class JsonVsSmileTests extends ElasticSearchTestCase { +public class JsonVsSmileTests extends ElasticsearchTestCase { // @Test public void testBinarySmileField() throws Exception { // JsonGenerator gen = new SmileFactory().createJsonGenerator(new ByteArrayOutputStream()); diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java index 33a5f5f607d..09ce5802a39 100644 --- a/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.xcontent.support; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -31,7 +31,7 @@ import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; -public class XContentHelperTests extends ElasticSearchTestCase { +public class XContentHelperTests extends ElasticsearchTestCase { Map getMap(Object... keyValues) { Map map = new HashMap(); diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java index e190d93284b..ffa70794bf8 100644 --- a/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Arrays; @@ -39,7 +39,7 @@ import static org.hamcrest.core.IsEqual.equalTo; /** */ -public class XContentMapValuesTests extends ElasticSearchTestCase { +public class XContentMapValuesTests extends ElasticsearchTestCase { @Test public void testFilter() throws Exception { diff --git a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java index 6138b50a8b8..199148e70a3 100644 --- a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java @@ -39,7 +39,7 @@ import java.io.IOException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java index e981d008431..dd176e9e0fd 100644 --- a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java +++ b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java @@ -12,8 +12,8 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; public class SimpleCountTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java index e422b8f33a0..c5429e643d8 100644 --- a/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java +++ b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Assert; import org.junit.Test; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java index 39744ee07ea..df367c12ca4 100644 --- a/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java +++ b/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JacksonLocationTests extends ElasticSearchTestCase { +public class JacksonLocationTests extends ElasticsearchTestCase { @Test public void testLocationExtraction() throws IOException { diff --git a/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java index d504aacbdc3..39648388611 100644 --- a/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java +++ b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.deps.joda; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.joda.time.DateTimeZone; import org.joda.time.MutableDateTime; import org.joda.time.format.*; @@ -37,7 +37,7 @@ import static org.junit.Assert.fail; /** * */ -public class SimpleJodaTests extends ElasticSearchTestCase { +public class SimpleJodaTests extends ElasticsearchTestCase { @Test public void testMultiParsers() { diff --git a/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java b/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java index 3e0502fc28b..c1ae14e0fed 100644 --- a/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java +++ b/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.deps.joda; import org.elasticsearch.common.joda.TimeZoneRounding; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.joda.time.Chronology; import org.joda.time.DateTimeZone; import org.joda.time.chrono.ISOChronology; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class TimeZoneRoundingTests extends ElasticSearchTestCase { +public class TimeZoneRoundingTests extends ElasticsearchTestCase { @Test public void testUTCMonthRounding() { diff --git a/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java index 9d80b7cc720..7d9b0dfed7e 100644 --- a/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java +++ b/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleLuceneTests extends ElasticSearchTestCase { +public class SimpleLuceneTests extends ElasticsearchTestCase { @Test public void testSortValues() throws Exception { diff --git a/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java index da8519b07d1..1dc9fc8db1f 100644 --- a/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java +++ b/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.vectorhighlight.FastVectorHighlighter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class VectorHighlighterTests extends ElasticSearchTestCase { +public class VectorHighlighterTests extends ElasticsearchTestCase { @Test public void testVectorHighlighter() throws Exception { diff --git a/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java index 4cd2bfcb0f6..fda81f220a6 100644 --- a/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.local.LocalTransport; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class MulticastZenPingTests extends ElasticSearchTestCase { +public class MulticastZenPingTests extends ElasticsearchTestCase { private Settings buildRandomMulticast(Settings settings) { ImmutableSettings.Builder builder = ImmutableSettings.builder().put(settings); diff --git a/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java index 4f86a2ac7aa..cc06137e447 100644 --- a/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.netty.NettyTransport; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class UnicastZenPingTests extends ElasticSearchTestCase { +public class UnicastZenPingTests extends ElasticsearchTestCase { @Test public void testSimplePings() { diff --git a/src/test/java/org/elasticsearch/document/BulkTests.java b/src/test/java/org/elasticsearch/document/BulkTests.java index 7785dab0519..1f7c44581a0 100644 --- a/src/test/java/org/elasticsearch/document/BulkTests.java +++ b/src/test/java/org/elasticsearch/document/BulkTests.java @@ -18,8 +18,8 @@ import org.junit.Test; import java.util.concurrent.CyclicBarrier; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertSearchHits; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java index e8fead8a992..893b1542151 100644 --- a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java +++ b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java @@ -44,7 +44,7 @@ import java.util.Map; import static org.elasticsearch.client.Requests.*; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java index 5902d3a1e77..4c8c28daaee 100644 --- a/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.fuzzyLikeThisFieldQuery; import static org.elasticsearch.index.query.QueryBuilders.fuzzyLikeThisQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java index 5164927bb09..0d309e50b88 100644 --- a/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java @@ -38,8 +38,8 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java index 39f9d34345b..bc69288c5ee 100644 --- a/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java @@ -45,7 +45,7 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java b/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java index f9a6fb5a7b9..526606ba11a 100644 --- a/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java +++ b/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java @@ -24,7 +24,7 @@ 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.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; import java.util.HashMap; @@ -50,7 +50,7 @@ public class IndexRequestBuilderTests extends AbstractIntegrationTest { }; indexRandom(true, builders); SearchResponse searchResponse = client().prepareSearch("test").setQuery(QueryBuilders.termQuery("test_field", "foobar")).get(); - ElasticSearchAssertions.assertHitCount(searchResponse, builders.length); + ElasticsearchAssertions.assertHitCount(searchResponse, builders.length); } @Test(expected = IllegalArgumentException.class) diff --git a/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/src/test/java/org/elasticsearch/index/VersionTypeTests.java index 5a2be25d383..17e0b3599cc 100644 --- a/src/test/java/org/elasticsearch/index/VersionTypeTests.java +++ b/src/test/java/org/elasticsearch/index/VersionTypeTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.index; import org.elasticsearch.common.lucene.uid.Versions; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class VersionTypeTests extends ElasticSearchTestCase { +public class VersionTypeTests extends ElasticsearchTestCase { @Test public void testInternalVersionConflict() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java index 20a86476287..1a4303ad13f 100644 --- a/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java +++ b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java @@ -46,7 +46,7 @@ import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.indices.InvalidAliasNameException; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class IndexAliasesServiceTests extends ElasticSearchTestCase { +public class IndexAliasesServiceTests extends ElasticsearchTestCase { public static IndexAliasesService newIndexAliasesService() { return new IndexAliasesService(new Index("test"), ImmutableSettings.Builder.EMPTY_SETTINGS, newIndexQueryParserService()); } diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java index 830a37d85af..70c83468b10 100644 --- a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java @@ -43,7 +43,7 @@ import org.elasticsearch.index.analysis.filter1.MyFilterTokenFilterFactory; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class AnalysisModuleTests extends ElasticSearchTestCase { +public class AnalysisModuleTests extends ElasticsearchTestCase { @Test public void testSimpleConfigurationJson() { diff --git a/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java index e9eeade9742..e5021790b4f 100644 --- a/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; import java.io.StringReader; -public class CJKFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class CJKFilterFactoryTests extends ElasticsearchTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/cjk_analysis.json"; diff --git a/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java index 95c711a84bf..430403eb621 100644 --- a/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java @@ -29,14 +29,14 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; /** */ -public class CharFilterTests extends ElasticSearchTokenStreamTestCase { +public class CharFilterTests extends ElasticsearchTokenStreamTestCase { @Test public void testMappingCharFilter() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java b/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java index 001e4e2dac7..379e12af52e 100644 --- a/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.analysis.compound.DictionaryCompoundWordTokenFilt import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class CompoundAnalysisTests extends ElasticSearchTestCase { +public class CompoundAnalysisTests extends ElasticsearchTestCase { @Test public void testDefaultsCompoundAnalysis() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java index 401d16ed7ae..9ccc2cd8a55 100644 --- a/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.ProvisionException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class HunspellTokenFilterFactoryTests extends ElasticSearchTestCase { +public class HunspellTokenFilterFactoryTests extends ElasticsearchTestCase { @Test public void testDedup() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java index f2fad3b36d1..f43ec68a990 100644 --- a/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Assert; import org.junit.Test; @@ -33,7 +33,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class KeepFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class KeepFilterFactoryTests extends ElasticsearchTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/keep_analysis.json"; diff --git a/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java index 545cff6a526..65824af4d5c 100644 --- a/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java @@ -23,13 +23,13 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; import java.io.StringReader; -public class LimitTokenCountFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class LimitTokenCountFilterFactoryTests extends ElasticsearchTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java index 15d4f1f5478..8c364ad73f1 100644 --- a/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -45,7 +45,7 @@ import java.util.Random; import static org.hamcrest.Matchers.instanceOf; -public class NGramTokenizerFactoryTests extends ElasticSearchTokenStreamTestCase { +public class NGramTokenizerFactoryTests extends ElasticsearchTokenStreamTestCase { @Test public void testParseTokenChars() { diff --git a/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java b/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java index 500d0b7eb31..2dbc8147b78 100644 --- a/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.NumericTokenStream; import org.apache.lucene.analysis.NumericTokenStream.NumericTermAttribute; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +31,7 @@ import java.io.IOException; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class NumericAnalyzerTests extends ElasticSearchTestCase { +public class NumericAnalyzerTests extends ElasticsearchTestCase { @Test public void testAttributeEqual() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java index 9048c3e373f..672c0ced0bc 100644 --- a/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java @@ -31,12 +31,12 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -public class PatternCaptureTokenFilterTests extends ElasticSearchTokenStreamTestCase { +public class PatternCaptureTokenFilterTests extends ElasticsearchTokenStreamTestCase { @Test public void testPatternCaptureTokenFilter() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java index a6193e4d6f6..76d945edea9 100644 --- a/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java @@ -23,7 +23,7 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; @ThreadLeakScope(Scope.NONE) -public class ShingleTokenFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class ShingleTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/shingle_analysis.json"; diff --git a/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java index fa3db0f406a..5f008b405a8 100644 --- a/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java @@ -30,12 +30,12 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -public class StopAnalyzerTests extends ElasticSearchTokenStreamTestCase { +public class StopAnalyzerTests extends ElasticsearchTokenStreamTestCase { @Test public void testDefaultsCompoundAnalysis() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java index e990eaf93be..65ed7bb566f 100644 --- a/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.inject.ProvisionException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class StopTokenFilterTests extends ElasticSearchTokenStreamTestCase { +public class StopTokenFilterTests extends ElasticsearchTokenStreamTestCase { @Test(expected = ProvisionException.class) public void testPositionIncrementSetting() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java index db64e5aa1cf..ecb3840e4c0 100644 --- a/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -29,7 +29,7 @@ import java.io.StringReader; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -public class WordDelimiterTokenFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class WordDelimiterTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java index 830b33d6bd7..75fd5555f9e 100644 --- a/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Assert; import org.junit.Test; @@ -36,7 +36,7 @@ import java.io.IOException; import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class CommonGramsTokenFilterFactoryTests extends ElasticSearchTokenStreamTestCase { +public class CommonGramsTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java b/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java index cc5e8baf123..1632301edc8 100644 --- a/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java +++ b/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.lucene.search.XConstantScoreQuery; import org.elasticsearch.common.lucene.search.XFilteredQuery; import org.elasticsearch.index.Index; import org.elasticsearch.index.cache.filter.none.NoneFilterCache; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class FilterCacheTests extends ElasticSearchTestCase { +public class FilterCacheTests extends ElasticsearchTestCase { @Test diff --git a/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java b/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java index b0ff835fb27..fc89781669e 100644 --- a/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java +++ b/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java @@ -55,7 +55,7 @@ import org.elasticsearch.index.settings.IndexSettingsService; import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.IndexStore; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -69,7 +69,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class SimpleIdCacheTests extends ElasticSearchTestCase { +public class SimpleIdCacheTests extends ElasticsearchTestCase { @Test public void testDeletedDocuments() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 80b133296a0..bdccbc11e6c 100644 --- a/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -51,7 +51,7 @@ import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.mapper.internal.VersionFieldMapper; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; -import org.elasticsearch.test.ElasticSearchLuceneTestCase; +import org.elasticsearch.test.ElasticsearchLuceneTestCase; import org.junit.Before; import org.junit.Test; @@ -61,7 +61,7 @@ import java.util.Arrays; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class CodecTests extends ElasticSearchLuceneTestCase { +public class CodecTests extends ElasticsearchLuceneTestCase { @Override @Before diff --git a/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java b/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java index 746ed95f588..dea1e780fd9 100644 --- a/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java +++ b/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.codec.postingsformat.BloomFilterPostingsFormat; import org.elasticsearch.index.codec.postingsformat.ElasticSearch090PostingsFormat; import org.elasticsearch.index.mapper.internal.UidFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*; /** * Simple smoke test for {@link ElasticSearch090PostingsFormat} */ -public class DefaultPostingsFormatTests extends ElasticSearchTestCase { +public class DefaultPostingsFormatTests extends ElasticsearchTestCase { private final class TestCodec extends Lucene45Codec { diff --git a/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java index 87dd578203e..07d9a733e93 100644 --- a/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java +++ b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * A set of tests for {@link org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy}. */ -public class SnapshotDeletionPolicyTests extends ElasticSearchTestCase { +public class SnapshotDeletionPolicyTests extends ElasticsearchTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java index 70f169ccbfe..5213a8b2e47 100644 --- a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java +++ b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java @@ -60,7 +60,7 @@ import org.elasticsearch.index.store.ram.RamDirectoryService; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogSizeMatcher; import org.elasticsearch.index.translog.fs.FsTranslog; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.hamcrest.MatcherAssert; import org.junit.After; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class RobinEngineTests extends ElasticSearchTestCase { +public class RobinEngineTests extends ElasticsearchTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java index c89e0d31d84..56ee2bce937 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java @@ -25,12 +25,12 @@ import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.Index; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; // we might wanna cut this over to LuceneTestCase -public abstract class AbstractFieldDataTests extends ElasticSearchTestCase { +public abstract class AbstractFieldDataTests extends ElasticsearchTestCase { protected IndexFieldDataService ifdService; protected IndexWriter writer; diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java b/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java index 2f61268f5d4..a79e0d2d53c 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java @@ -35,7 +35,7 @@ import java.io.IOException; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.facet.FacetBuilders.termsFacet; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertAcked; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; public class FieldDataFilterIntegrationTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java index e274657021b..e4b67a01a24 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.fielddata.ordinals; import org.apache.lucene.util.LongsRef; import org.apache.lucene.util.packed.PackedInts; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class MultiOrdinalsTests extends ElasticSearchTestCase { +public class MultiOrdinalsTests extends ElasticsearchTestCase { protected final Ordinals creationMultiOrdinals(OrdinalsBuilder builder) { return this.creationMultiOrdinals(builder, ImmutableSettings.builder()); diff --git a/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java index cefaab37687..2a3dcaef63d 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.fielddata.ordinals; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class SingleOrdinalsTests extends ElasticSearchTestCase { +public class SingleOrdinalsTests extends ElasticsearchTestCase { @Test public void testSvValues() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java b/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java index 613dd090aab..6c91e97b7e6 100644 --- a/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java +++ b/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java @@ -23,7 +23,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class CommitPointsTests extends ElasticSearchTestCase { +public class CommitPointsTests extends ElasticsearchTestCase { private final ESLogger logger = Loggers.getLogger(CommitPointsTests.class); diff --git a/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/src/test/java/org/elasticsearch/index/mapper/UidTests.java index 91d4a92261f..03abbd166db 100644 --- a/src/test/java/org/elasticsearch/index/mapper/UidTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/UidTests.java @@ -20,13 +20,13 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.bytes.HashedBytesArray; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class UidTests extends ElasticSearchTestCase { +public class UidTests extends ElasticsearchTestCase { @Test public void testCreateAndSplitId() { diff --git a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java index ce864f47bc1..d3b9874e908 100644 --- a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.lucene.all.AllTokenStream; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleAllMapperTests extends ElasticSearchTestCase { +public class SimpleAllMapperTests extends ElasticsearchTestCase { @Test public void testSimpleAllMappers() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java index b41b8f12f11..9adbba98352 100644 --- a/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class AnalyzerMapperTests extends ElasticSearchTestCase { +public class AnalyzerMapperTests extends ElasticsearchTestCase { @Test public void testAnalyzerMapping() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java index c3ac30a50c9..53459609123 100644 --- a/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.BoostFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class BoostMappingTests extends ElasticSearchTestCase { +public class BoostMappingTests extends ElasticsearchTestCase { @Test public void testDefaultMapping() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java index 60ed34004ca..458a374b419 100644 --- a/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java @@ -23,13 +23,13 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class CustomBoostMappingTests extends ElasticSearchTestCase { +public class CustomBoostMappingTests extends ElasticsearchTestCase { @Test public void testCustomBoostValues() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java index e39be5c3638..8d2d219d100 100644 --- a/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.closeTo; /** */ -public class FieldLevelBoostTests extends ElasticSearchTestCase { +public class FieldLevelBoostTests extends ElasticsearchTestCase { @Test public void testFieldLevelBoost() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java b/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java index bd0d65b250c..5e943a5a334 100644 --- a/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class CamelCaseFieldNameTests extends ElasticSearchTestCase { +public class CamelCaseFieldNameTests extends ElasticsearchTestCase { @Test public void testCamelCaseFieldNameStaysAsIs() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java index 0c24528da82..61f48839435 100644 --- a/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class CompletionFieldMapperTests extends ElasticSearchTestCase { +public class CompletionFieldMapperTests extends ElasticsearchTestCase { @Test public void testDefaultConfiguration() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java b/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java index a52b8e8bf51..a819537f61f 100644 --- a/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java @@ -23,14 +23,14 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; -public class CompoundTypesTests extends ElasticSearchTestCase { +public class CompoundTypesTests extends ElasticsearchTestCase { @Test public void testStringType() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index e341f1f4e8b..9757e82459d 100644 --- a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.core.DateFieldMapper; import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -48,7 +48,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -public class SimpleDateMappingTests extends ElasticSearchTestCase { +public class SimpleDateMappingTests extends ElasticsearchTestCase { @Test public void testAutomaticDateParser() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java index 5e60626bf2b..db74058127e 100644 --- a/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.StrictDynamicMappingException; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class DynamicMappingTests extends ElasticSearchTestCase { +public class DynamicMappingTests extends ElasticsearchTestCase { @Test public void testDynamicTrue() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java index f7c9e819779..b97b4ece40c 100644 --- a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class GenericStoreDynamicTemplateTests extends ElasticSearchTestCase { +public class GenericStoreDynamicTemplateTests extends ElasticsearchTestCase { @Test public void testSimple() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java index 27790e2c03c..b680689f802 100644 --- a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PathMatchDynamicTemplateTests extends ElasticSearchTestCase { +public class PathMatchDynamicTemplateTests extends ElasticsearchTestCase { @Test public void testSimple() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java index 63fcfd94b4e..74d47bceb53 100644 --- a/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.DocumentFieldMappers; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleDynamicTemplatesTests extends ElasticSearchTestCase { +public class SimpleDynamicTemplatesTests extends ElasticsearchTestCase { @Test public void testMatchTypeOnly() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java index 91fd8599a96..60457c68d79 100644 --- a/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class GeoShapeFieldMapperTests extends ElasticSearchTestCase { +public class GeoShapeFieldMapperTests extends ElasticsearchTestCase { @Test public void testDefaultConfiguration() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java index ee9101668d3..49fbaba3a19 100644 --- a/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class GeohashMappingGeoPointTests extends ElasticSearchTestCase { +public class GeohashMappingGeoPointTests extends ElasticsearchTestCase { @Test public void testLatLonValues() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java index f3aabc0cf38..8f59bf91f3e 100644 --- a/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class LatLonAndGeohashMappingGeoPointTests extends ElasticSearchTestCase { +public class LatLonAndGeohashMappingGeoPointTests extends ElasticsearchTestCase { @Test public void testLatLonValues() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java index 58d741de81a..adbd56ad683 100644 --- a/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class LatLonMappingGeoPointTests extends ElasticSearchTestCase { +public class LatLonMappingGeoPointTests extends ElasticsearchTestCase { @Test public void testNormalizeLatLonValuesDefault() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java index 4c5bd69ec5e..09fb76f4cc6 100644 --- a/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.IdFieldMapper; import org.elasticsearch.index.mapper.internal.UidFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class IdMappingTests extends ElasticSearchTestCase { +public class IdMappingTests extends ElasticsearchTestCase { @Test public void simpleIdTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java index 3ef9bc412c5..2775ecc86a2 100644 --- a/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.IndexFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class IndexTypeMapperTests extends ElasticSearchTestCase { +public class IndexTypeMapperTests extends ElasticsearchTestCase { @Test public void simpleIndexMapperTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java index 31cd62fc018..15acdc3aecb 100644 --- a/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.mapper.ip; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Ignore; /** * */ @Ignore("No tests?") -public class SimpleIpMappingTests extends ElasticSearchTestCase { +public class SimpleIpMappingTests extends ElasticsearchTestCase { // No Longer enabled... // @Test public void testAutoIpDetection() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java index 0b518c0a62a..18015efd312 100644 --- a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.object.ObjectMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.index.mapper.DocumentMapper.MergeFlags.mergeFlags; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class TestMergeMapperTests extends ElasticSearchTestCase { +public class TestMergeMapperTests extends ElasticsearchTestCase { @Test public void test1Merge() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java index a910f76fe52..fb2c1f05759 100644 --- a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class MultiFieldTests extends ElasticSearchTestCase { +public class MultiFieldTests extends ElasticsearchTestCase { @Test public void testMultiField() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java index 3b864699ea0..2b8623f0055 100644 --- a/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Arrays; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class JavaMultiFieldMergeTests extends ElasticSearchTestCase { +public class JavaMultiFieldMergeTests extends ElasticsearchTestCase { @Test public void testMergeMultiField() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java index 5183f38833f..36aee256cc5 100644 --- a/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.TypeFieldMapper; import org.elasticsearch.index.mapper.object.ObjectMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class NestedMappingTests extends ElasticSearchTestCase { +public class NestedMappingTests extends ElasticsearchTestCase { @Test public void emptyNested() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java b/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java index 57e1135721a..864756364da 100644 --- a/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.core.DoubleFieldMapper; import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class SimpleNumericTests extends ElasticSearchTestCase { +public class SimpleNumericTests extends ElasticsearchTestCase { @Test public void testNumericDetectionEnabled() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java index 4a9cec23ac6..47ebd90db03 100644 --- a/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class NullValueObjectMappingTests extends ElasticSearchTestCase { +public class NullValueObjectMappingTests extends ElasticsearchTestCase { @Test public void testNullValueObject() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java index 691b5743c8a..10155c6889a 100644 --- a/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java @@ -24,12 +24,12 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; /** */ -public class SimpleObjectMappingTests extends ElasticSearchTestCase { +public class SimpleObjectMappingTests extends ElasticsearchTestCase { @Test public void testDifferentInnerObjectTokenFailure() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java index 947fdec5769..d4d6e4c5f92 100644 --- a/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper.overridetype; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class OverrideTypeMappingTests extends ElasticSearchTestCase { +public class OverrideTypeMappingTests extends ElasticsearchTestCase { @Test public void testOverrideType() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java index 6795aa6aee6..78a45f13e13 100644 --- a/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper.parent; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.*; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ParentMappingTests extends ElasticSearchTestCase { +public class ParentMappingTests extends ElasticsearchTestCase { @Test public void parentNotMapped() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java index e875b0c6333..656ca38b694 100644 --- a/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper.path; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PathMapperTests extends ElasticSearchTestCase { +public class PathMapperTests extends ElasticsearchTestCase { @Test public void testPathMapping() throws IOException { diff --git a/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java index 64458177cf2..70e175ceb48 100644 --- a/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class RoutingTypeMapperTests extends ElasticSearchTestCase { +public class RoutingTypeMapperTests extends ElasticsearchTestCase { @Test public void simpleRoutingMapperTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java index 125684a5ddf..6a2bc6d1443 100644 --- a/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.document.Document; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.mapper.*; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleMapperTests extends ElasticSearchTestCase { +public class SimpleMapperTests extends ElasticsearchTestCase { @Test public void testSimpleMapper() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java index df7e31a7944..45c6d786f29 100644 --- a/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java @@ -25,13 +25,13 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; -public class SizeMappingTests extends ElasticSearchTestCase { +public class SizeMappingTests extends ElasticsearchTestCase { @Test public void testSizeEnabled() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java index 821c867df7b..507b76fe489 100644 --- a/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class CompressSourceMappingTests extends ElasticSearchTestCase { +public class CompressSourceMappingTests extends ElasticsearchTestCase { @Test public void testCompressDisabled() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java index c4d67794991..3662b09ff19 100644 --- a/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.compress.CompressorFactory; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.*; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class DefaultSourceMappingTests extends ElasticSearchTestCase { +public class DefaultSourceMappingTests extends ElasticsearchTestCase { @Test public void testNoFormat() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java index 61bb91fc9df..f4270b79eaf 100644 --- a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java @@ -30,14 +30,14 @@ import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.Mapper.BuilderContext; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; /** */ -public class SimpleStringMappingTests extends ElasticSearchTestCase { +public class SimpleStringMappingTests extends ElasticsearchTestCase { private static Settings DOC_VALUES_SETTINGS = ImmutableSettings.builder().put(FieldDataType.FORMAT_KEY, FieldDataType.DOC_VALUES_FORMAT_VALUE).build(); diff --git a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java index 96c0b512b3b..4881622f22f 100644 --- a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Locale; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class TimestampMappingTests extends ElasticSearchTestCase { +public class TimestampMappingTests extends ElasticsearchTestCase { @Test public void testSimpleDisabled() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java index b562eca88db..b9e7355073d 100644 --- a/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java @@ -27,14 +27,14 @@ import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.internal.TTLFieldMapper; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class TTLMappingTests extends ElasticSearchTestCase { +public class TTLMappingTests extends ElasticsearchTestCase { @Test public void testSimpleDisabled() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string(); diff --git a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java index ba713465a8c..60841871a31 100644 --- a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ParseDocumentTypeLevelsTests extends ElasticSearchTestCase { +public class ParseDocumentTypeLevelsTests extends ElasticsearchTestCase { @Test public void testNoLevel() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java index e1dd441a274..a7a285d4624 100644 --- a/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper.typelevels; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperTestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ParseMappingTypeLevelTests extends ElasticSearchTestCase { +public class ParseMappingTypeLevelTests extends ElasticsearchTestCase { @Test public void testTypeLevel() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java index 728db8b3f5c..7835d2c82d0 100644 --- a/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java +++ b/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java @@ -22,10 +22,10 @@ package org.elasticsearch.index.query; import org.elasticsearch.common.geo.builders.EnvelopeBuilder; import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; -public class GeoShapeQueryBuilderTests extends ElasticSearchTestCase { +public class GeoShapeQueryBuilderTests extends ElasticsearchTestCase { @Test // see #3878 public void testThatXContentSerializationInsideOfArrayWorks() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index e704f4ba1b2..95e73695e73 100644 --- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java +++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -60,7 +60,7 @@ import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.hamcrest.Matchers; @@ -79,13 +79,13 @@ import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.index.query.RegexpFlag.*; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertBooleanSubQuery; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery; import static org.hamcrest.Matchers.*; /** * */ -public class SimpleIndexQueryParserTests extends ElasticSearchTestCase { +public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { private static Injector injector; diff --git a/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java b/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java index d9390d40030..3d491554d5d 100644 --- a/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java +++ b/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class IndexQueryParserModuleTests extends ElasticSearchTestCase { +public class IndexQueryParserModuleTests extends ElasticsearchTestCase { @Test public void testCustomInjection() { diff --git a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java index d7c3eca5b4e..8eedbd7061b 100644 --- a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class IndexQueryParserPlugin2Tests extends ElasticSearchTestCase { +public class IndexQueryParserPlugin2Tests extends ElasticsearchTestCase { @Test public void testCustomInjection() { diff --git a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java index 866d6fb4d8c..ab1649a8fad 100644 --- a/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class IndexQueryParserPluginTests extends ElasticSearchTestCase { +public class IndexQueryParserPluginTests extends ElasticsearchTestCase { @Test public void testCustomInjection() { diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java index 01968bbdc67..204630205f0 100644 --- a/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.unit.DistanceUnit; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class GeoDistanceTests extends ElasticSearchTestCase { +public class GeoDistanceTests extends ElasticsearchTestCase { @Test public void testDistanceCheck() { diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java index ee5925de0ba..5dba60fb4f6 100644 --- a/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * */ -public class GeoHashUtilsTests extends ElasticSearchTestCase { +public class GeoHashUtilsTests extends ElasticsearchTestCase { /** * Pass condition: lat=42.6, lng=-5.6 should be encoded as "ezs42e44yx96", diff --git a/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java index aaa7a3c8767..e6e8d3f0743 100644 --- a/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class GeoUtilsTests extends ElasticSearchTestCase { +public class GeoUtilsTests extends ElasticsearchTestCase { /** * Test special values like inf, NaN and -0.0. diff --git a/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java index 69cb48d8e59..92d74456b96 100644 --- a/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java +++ b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.codec.CodecModule; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperServiceModule; import org.elasticsearch.index.settings.IndexSettingsModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; -public class SimilarityTests extends ElasticSearchTestCase { +public class SimilarityTests extends ElasticsearchTestCase { @Test public void testResolveDefaultSimilarities() { diff --git a/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java b/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java index a5896385c05..023b9152c6f 100644 --- a/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java +++ b/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.store.distributor; import org.apache.lucene.store.*; import org.elasticsearch.index.store.DirectoryService; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.File; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class DistributorTests extends ElasticSearchTestCase { +public class DistributorTests extends ElasticsearchTestCase { @Test public void testLeastUsedDistributor() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java b/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java index 186ad85f840..4caf7ef159e 100644 --- a/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java +++ b/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.store.memory; import org.apache.lucene.store.*; import org.apache.lucene.store.bytebuffer.ByteBufferDirectory; import org.elasticsearch.cache.memory.ByteBufferCache; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleByteBufferStoreTests extends ElasticSearchTestCase { +public class SimpleByteBufferStoreTests extends ElasticsearchTestCase { @Test public void test1BufferNoCache() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java index ad72eb24fa1..49e0f72b932 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.emptyIterable; public class ConcurrentDynamicTemplateTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java index 9c4ed489dc2..9d6b95da2cc 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java @@ -23,8 +23,8 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; public class UpdateMappingTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index fe16488d249..cd77130ca17 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 1f1b245c97f..1cb5806151e 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java index 8b59e4881ff..ceb639cb3be 100644 --- a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java @@ -33,8 +33,8 @@ import java.util.Arrays; import java.util.List; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java index 0f6585e8c86..00c4b8de961 100644 --- a/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java +++ b/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java @@ -7,7 +7,7 @@ import com.carrotsearch.randomizedtesting.TraceFormatting; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.notification.Failure; @@ -21,7 +21,7 @@ import java.util.Arrays; */ public class ReproduceInfoPrinter extends RunListener { - protected final ESLogger logger = Loggers.getLogger(ElasticSearchTestCase.class); + protected final ESLogger logger = Loggers.getLogger(ElasticsearchTestCase.class); @Override public void testStarted(Description description) throws Exception { diff --git a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java index 7b7fe4a82fe..0a26f101896 100644 --- a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java @@ -33,7 +33,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.termFilter; import static org.elasticsearch.index.query.QueryBuilders.moreLikeThisFieldQuery; import static org.elasticsearch.index.query.QueryBuilders.moreLikeThisQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java index 4e4b467b8a3..2a8e51a3d45 100644 --- a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java +++ b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java @@ -40,7 +40,7 @@ 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.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Assert; import org.junit.Test; @@ -48,8 +48,8 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; public class SimpleNestedTests extends AbstractIntegrationTest { @@ -70,7 +70,7 @@ public class SimpleNestedTests extends AbstractIntegrationTest { endObject(). endObject(). endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", builder)); + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", builder)); ensureGreen(); // check on no data, see it works diff --git a/src/test/java/org/elasticsearch/node/InternalNodeTests.java b/src/test/java/org/elasticsearch/node/InternalNodeTests.java index 906d9951a9f..d29b553e956 100644 --- a/src/test/java/org/elasticsearch/node/InternalNodeTests.java +++ b/src/test/java/org/elasticsearch/node/InternalNodeTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.inject.Singleton; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.ArrayList; @@ -38,7 +38,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.node.NodeBuilder.nodeBuilder; import static org.hamcrest.Matchers.is; -public class InternalNodeTests extends ElasticSearchTestCase { +public class InternalNodeTests extends ElasticsearchTestCase { @Test public void testDefaultPluginConfiguration() throws Exception { diff --git a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java index 69fa3fd5104..8811b52eacf 100644 --- a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java +++ b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.node.internal; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class InternalSettingsPerparerTests extends ElasticSearchTestCase { +public class InternalSettingsPerparerTests extends ElasticsearchTestCase { @Before public void setupSystemProperties() { System.setProperty("es.node.zone", "foo"); diff --git a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java index 94ccc61f7b2..d2d1de6089e 100644 --- a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java @@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReference; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java index efd32fe1434..41a20824db7 100644 --- a/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java @@ -30,7 +30,7 @@ import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuild import static org.elasticsearch.common.xcontent.XContentFactory.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java index a2dcabdab70..f1129b4d9bd 100644 --- a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java @@ -58,7 +58,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.*; import static org.elasticsearch.index.query.FilterBuilders.termFilter; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java index e759186f6ab..98744288677 100644 --- a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java @@ -50,7 +50,7 @@ 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.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numNodes = 0) diff --git a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java index b16f00d1030..1659495421a 100644 --- a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java @@ -14,7 +14,7 @@ import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java index dae679e43c6..54efee8b1a2 100644 --- a/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java +++ b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java @@ -43,8 +43,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java b/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java index bf7509bc10d..a8d300b3057 100644 --- a/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java +++ b/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.rest.util; import org.elasticsearch.rest.support.RestUtils; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class RestUtilsTests extends ElasticSearchTestCase { +public class RestUtilsTests extends ElasticsearchTestCase { @Test public void testDecodeQueryString() { diff --git a/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/src/test/java/org/elasticsearch/script/NativeScriptTests.java index a424225abd2..74a8e163c78 100644 --- a/src/test/java/org/elasticsearch/script/NativeScriptTests.java +++ b/src/test/java/org/elasticsearch/script/NativeScriptTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.inject.ModulesBuilder; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsModule; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.util.Map; @@ -33,7 +33,7 @@ import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class NativeScriptTests extends ElasticSearchTestCase { +public class NativeScriptTests extends ElasticsearchTestCase { @Test public void testNativeScript() { diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java index beeafa5e4e5..2bb0b79ed96 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java index 2c931de1f5c..fc1b2045df8 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; public class SearchWhileRelocatingTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java index a5bd96ce97f..226cd5b504a 100644 --- a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java @@ -52,7 +52,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index 35894a1daaf..0650f7311b1 100644 --- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -48,8 +48,8 @@ import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; import static org.elasticsearch.search.facet.FacetBuilders.termsFacet; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java index db13b784578..fccabe19bac 100644 --- a/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java +++ b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java @@ -40,8 +40,8 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertSearchHits; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java index f812fc2d5b6..206054f6df3 100644 --- a/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java @@ -59,7 +59,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.termFilter; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.search.facet.FacetBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java index bb6131d6984..145c6d40fb5 100644 --- a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java +++ b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java @@ -41,7 +41,7 @@ import java.util.Map; import static org.elasticsearch.client.Requests.refreshRequest; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index b5ed04ff822..6d97b9531fc 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -46,7 +46,7 @@ import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.*; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; public class DecayFunctionScoreTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java index db96cee5089..d3fc3ffe287 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java @@ -33,7 +33,7 @@ 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.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; import static org.elasticsearch.client.Requests.indexRequest; @@ -87,7 +87,7 @@ public class FunctionScorePluginTests extends AbstractIntegrationTest { searchSource().explain(false).query(functionScoreQuery(termQuery("test", "value")).add(gfb)))); SearchResponse sr = response.actionGet(); - ElasticSearchAssertions.assertNoFailures(sr); + ElasticsearchAssertions.assertNoFailures(sr); SearchHits sh = sr.getHits(); assertThat(sh.hits().length, equalTo(2)); diff --git a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java index f2e8e09c9eb..69bbf2f65e1 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java @@ -33,7 +33,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.randomFunction; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertAcked; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java index 44f8bfaf62a..d74bca61f2e 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.facet.FacetBuilders.geoDistanceFacet; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java index 7100c882799..b726dc990d8 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java @@ -44,7 +44,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java index ef63151cbcb..5f21d45d1a2 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java @@ -62,7 +62,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.geoBoundingBoxFilter; import static org.elasticsearch.index.query.FilterBuilders.geoDistanceFilter; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java index deff8f8af5b..23708ede0ca 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java @@ -36,7 +36,7 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.geoIntersectionFilter; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; public class GeoShapeIntegrationTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java index e34f50383ef..947848432db 100644 --- a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java @@ -34,7 +34,7 @@ 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; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHighlight; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHighlight; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java index d965ecdf68a..c8c1a5cc86f 100644 --- a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.hamcrest.Matcher; import org.junit.Test; @@ -50,8 +50,8 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.search.builder.SearchSourceBuilder.highlight; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHighlight; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHighlight; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** @@ -178,7 +178,7 @@ public class HighlighterSearchTests extends AbstractIntegrationTest { endObject(). endObject(). endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("test", builder).setSettings( + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("test", builder).setSettings( ImmutableSettings.settingsBuilder() .put("index.number_of_shards", 1) .put("index.number_of_replicas", 0) .put("analysis.filter.wordDelimiter.type", "word_delimiter") diff --git a/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java index 2392faefae6..ea0ab086374 100644 --- a/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java +++ b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java @@ -25,7 +25,7 @@ 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.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; import static org.elasticsearch.client.Requests.*; @@ -46,7 +46,7 @@ public class SimpleIndicesBoostSearchTests extends AbstractIntegrationTest { @Test public void testIndicesBoost() throws Exception { - ElasticSearchAssertions.assertHitCount(client().prepareSearch().setQuery(termQuery("test", "value")).get(), 0); + ElasticsearchAssertions.assertHitCount(client().prepareSearch().setQuery(termQuery("test", "value")).get(), 0); try { client().prepareSearch("test").setQuery(termQuery("test", "value")).execute().actionGet(); diff --git a/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java index 32274a73995..d95d82ab094 100644 --- a/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java +++ b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItemInArray; diff --git a/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java index dfb3bf42b07..74d631fa0d3 100644 --- a/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java +++ b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java @@ -5,7 +5,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java index e7024e1e63d..5764a67bda8 100644 --- a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java @@ -47,7 +47,7 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.FilterBuilders.*; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java index 93cf5fa1153..c9b190fc894 100644 --- a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java +++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java @@ -40,7 +40,7 @@ import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java index 6222ac7b5e9..7f544c9d78f 100644 --- a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java +++ b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java @@ -33,8 +33,8 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; public class SimpleSearchTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java index edc6fae4fff..c785e06ef90 100644 --- a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java @@ -49,7 +49,7 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java b/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java index 9e86a7ce496..cc5675fe013 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java @@ -47,7 +47,7 @@ import org.elasticsearch.search.suggest.completion.AnalyzingCompletionLookupProv import org.elasticsearch.search.suggest.completion.Completion090PostingsFormat; import org.elasticsearch.search.suggest.completion.Completion090PostingsFormat.LookupFactory; import org.elasticsearch.search.suggest.completion.CompletionSuggestionContext; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; @@ -58,7 +58,7 @@ import java.util.List; import static org.hamcrest.Matchers.equalTo; -public class CompletionPostingsFormatTest extends ElasticSearchTestCase { +public class CompletionPostingsFormatTest extends ElasticsearchTestCase { @Test public void testCompletionPostingsFormat() throws IOException { diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java index 1b6c6e9a6ce..b75683c7c9e 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.search.suggest.completion.CompletionSuggestion; import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder; import org.elasticsearch.search.suggest.completion.CompletionSuggestionFuzzyBuilder; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; import java.io.IOException; @@ -55,7 +55,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; public class CompletionSuggestSearchTests extends AbstractIntegrationTest { @@ -769,7 +769,7 @@ public class CompletionSuggestSearchTests extends AbstractIntegrationTest { for (int i = 0; i < iters; i++) { int len = between(3, 50); String str = replaceReservedChars(randomRealisticUnicodeOfCodepointLengthBetween(len + 1, atLeast(len + 2)), (char) 0x01); - ElasticSearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() + ElasticsearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() .startObject(TYPE).startObject("properties") .startObject(FIELD) .field("type", "completion") @@ -799,7 +799,7 @@ public class CompletionSuggestSearchTests extends AbstractIntegrationTest { // see #3596 public void testVeryLongInput() throws IOException { client().admin().indices().prepareCreate(INDEX).get(); - ElasticSearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() + ElasticsearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() .startObject(TYPE).startObject("properties") .startObject(FIELD) .field("type", "completion") @@ -822,7 +822,7 @@ public class CompletionSuggestSearchTests extends AbstractIntegrationTest { @Test(expected = MapperParsingException.class) public void testReservedChars() throws IOException { client().admin().indices().prepareCreate(INDEX).get(); - ElasticSearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() + ElasticsearchAssertions.assertAcked(client().admin().indices().preparePutMapping(INDEX).setType(TYPE).setSource(jsonBuilder().startObject() .startObject(TYPE).startObject("properties") .startObject(FIELD) .field("type", "completion") diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java b/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java index 44eedcf05af..d5ebfa5e19b 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java @@ -35,14 +35,14 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.IntsRef; import org.elasticsearch.search.suggest.completion.CompletionTokenStream; import org.elasticsearch.search.suggest.completion.CompletionTokenStream.ByteTermAttribute; -import org.elasticsearch.test.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; import java.io.StringReader; import java.util.Set; -public class CompletionTokenStreamTest extends ElasticSearchTokenStreamTestCase { +public class CompletionTokenStreamTest extends ElasticsearchTokenStreamTestCase { final XAnalyzingSuggester suggester = new XAnalyzingSuggester(new SimpleAnalyzer(TEST_VERSION_CURRENT)); diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java index 2d514e14337..6c511ee3f78 100644 --- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder.DirectCandidateGenerator; import org.elasticsearch.search.suggest.term.TermSuggestionBuilder; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; import java.io.IOException; @@ -50,7 +50,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.search.suggest.SuggestBuilder.phraseSuggestion; import static org.elasticsearch.search.suggest.SuggestBuilder.termSuggestion; import static org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder.candidateGenerator; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -425,7 +425,7 @@ public class SuggestSearchTests extends AbstractIntegrationTest { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(builder.addMapping("type1", mapping)); + ElasticsearchAssertions.assertAcked(builder.addMapping("type1", mapping)); ensureGreen(); for (String line: Resources.readLines(SuggestSearchTests.class.getResource("/config/names.txt"), Charsets.UTF_8)) { @@ -683,7 +683,7 @@ public class SuggestSearchTests extends AbstractIntegrationTest { Suggest suggest = searchSuggest(client(), "foobar", termSuggestion("simple") .size(10).minDocFreq(0).field("field1").suggestMode("always")); - ElasticSearchAssertions.assertSuggestionSize(suggest, 0, 3, "simple"); + ElasticsearchAssertions.assertSuggestionSize(suggest, 0, 3, "simple"); } @Test // see #3469 @@ -736,8 +736,8 @@ public class SuggestSearchTests extends AbstractIntegrationTest { .setSuggestText("tetsting sugestion") .addSuggestion(phraseSuggestion("did_you_mean").field("name").maxErrors(5.0f)) .get(); - ElasticSearchAssertions.assertNoFailures(searchResponse); - ElasticSearchAssertions.assertSuggestion(searchResponse.getSuggest(), 0, 0, "did_you_mean", "testing suggestions"); + ElasticsearchAssertions.assertNoFailures(searchResponse); + ElasticsearchAssertions.assertSuggestion(searchResponse.getSuggest(), 0, 0, "did_you_mean", "testing suggestions"); } @Test // see #3469 @@ -759,7 +759,7 @@ public class SuggestSearchTests extends AbstractIntegrationTest { endObject(). endObject(). endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").setSettings(settingsBuilder() + ElasticsearchAssertions.assertAcked(prepareCreate("test").setSettings(settingsBuilder() .put(SETTING_NUMBER_OF_SHARDS, 5) .put(SETTING_NUMBER_OF_REPLICAS, 0) .put("index.analysis.analyzer.suggest.tokenizer", "standard") diff --git a/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java index a04b6a17c85..d37c98c984c 100644 --- a/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java @@ -42,7 +42,7 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; import org.elasticsearch.search.suggest.phrase.NoisyChannelSpellChecker.Result; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.*; @@ -51,7 +51,7 @@ import java.util.Map; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class NoisyChannelSpellCheckerTests extends ElasticSearchTestCase{ +public class NoisyChannelSpellCheckerTests extends ElasticsearchTestCase{ private final BytesRef space = new BytesRef(" "); private final BytesRef preTag = new BytesRef(""); private final BytesRef postTag = new BytesRef(""); diff --git a/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java index de1af0d7ba7..9d26dde9bf6 100644 --- a/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java +++ b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.hamcrest.Matchers; import org.junit.Test; @@ -55,7 +55,7 @@ public class GetTermVectorCheckDocFreqTests extends AbstractIntegrationTest { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping).setSettings( + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping).setSettings( ImmutableSettings.settingsBuilder() .put("index.number_of_shards", 1) .put("index.analysis.analyzer.tv_test.tokenizer", "whitespace") diff --git a/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java b/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java index a25ea817ad4..342e3b5769b 100644 --- a/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java +++ b/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java @@ -34,13 +34,13 @@ import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.core.AbstractFieldMapper; import org.elasticsearch.index.mapper.core.TypeParsers; import org.elasticsearch.index.mapper.internal.AllFieldMapper; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.hamcrest.Matchers; import org.junit.Test; import java.io.IOException; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.equalTo; public class GetTermVectorTests extends AbstractTermVectorTests { @@ -57,7 +57,7 @@ public class GetTermVectorTests extends AbstractTermVectorTests { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); ensureYellow(); @@ -83,7 +83,7 @@ public class GetTermVectorTests extends AbstractTermVectorTests { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); ensureYellow(); // when indexing a field that simply has a question mark, the term @@ -111,7 +111,7 @@ public class GetTermVectorTests extends AbstractTermVectorTests { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping)); ensureYellow(); // when indexing a field that simply has a question mark, the term // vectors will be null @@ -139,7 +139,7 @@ public class GetTermVectorTests extends AbstractTermVectorTests { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping) + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping) .setSettings(ImmutableSettings.settingsBuilder() .put("index.analysis.analyzer.tv_test.tokenizer", "whitespace") .putArray("index.analysis.analyzer.tv_test.filter", "type_as_payload", "lowercase"))); @@ -251,7 +251,7 @@ public class GetTermVectorTests extends AbstractTermVectorTests { .endObject() .endObject() .endObject().endObject(); - ElasticSearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping) + ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("type1", mapping) .setSettings(ImmutableSettings.settingsBuilder() .put("index.analysis.analyzer.tv_test.tokenizer", "whitespace") .putArray("index.analysis.analyzer.tv_test.filter", "type_as_payload", "lowercase"))); diff --git a/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java b/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java index 15059ea2f86..3f762c2b0c7 100644 --- a/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java +++ b/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.rest.action.termvector.RestTermVectorAction; -import org.elasticsearch.test.ElasticSearchLuceneTestCase; +import org.elasticsearch.test.ElasticsearchLuceneTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,7 +51,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class TermVectorUnitTests extends ElasticSearchLuceneTestCase { +public class TermVectorUnitTests extends ElasticsearchLuceneTestCase { @Test public void streamResponse() throws Exception { diff --git a/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java b/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java index dcb2c66b7ce..5e91cef5e08 100644 --- a/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java @@ -74,8 +74,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; @@ -100,7 +100,7 @@ import static org.hamcrest.Matchers.equalTo; */ @Ignore @IntegrationTests -public abstract class AbstractIntegrationTest extends ElasticSearchTestCase { +public abstract class AbstractIntegrationTest extends ElasticsearchTestCase { public static final String INDEX_SEED_SETTING = "index.tests.seed"; @@ -108,7 +108,7 @@ public abstract class AbstractIntegrationTest extends ElasticSearchTestCase { private static final double TRANSPORT_CLIENT_RATIO = transportClientRatio(); - private static final TestCluster globalCluster = new TestCluster(SHARED_CLUSTER_SEED, TestCluster.clusterName("shared", ElasticSearchTestCase.CHILD_VM_ID, SHARED_CLUSTER_SEED)); + private static final TestCluster globalCluster = new TestCluster(SHARED_CLUSTER_SEED, TestCluster.clusterName("shared", ElasticsearchTestCase.CHILD_VM_ID, SHARED_CLUSTER_SEED)); private static TestCluster currentCluster; @@ -633,7 +633,7 @@ public abstract class AbstractIntegrationTest extends ElasticSearchTestCase { }; } - return new TestCluster(currentClusterSeed, numNodes, TestCluster.clusterName(scope.name(), ElasticSearchTestCase.CHILD_VM_ID, currentClusterSeed), nodeSettingsSource); + return new TestCluster(currentClusterSeed, numNodes, TestCluster.clusterName(scope.name(), ElasticsearchTestCase.CHILD_VM_ID, currentClusterSeed), nodeSettingsSource); } @Retention(RetentionPolicy.RUNTIME) diff --git a/src/test/java/org/elasticsearch/test/ElasticSearchLuceneTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java similarity index 92% rename from src/test/java/org/elasticsearch/test/ElasticSearchLuceneTestCase.java rename to src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java index 7185657a9d7..1f107c4c006 100644 --- a/src/test/java/org/elasticsearch/test/ElasticSearchLuceneTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java @@ -30,11 +30,11 @@ import org.elasticsearch.junit.listeners.ReproduceInfoPrinter; @Listeners({ ReproduceInfoPrinter.class }) -@ThreadLeakFilters(defaultFilters = true, filters = {ElasticSearchThreadFilter.class}) +@ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchThreadFilter.class}) @ThreadLeakScope(Scope.NONE) @TimeoutSuite(millis = TimeUnits.HOUR) @SuppressCodecs("Lucene3x") -public abstract class ElasticSearchLuceneTestCase extends LuceneTestCase { +public abstract class ElasticsearchLuceneTestCase extends LuceneTestCase { private static final Codec DEFAULT_CODEC = Codec.getDefault(); diff --git a/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java similarity index 98% rename from src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java rename to src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java index a9a2888c876..02816928de9 100644 --- a/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java @@ -44,11 +44,11 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; -@ThreadLeakFilters(defaultFilters = true, filters = {ElasticSearchThreadFilter.class}) +@ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchThreadFilter.class}) @ThreadLeakScope(Scope.NONE) @TimeoutSuite(millis = TimeUnits.HOUR) // timeout the suite after 1h and fail the test. @Listeners(LoggingListener.class) -public abstract class ElasticSearchTestCase extends AbstractRandomizedTest { +public abstract class ElasticsearchTestCase extends AbstractRandomizedTest { protected final ESLogger logger = Loggers.getLogger(getClass()); diff --git a/src/test/java/org/elasticsearch/test/ElasticSearchThreadFilter.java b/src/test/java/org/elasticsearch/test/ElasticsearchThreadFilter.java similarity index 93% rename from src/test/java/org/elasticsearch/test/ElasticSearchThreadFilter.java rename to src/test/java/org/elasticsearch/test/ElasticsearchThreadFilter.java index fdc7175c43e..b3f939c1df2 100644 --- a/src/test/java/org/elasticsearch/test/ElasticSearchThreadFilter.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchThreadFilter.java @@ -21,7 +21,7 @@ package org.elasticsearch.test; import com.carrotsearch.randomizedtesting.ThreadFilter; -public class ElasticSearchThreadFilter implements ThreadFilter { +public class ElasticsearchThreadFilter implements ThreadFilter { @Override public boolean reject(Thread t) { return true; diff --git a/src/test/java/org/elasticsearch/test/ElasticSearchTokenStreamTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java similarity index 91% rename from src/test/java/org/elasticsearch/test/ElasticSearchTokenStreamTestCase.java rename to src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java index 03438b49c3b..cd83ddc9e79 100644 --- a/src/test/java/org/elasticsearch/test/ElasticSearchTokenStreamTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java @@ -28,9 +28,9 @@ import org.elasticsearch.junit.listeners.ReproduceInfoPrinter; @Listeners({ ReproduceInfoPrinter.class }) -@ThreadLeakFilters(defaultFilters = true, filters = {ElasticSearchThreadFilter.class}) +@ThreadLeakFilters(defaultFilters = true, filters = {ElasticsearchThreadFilter.class}) @ThreadLeakScope(Scope.NONE) @TimeoutSuite(millis = TimeUnits.HOUR) -public abstract class ElasticSearchTokenStreamTestCase extends BaseTokenStreamTestCase { +public abstract class ElasticsearchTokenStreamTestCase extends BaseTokenStreamTestCase { } diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchAssertions.java b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java similarity index 97% rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchAssertions.java rename to src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index 923501c89bb..214898e55a2 100644 --- a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchAssertions.java +++ b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -43,7 +43,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.suggest.Suggest; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -61,7 +61,7 @@ import static org.junit.Assert.fail; /** * */ -public class ElasticSearchAssertions { +public class ElasticsearchAssertions { public static void assertAcked(PutMappingRequestBuilder builder) { assertAcked(builder.get()); @@ -236,15 +236,15 @@ public class ElasticSearchAssertions { * matchers */ public static Matcher hasId(final String id) { - return new ElasticSearchMatchers.SearchHitHasIdMatcher(id); + return new ElasticsearchMatchers.SearchHitHasIdMatcher(id); } public static Matcher hasType(final String type) { - return new ElasticSearchMatchers.SearchHitHasTypeMatcher(type); + return new ElasticsearchMatchers.SearchHitHasTypeMatcher(type); } public static Matcher hasIndex(final String index) { - return new ElasticSearchMatchers.SearchHitHasIndexMatcher(index); + return new ElasticsearchMatchers.SearchHitHasIndexMatcher(index); } public static T assertBooleanSubQuery(Query query, Class subqueryType, int i) { @@ -296,8 +296,8 @@ public class ElasticSearchAssertions { } public static void assertVersionSerializable(Streamable streamable) { - assert Version.CURRENT.after(ElasticSearchTestCase.getPreviousVersion()); - assertVersionSerializable(ElasticSearchTestCase.randomVersion(), streamable); + assert Version.CURRENT.after(ElasticsearchTestCase.getPreviousVersion()); + assertVersionSerializable(ElasticsearchTestCase.randomVersion(), streamable); } public static void assertVersionSerializable(Version version, Streamable streamable) { diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchGeoAssertions.java b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java similarity index 99% rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchGeoAssertions.java rename to src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java index de7ab6ffcba..967eba4b14e 100644 --- a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchGeoAssertions.java +++ b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchGeoAssertions.java @@ -34,7 +34,7 @@ import com.vividsolutions.jts.geom.MultiPoint; import com.vividsolutions.jts.geom.MultiPolygon; import com.vividsolutions.jts.geom.Polygon; -public class ElasticSearchGeoAssertions { +public class ElasticsearchGeoAssertions { private static int top(Coordinate...points) { int top = 0; diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchMatchers.java b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java similarity index 98% rename from src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchMatchers.java rename to src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java index aa05eed1812..d3cfbe4d19c 100644 --- a/src/test/java/org/elasticsearch/test/hamcrest/ElasticSearchMatchers.java +++ b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java @@ -22,7 +22,7 @@ import org.elasticsearch.search.SearchHit; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -public class ElasticSearchMatchers { +public class ElasticsearchMatchers { public static class SearchHitHasIdMatcher extends TypeSafeMatcher { private String id; diff --git a/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java b/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java index d8150c80c56..bdfa09025a4 100644 --- a/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java +++ b/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java @@ -24,8 +24,8 @@ import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.ElasticSearchTestCase; -import org.elasticsearch.test.hamcrest.ElasticSearchAssertions; +import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; import org.elasticsearch.transport.local.LocalTransport; @@ -48,13 +48,13 @@ public class AssertingLocalTransport extends LocalTransport { @Override protected void handleParsedRespone(final TransportResponse response, final TransportResponseHandler handler) { - ElasticSearchAssertions.assertVersionSerializable(ElasticSearchTestCase.randomVersion(random), response); + ElasticsearchAssertions.assertVersionSerializable(ElasticsearchTestCase.randomVersion(random), response); super.handleParsedRespone(response, handler); } @Override public void sendRequest(final DiscoveryNode node, final long requestId, final String action, final TransportRequest request, TransportRequestOptions options) throws IOException, TransportException { - ElasticSearchAssertions.assertVersionSerializable(ElasticSearchTestCase.randomVersion(random), request); + ElasticsearchAssertions.assertVersionSerializable(ElasticsearchTestCase.randomVersion(random), request); super.sendRequest(node, requestId, action, request, options); } } diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/IndexFieldDataServiceTests.java b/src/test/java/org/elasticsearch/test/unit/index/fielddata/IndexFieldDataServiceTests.java index 44a04a3778f..792d07472af 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/IndexFieldDataServiceTests.java +++ b/src/test/java/org/elasticsearch/test/unit/index/fielddata/IndexFieldDataServiceTests.java @@ -30,11 +30,11 @@ import org.elasticsearch.index.mapper.ContentPath; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.Mapper.BuilderContext; import org.elasticsearch.index.mapper.core.*; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import java.util.Arrays; -public class IndexFieldDataServiceTests extends ElasticSearchTestCase { +public class IndexFieldDataServiceTests extends ElasticsearchTestCase { private static Settings DOC_VALUES_SETTINGS = ImmutableSettings.builder().put(FieldDataType.FORMAT_KEY, FieldDataType.DOC_VALUES_FORMAT_VALUE).build(); diff --git a/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java index 9a368ba8bfb..e1d71c3ede0 100644 --- a/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java +++ b/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool; import com.google.common.util.concurrent.ListeningExecutorService; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool.Names; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class UpdateThreadPoolSettingsTests extends ElasticSearchTestCase { +public class UpdateThreadPoolSettingsTests extends ElasticsearchTestCase { private ThreadPool.Info info(ThreadPool threadPool, String name) { for (ThreadPool.Info info : threadPool.info()) { diff --git a/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java b/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java index ef61291395e..5f8809b4113 100644 --- a/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java +++ b/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.junit.annotations.TestLogging; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.After; import org.junit.Before; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public abstract class AbstractSimpleTransportTests extends ElasticSearchTestCase { +public abstract class AbstractSimpleTransportTests extends ElasticsearchTestCase { protected ThreadPool threadPool; diff --git a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java index 890061c29ff..6a61930c3c6 100644 --- a/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java +++ b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.transport.netty; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.common.util.concurrent.KeyedLock; -import org.elasticsearch.test.ElasticSearchTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class KeyedLockTests extends ElasticSearchTestCase { +public class KeyedLockTests extends ElasticsearchTestCase { @Test public void checkIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedException { diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java index 58f6c62977a..9736dd60975 100644 --- a/src/test/java/org/elasticsearch/update/UpdateTests.java +++ b/src/test/java/org/elasticsearch/update/UpdateTests.java @@ -40,7 +40,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; public class UpdateTests extends AbstractIntegrationTest { diff --git a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java index 3c20b6a207d..703eacc8e87 100644 --- a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java +++ b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java @@ -40,7 +40,7 @@ import org.junit.Test; import java.io.IOException; import static org.elasticsearch.index.query.QueryBuilders.queryString; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.*; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java index fc97056b2b1..7126e6d4166 100644 --- a/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java +++ b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java @@ -33,7 +33,7 @@ import org.junit.Test; import java.util.HashMap; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertThrows; +import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.equalTo; /**