s/ElasticSearch/Elasticsearch in src/test

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 {

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 {

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() {

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 {

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 {

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 {

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 {

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() {

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 {

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() {

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 {

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() {

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

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);
 

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);
 

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);
 

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

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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

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);
 

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);
 

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);

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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);
 

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() {

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 {

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() {

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 {

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() {

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 {

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.ElasticsearchTestCase;
-import org.elasticsearch.test.hamcrest.ElasticSearchGeoAssertions;
+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);
     }
 
 }

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.assertMultiLineString;
-import static org.elasticsearch.test.hamcrest.ElasticSearchGeoAssertions.assertMultiPolygon;
+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() {

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 {

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 {

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 {

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() {

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 {

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 {

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 {

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 {

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 {

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;

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;

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 {

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);

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() {

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() {

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() {

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 {

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 {

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() {

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() {

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() {

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() {

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() {

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() {

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<Double> {
         

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)];

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 {

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 {

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 {

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());

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<String, Object> getMap(Object... keyValues) {
         Map<String, Object> map = new HashMap<String, Object>();

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 {

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;

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.assertHitCount;
-import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
 public class SimpleCountTests extends AbstractIntegrationTest {
 

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;
 

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 {

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() {

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() {

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 {

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 {

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);

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() {

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.assertNoFailures;
-import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertSearchHits;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
 import static org.hamcrest.Matchers.*;
 
 /**

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;
 

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;
 
 /**

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.assertHitCount;
-import static org.elasticsearch.test.hamcrest.ElasticSearchAssertions.assertNoFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.equalTo;
 
 /**

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.*;
 
 /**

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)

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 {
 

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());
     }

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() {