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 1b6d94f95d0..46953a1b419 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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java b/src/test/java/org/elasticsearch/AbstractNodesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java rename to src/test/java/org/elasticsearch/AbstractNodesTests.java index 84c5a27e33b..204d69f4bfc 100644 --- a/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java +++ b/src/test/java/org/elasticsearch/AbstractNodesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.google.common.collect.ImmutableSet; import org.elasticsearch.client.Client; diff --git a/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java b/src/test/java/org/elasticsearch/AbstractSharedClusterTest.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java rename to src/test/java/org/elasticsearch/AbstractSharedClusterTest.java index 6aef1bc006a..e7ebb767739 100644 --- a/src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java +++ b/src/test/java/org/elasticsearch/AbstractSharedClusterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.google.common.base.Joiner; import com.google.common.collect.Iterators; diff --git a/src/test/java/org/elasticsearch/test/integration/ClusterManager.java b/src/test/java/org/elasticsearch/ClusterManager.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/ClusterManager.java rename to src/test/java/org/elasticsearch/ClusterManager.java index da959b39943..19ccec5c72e 100644 --- a/src/test/java/org/elasticsearch/test/integration/ClusterManager.java +++ b/src/test/java/org/elasticsearch/ClusterManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import java.util.Random; diff --git a/src/test/java/org/elasticsearch/test/unit/ElasticSearchExceptionTests.java b/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/ElasticSearchExceptionTests.java rename to src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java index a0a43ce485c..d55064a49d6 100644 --- a/src/test/java/org/elasticsearch/test/unit/ElasticSearchExceptionTests.java +++ b/src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit; +package org.elasticsearch; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.index.Index; diff --git a/src/test/java/org/elasticsearch/test/integration/ElasticSearchThreadFilter.java b/src/test/java/org/elasticsearch/ElasticSearchThreadFilter.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/ElasticSearchThreadFilter.java rename to src/test/java/org/elasticsearch/ElasticSearchThreadFilter.java index c1702a6daf5..011ad8f022c 100644 --- a/src/test/java/org/elasticsearch/test/integration/ElasticSearchThreadFilter.java +++ b/src/test/java/org/elasticsearch/ElasticSearchThreadFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.carrotsearch.randomizedtesting.ThreadFilter; diff --git a/src/test/java/org/elasticsearch/test/integration/ElasticSearchTokenStreamTestCase.java b/src/test/java/org/elasticsearch/ElasticSearchTokenStreamTestCase.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/ElasticSearchTokenStreamTestCase.java rename to src/test/java/org/elasticsearch/ElasticSearchTokenStreamTestCase.java index 83b85c2cfa6..102f392a8c3 100644 --- a/src/test/java/org/elasticsearch/test/integration/ElasticSearchTokenStreamTestCase.java +++ b/src/test/java/org/elasticsearch/ElasticSearchTokenStreamTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.carrotsearch.randomizedtesting.annotations.*; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; diff --git a/src/test/java/org/elasticsearch/test/integration/ElasticsearchLuceneTestCase.java b/src/test/java/org/elasticsearch/ElasticsearchLuceneTestCase.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/ElasticsearchLuceneTestCase.java rename to src/test/java/org/elasticsearch/ElasticsearchLuceneTestCase.java index cd2c0e771af..e54de180a56 100644 --- a/src/test/java/org/elasticsearch/test/integration/ElasticsearchLuceneTestCase.java +++ b/src/test/java/org/elasticsearch/ElasticsearchLuceneTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.carrotsearch.randomizedtesting.annotations.*; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; diff --git a/src/test/java/org/elasticsearch/test/integration/ElasticsearchTestCase.java b/src/test/java/org/elasticsearch/ElasticsearchTestCase.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/ElasticsearchTestCase.java rename to src/test/java/org/elasticsearch/ElasticsearchTestCase.java index c588046b260..b96f9b2c41b 100644 --- a/src/test/java/org/elasticsearch/test/integration/ElasticsearchTestCase.java +++ b/src/test/java/org/elasticsearch/ElasticsearchTestCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.carrotsearch.randomizedtesting.annotations.Listeners; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; diff --git a/src/test/java/org/elasticsearch/test/integration/TestCluster.java b/src/test/java/org/elasticsearch/TestCluster.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/TestCluster.java rename to src/test/java/org/elasticsearch/TestCluster.java index 3108916abae..61aad3aeab3 100644 --- a/src/test/java/org/elasticsearch/test/integration/TestCluster.java +++ b/src/test/java/org/elasticsearch/TestCluster.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration; +package org.elasticsearch; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/src/test/java/org/elasticsearch/test/unit/VersionTests.java b/src/test/java/org/elasticsearch/VersionTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/VersionTests.java rename to src/test/java/org/elasticsearch/VersionTests.java index e846ef9c96f..1355a085abc 100644 --- a/src/test/java/org/elasticsearch/test/unit/VersionTests.java +++ b/src/test/java/org/elasticsearch/VersionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit; +package org.elasticsearch; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java similarity index 92% rename from src/test/java/org/elasticsearch/test/unit/action/bulk/BulkRequestTests.java rename to src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java index ba33a82d8f5..b7c5ff6b6f6 100644 --- a/src/test/java/org/elasticsearch/test/unit/action/bulk/BulkRequestTests.java +++ b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.action.bulk; +package org.elasticsearch.action.bulk; -import org.elasticsearch.action.bulk.BulkRequest; 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.common.io.Streams; import org.junit.Test; import com.google.common.base.Charsets; @@ -38,7 +36,7 @@ public class BulkRequestTests { @Test public void testSimpleBulk1() throws Exception { - String bulkAction = copyToStringFromClasspath("/org/elasticsearch/test/unit/action/bulk/simple-bulk.json"); + String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk.json"); BulkRequest bulkRequest = new BulkRequest(); bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), true, null, null); assertThat(bulkRequest.numberOfActions(), equalTo(3)); @@ -49,7 +47,7 @@ public class BulkRequestTests { @Test public void testSimpleBulk2() throws Exception { - String bulkAction = copyToStringFromClasspath("/org/elasticsearch/test/unit/action/bulk/simple-bulk2.json"); + String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk2.json"); BulkRequest bulkRequest = new BulkRequest(); bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), true, null, null); assertThat(bulkRequest.numberOfActions(), equalTo(3)); @@ -57,7 +55,7 @@ public class BulkRequestTests { @Test public void testSimpleBulk3() throws Exception { - String bulkAction = copyToStringFromClasspath("/org/elasticsearch/test/unit/action/bulk/simple-bulk3.json"); + String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk3.json"); BulkRequest bulkRequest = new BulkRequest(); bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), true, null, null); assertThat(bulkRequest.numberOfActions(), equalTo(3)); @@ -65,7 +63,7 @@ public class BulkRequestTests { @Test public void testSimpleBulk4() throws Exception { - String bulkAction = copyToStringFromClasspath("/org/elasticsearch/test/unit/action/bulk/simple-bulk4.json"); + String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk4.json"); BulkRequest bulkRequest = new BulkRequest(); bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), true, null, null); assertThat(bulkRequest.numberOfActions(), equalTo(4)); diff --git a/src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk2.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk2.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk3.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk3.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk4.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk4.json rename to src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/percolate/MultiPercolatorRequestTests.java b/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/action/percolate/MultiPercolatorRequestTests.java rename to src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java index 10a82e82399..e25800584c8 100644 --- a/src/test/java/org/elasticsearch/test/unit/action/percolate/MultiPercolatorRequestTests.java +++ b/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java @@ -16,10 +16,8 @@ * the License. */ -package org.elasticsearch.test.unit.action.percolate; +package org.elasticsearch.action.percolate; -import org.elasticsearch.action.percolate.MultiPercolateRequest; -import org.elasticsearch.action.percolate.PercolateRequest; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.io.Streams; @@ -37,7 +35,7 @@ public class MultiPercolatorRequestTests { @Test public void testParseBulkRequests() throws Exception { - byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/percolate/mpercolate1.json"); + byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/percolate/mpercolate1.json"); MultiPercolateRequest request = new MultiPercolateRequest().add(data, 0, data.length, false); assertThat(request.requests().size(), equalTo(6)); @@ -122,7 +120,7 @@ public class MultiPercolatorRequestTests { @Test public void testParseBulkRequests_defaults() throws Exception { - byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/percolate/mpercolate2.json"); + byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/percolate/mpercolate2.json"); MultiPercolateRequest request = new MultiPercolateRequest(); request.indices("my-index1").documentType("my-type1").ignoreIndices(IgnoreIndices.MISSING); request.add(data, 0, data.length, false); diff --git a/src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate1.json b/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate1.json rename to src/test/java/org/elasticsearch/action/percolate/mpercolate1.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate2.json b/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate2.json rename to src/test/java/org/elasticsearch/action/percolate/mpercolate2.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java b/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java rename to src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java index 34c659280ea..a69c58e0040 100644 --- a/src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java +++ b/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java @@ -17,10 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.action.search; +package org.elasticsearch.action.search; -import org.elasticsearch.action.search.MultiSearchRequest; -import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.io.Streams; import org.junit.Test; @@ -34,7 +32,7 @@ public class MultiSearchRequestTests { @Test public void simpleAdd() throws Exception { - byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch1.json"); + byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/search/simple-msearch1.json"); MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null); assertThat(request.requests().size(), equalTo(5)); assertThat(request.requests().get(0).indices()[0], equalTo("test")); @@ -52,7 +50,7 @@ public class MultiSearchRequestTests { @Test public void simpleAdd2() throws Exception { - byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch2.json"); + byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/search/simple-msearch2.json"); MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null); assertThat(request.requests().size(), equalTo(5)); assertThat(request.requests().get(0).indices()[0], equalTo("test")); @@ -70,7 +68,7 @@ public class MultiSearchRequestTests { @Test public void simpleAdd3() throws Exception { - byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/test/unit/action/search/simple-msearch3.json"); + byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/search/simple-msearch3.json"); MultiSearchRequest request = new MultiSearchRequest().add(data, 0, data.length, false, null, null, null); assertThat(request.requests().size(), equalTo(4)); assertThat(request.requests().get(0).indices()[0], equalTo("test0")); diff --git a/src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch1.json b/src/test/java/org/elasticsearch/action/search/simple-msearch1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch1.json rename to src/test/java/org/elasticsearch/action/search/simple-msearch1.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch2.json b/src/test/java/org/elasticsearch/action/search/simple-msearch2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch2.json rename to src/test/java/org/elasticsearch/action/search/simple-msearch2.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch3.json b/src/test/java/org/elasticsearch/action/search/simple-msearch3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch3.json rename to src/test/java/org/elasticsearch/action/search/simple-msearch3.json diff --git a/src/test/java/org/elasticsearch/test/unit/action/suggest/SuggestActionTests.java b/src/test/java/org/elasticsearch/action/suggest/SuggestActionTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/unit/action/suggest/SuggestActionTests.java rename to src/test/java/org/elasticsearch/action/suggest/SuggestActionTests.java index 179710502a3..e244829715c 100644 --- a/src/test/java/org/elasticsearch/test/unit/action/suggest/SuggestActionTests.java +++ b/src/test/java/org/elasticsearch/action/suggest/SuggestActionTests.java @@ -17,16 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.action.suggest; +package org.elasticsearch.action.suggest; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.ShardSearchFailure; -import org.elasticsearch.action.suggest.SuggestRequestBuilder; -import org.elasticsearch.action.suggest.SuggestResponse; import org.elasticsearch.client.Client; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder; -import org.elasticsearch.test.integration.search.suggest.SuggestSearchTests; +import org.elasticsearch.search.suggest.SuggestSearchTests; import java.util.Arrays; diff --git a/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java rename to src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java index f39bc1f7052..3e5245d5eea 100644 --- a/src/test/java/org/elasticsearch/test/integration/aliases/IndexAliasesTests.java +++ b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.aliases; +package org.elasticsearch.aliases; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -42,7 +42,7 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Set; diff --git a/src/test/java/org/elasticsearch/test/integration/blocks/SimpleBlocksTests.java b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/blocks/SimpleBlocksTests.java rename to src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java index 35b7762bd6e..8ee29901b14 100644 --- a/src/test/java/org/elasticsearch/test/integration/blocks/SimpleBlocksTests.java +++ b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.blocks; +package org.elasticsearch.blocks; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; @@ -32,7 +32,7 @@ import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.node.Node; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java rename to src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java index fc9e18035a9..a87211c19e8 100644 --- a/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.java +++ b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.broadcast; +package org.elasticsearch.broadcast; import com.google.common.base.Charsets; import org.elasticsearch.action.ShardOperationFailedException; @@ -29,7 +29,7 @@ import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java b/src/test/java/org/elasticsearch/cluster/AbstractZenNodesTests.java similarity index 92% rename from src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java rename to src/test/java/org/elasticsearch/cluster/AbstractZenNodesTests.java index 85646d28eaf..c3ea59640b0 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/AbstractZenNodesTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java rename to src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java index dbdf9649945..ac9b6c78c8d 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/ClusterHealthTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/ClusterServiceTests.java b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/cluster/ClusterServiceTests.java rename to src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java index 50c6043a6cb..2af3f1a81b4 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/ClusterServiceTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.cluster.*; import org.elasticsearch.cluster.service.PendingClusterTask; import org.elasticsearch.common.Priority; import org.elasticsearch.common.component.AbstractLifecycleComponent; diff --git a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java index cd450fcbfe1..f83209308a8 100644 --- a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java +++ b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java rename to src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java index dd7536f1069..d9075e4460d 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import com.google.common.base.Predicate; import com.google.common.collect.Sets; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; -import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.java b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.java rename to src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java index 39be783f0b1..b7fcd1b3c61 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.java +++ b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import com.google.common.base.Predicate; import org.elasticsearch.action.percolate.PercolateSourceBuilder; -import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -29,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.node.Node; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java b/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java rename to src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java index 131f0e78a2d..62554f20290 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java rename to src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java index 252878af4e7..373978e7e74 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.junit.After; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/UpdateSettingsValidationTests.java b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/cluster/UpdateSettingsValidationTests.java rename to src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java index feeade9dd16..d4ee5e198d0 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/UpdateSettingsValidationTests.java +++ b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster; +package org.elasticsearch.cluster; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java index 48247ebc29b..467588fd02f 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster.allocation; +package org.elasticsearch.cluster.allocation; import gnu.trove.map.hash.TObjectIntHashMap; import org.apache.lucene.util.LuceneTestCase.Slow; @@ -31,7 +31,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java rename to src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java index 44f437f9cbc..5ce7a44be06 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster.allocation; +package org.elasticsearch.cluster.allocation; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -35,7 +35,7 @@ import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java index fe07011eef2..f8b67e5ba90 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.cluster.allocation; +package org.elasticsearch.cluster.allocation; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.cluster.ClusterState; @@ -29,7 +29,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ShardsAllocatorModuleTests.java b/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/cluster/allocation/ShardsAllocatorModuleTests.java rename to src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java index a8e2569a0e3..d0bc3801013 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/ShardsAllocatorModuleTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.cluster.allocation; +package org.elasticsearch.cluster.allocation; /* * Licensed to ElasticSearch and Shay Banon under one @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/SimpleAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/cluster/allocation/SimpleAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java index ce95eed510c..ea3922cece5 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/allocation/SimpleAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.cluster.allocation; +package org.elasticsearch.cluster.allocation; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; @@ -28,7 +28,7 @@ import java.util.Map.Entry; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; public class SimpleAllocationTests extends AbstractSharedClusterTest { diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/MappingMetaDataParserTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/cluster/metadata/MappingMetaDataParserTests.java rename to src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java index 46f35963ca2..7612c277b4b 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/MappingMetaDataParserTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.metadata; +package org.elasticsearch.cluster.metadata; -import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.compress.CompressedString; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/MetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/metadata/MetaDataTests.java rename to src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java index ca41fbcc1d5..0606227a637 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/MetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java @@ -17,13 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.metadata; +package org.elasticsearch.cluster.metadata; import com.google.common.collect.Sets; import org.elasticsearch.action.support.IgnoreIndices; -import org.elasticsearch.cluster.metadata.AliasMetaData; -import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.indices.IndexMissingException; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/ToAndFromJsonMetaDataTests.java b/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/metadata/ToAndFromJsonMetaDataTests.java rename to src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java index 3dc08231938..050e1cffaff 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/metadata/ToAndFromJsonMetaDataTests.java +++ b/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java @@ -17,10 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.metadata; +package org.elasticsearch.cluster.metadata; -import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/node/DiscoveryNodeFiltersTests.java b/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/node/DiscoveryNodeFiltersTests.java rename to src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java index 934b5407922..7de0627652f 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/node/DiscoveryNodeFiltersTests.java +++ b/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java @@ -17,12 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.node; +package org.elasticsearch.cluster.node; import com.google.common.collect.ImmutableMap; import org.elasticsearch.Version; -import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.cluster.node.DiscoveryNodeFilters; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.DummyTransportAddress; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AddIncrementallyTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AddIncrementallyTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java index 5ce0cceeb30..02290365a51 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AddIncrementallyTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; import static org.elasticsearch.cluster.metadata.IndexMetaData.newIndexMetaDataBuilder; @@ -8,7 +8,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import org.elasticsearch.cluster.ClusterState; @@ -19,7 +19,6 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocatePostApiFlagTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java similarity index 92% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocatePostApiFlagTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java index 9c51c5f1e11..132eb460815 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocatePostApiFlagTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -35,7 +33,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocationCommandsTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocationCommandsTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index d3682ee4b31..3cffbd7aba5 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocationCommandsTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.routing.allocation.command.AllocateAllocationCommand; import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.CancelAllocationCommand; @@ -49,7 +47,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AwarenessAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java index 830768a1c19..4c3837b2ad4 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AwarenessAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import com.google.common.collect.ImmutableMap; import org.elasticsearch.cluster.ClusterState; @@ -25,10 +25,9 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -38,7 +37,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/BalanceConfigurationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/BalanceConfigurationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index 36738c69de1..b8bc3b0b811 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.ClusterState; @@ -26,10 +26,6 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.*; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.FailedRerouteAllocation; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; -import org.elasticsearch.cluster.routing.allocation.StartedRerouteAllocation; import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocators; @@ -53,7 +49,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; public class BalanceConfigurationTests { diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ClusterRebalanceRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index 10af8023a50..d07e2af6184 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -36,7 +35,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java index 4a0440f7f8f..c4230930bcd 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -35,7 +34,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DeadNodesAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DeadNodesAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java index 3dd541e1ec2..94097934f70 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DeadNodesAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.elasticsearch.common.logging.ESLogger; @@ -37,7 +35,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DisableAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DisableAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java index bf71686dccb..a9aa9baddd0 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DisableAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.DisableAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -37,7 +36,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java index 945e29f26b5..20cab10ee54 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -37,7 +36,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedNodeRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedNodeRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 98be407efbb..017b2b51ff4 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -37,6 +36,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -62,7 +62,7 @@ public class FailedNodeRoutingTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); logger.info("start 4 nodes"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1")).put(RoutingAllocationTests.newNode("node2")).put(RoutingAllocationTests.newNode("node3")).put(RoutingAllocationTests.newNode("node4"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1")).put(newNode("node2")).put(newNode("node3")).put(newNode("node4"))).build(); RoutingTable prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -122,7 +122,7 @@ public class FailedNodeRoutingTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); logger.info("start 4 nodes"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1")).put(RoutingAllocationTests.newNode("node2")).put(RoutingAllocationTests.newNode("node3")).put(RoutingAllocationTests.newNode("node4"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1")).put(newNode("node2")).put(newNode("node3")).put(newNode("node4"))).build(); RoutingTable prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedShardsRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedShardsRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java index 3680451ead2..d89e555912e 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; @@ -25,8 +25,6 @@ import org.elasticsearch.cluster.routing.ImmutableShardRouting; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.elasticsearch.common.logging.ESLogger; @@ -40,7 +38,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FilterRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FilterRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java index 40cdbd20420..8c745db2442 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FilterRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import com.google.common.collect.ImmutableMap; import org.elasticsearch.cluster.ClusterState; @@ -25,7 +25,6 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.hamcrest.Matchers; @@ -40,7 +39,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/IndexBalanceTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/IndexBalanceTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java index 330dfd85283..3416c55b072 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/IndexBalanceTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; @@ -37,7 +36,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PreferPrimaryAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java index 3ff528eb8c4..bc0c3d8cec3 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PreferPrimaryAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java @@ -17,15 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -35,7 +34,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.Matchers.equalTo; /** diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryElectionRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java index 6a8336241af..b6bfa6a004f 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryElectionRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -37,7 +35,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java index b5c3ccca947..78dfbea73b2 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -36,7 +35,7 @@ import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RandomAllocationDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RandomAllocationDeciderTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index e355b93daa2..6335b86e5ce 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.ClusterState; @@ -28,15 +28,13 @@ import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocators; import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider; 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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,7 +49,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.Matchers.equalTo; public class RandomAllocationDeciderTests extends ElasticsearchTestCase { diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RebalanceAfterActiveTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RebalanceAfterActiveTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java index 15dbac0741b..32515e49e16 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RebalanceAfterActiveTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -36,7 +35,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java index d14e20bdb79..474aa7f16fc 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -35,7 +34,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RoutingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RoutingAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java index 9bcc2e25778..a5e2edbb6f6 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RoutingAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SameShardRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SameShardRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java index 81eb7aaf8ce..7b04938d64a 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SameShardRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java @@ -1,11 +1,10 @@ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -19,7 +18,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardVersioningTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardVersioningTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java index 012a14c84d5..9f7d5a15e54 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardVersioningTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -36,7 +35,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardsLimitAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardsLimitAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java index 55adf2463d3..23b8dcfa778 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardsLimitAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -26,7 +26,6 @@ import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -40,7 +39,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java index a3dbed7baa6..b0767ea2d3c 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; @@ -27,7 +27,6 @@ import org.elasticsearch.cluster.routing.MutableShardRouting; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -43,6 +42,7 @@ import static org.elasticsearch.cluster.metadata.MetaData.newMetaDataBuilder; import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -77,7 +77,7 @@ public class SingleShardNoReplicasRoutingTests { assertThat(routingTable.index("test").shard(0).shards().get(0).currentNodeId(), nullValue()); logger.info("Adding one node and performing rerouting"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1"))).build(); RoutingTable prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -109,7 +109,7 @@ public class SingleShardNoReplicasRoutingTests { assertThat(routingTable.index("test").shard(0).shards().get(0).currentNodeId(), equalTo("node1")); logger.info("Starting another node and making sure nothing changed"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(RoutingAllocationTests.newNode("node2"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(newNode("node2"))).build(); prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -136,7 +136,7 @@ public class SingleShardNoReplicasRoutingTests { assertThat(routingTable.index("test").shard(0).shards().get(0).currentNodeId(), equalTo("node2")); logger.info("Start another node, make sure that things remain the same (shard is in node2 and initializing)"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(RoutingAllocationTests.newNode("node3"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(newNode("node3"))).build(); prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -179,7 +179,7 @@ public class SingleShardNoReplicasRoutingTests { assertThat(routingTable.index("test").shard(0).shards().get(0).currentNodeId(), nullValue()); logger.info("Adding one node and rerouting"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1"))).build(); RoutingTable prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -243,7 +243,7 @@ public class SingleShardNoReplicasRoutingTests { DiscoveryNodes.Builder nodesBuilder = newNodesBuilder(); List nodes = newArrayList(); for (int i = 0; i < (numberOfIndices / 2); i++) { - nodesBuilder.put(RoutingAllocationTests.newNode("node" + i)); + nodesBuilder.put(newNode("node" + i)); } RoutingTable prevRoutingTable = routingTable; clusterState = newClusterStateBuilder().state(clusterState).nodes(nodesBuilder).build(); @@ -281,7 +281,7 @@ public class SingleShardNoReplicasRoutingTests { logger.info("Adding additional " + (numberOfIndices / 2) + " nodes, nothing should change"); nodesBuilder = newNodesBuilder().putAll(clusterState.nodes()); for (int i = (numberOfIndices / 2); i < numberOfIndices; i++) { - nodesBuilder.put(RoutingAllocationTests.newNode("node" + i)); + nodesBuilder.put(newNode("node" + i)); } prevRoutingTable = routingTable; clusterState = newClusterStateBuilder().state(clusterState).nodes(nodesBuilder).build(); @@ -348,7 +348,7 @@ public class SingleShardNoReplicasRoutingTests { logger.info("Starting 3 nodes and rerouting"); clusterState = newClusterStateBuilder().state(clusterState) - .nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1")).put(RoutingAllocationTests.newNode("node2")).put(RoutingAllocationTests.newNode("node3"))) + .nodes(newNodesBuilder().put(newNode("node1")).put(newNode("node2")).put(newNode("node3"))) .build(); RoutingTable prevRoutingTable = routingTable; routingTable = strategy.reroute(clusterState).routingTable(); @@ -369,7 +369,7 @@ public class SingleShardNoReplicasRoutingTests { logger.info("Start two more nodes, things should remain the same"); clusterState = newClusterStateBuilder().state(clusterState) - .nodes(newNodesBuilder().putAll(clusterState.nodes()).put(RoutingAllocationTests.newNode("node4")).put(RoutingAllocationTests.newNode("node5"))) + .nodes(newNodesBuilder().putAll(clusterState.nodes()).put(newNode("node4")).put(newNode("node5"))) .build(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java index ba5a34b0f32..1cb56c87300 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -35,7 +34,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java index 9e7f30c830a..7351febe970 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -35,7 +34,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ThrottlingAllocationTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ThrottlingAllocationTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java index 9ab2f06cdfb..bc78bed88ff 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -33,6 +32,7 @@ import static org.elasticsearch.cluster.metadata.MetaData.newMetaDataBuilder; import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -64,7 +64,7 @@ public class ThrottlingAllocationTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); logger.info("start one node, do reroute, only 3 should initialize"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1"))).build(); routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -125,7 +125,7 @@ public class ThrottlingAllocationTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); logger.info("start one node, do reroute, only 3 should initialize"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(RoutingAllocationTests.newNode("node1"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().put(newNode("node1"))).build(); routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); @@ -150,7 +150,7 @@ public class ThrottlingAllocationTests { assertThat(routingTable.shardsWithState(UNASSIGNED).size(), equalTo(5)); logger.info("start another node, replicas should start being allocated"); - clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(RoutingAllocationTests.newNode("node2"))).build(); + clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder().putAll(clusterState.nodes()).put(newNode("node2"))).build(); routingTable = strategy.reroute(clusterState).routingTable(); clusterState = newClusterStateBuilder().state(clusterState).routingTable(routingTable).build(); diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/UpdateNumberOfReplicasTests.java rename to src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java index fbf4d63f28c..9a70da27cd4 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java @@ -1,10 +1,9 @@ -package org.elasticsearch.test.unit.cluster.routing.allocation; +package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.junit.Test; @@ -16,7 +15,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; 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 e89f2ed1375..e5ff0c8ed0c 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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.util.Arrays; @@ -46,7 +46,7 @@ import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.unit.cluster.routing.allocation.RoutingAllocationTests.newNode; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.hamcrest.Matchers.equalTo; public class DiskThresholdDeciderTests extends ElasticsearchTestCase { diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/serialization/ClusterSerializationTests.java b/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/serialization/ClusterSerializationTests.java rename to src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java index 3048abc3255..c9ca23f08a6 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/serialization/ClusterSerializationTests.java +++ b/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.serialization; +package org.elasticsearch.cluster.serialization; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/settings/ClusterSettingsTests.java b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/cluster/settings/ClusterSettingsTests.java rename to src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java index ffffc4fdc8a..ad1f9f121a3 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/settings/ClusterSettingsTests.java +++ b/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.settings; +package org.elasticsearch.cluster.settings; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.client.Client; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/settings/SettingsValidatorTests.java b/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/settings/SettingsValidatorTests.java rename to src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java index b0c4ae4953d..5a860335eb5 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/settings/SettingsValidatorTests.java +++ b/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.settings; +package org.elasticsearch.cluster.settings; -import org.elasticsearch.cluster.settings.Validator; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/integration/cluster/shards/ClusterSearchShardsTests.java b/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/cluster/shards/ClusterSearchShardsTests.java rename to src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java index 961c2df4bdd..3dae0c28c88 100644 --- a/src/test/java/org/elasticsearch/test/integration/cluster/shards/ClusterSearchShardsTests.java +++ b/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.cluster.shards; +package org.elasticsearch.cluster.shards; import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsGroup; import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.AliasAction; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/unit/cluster/structure/RoutingIteratorTests.java b/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/cluster/structure/RoutingIteratorTests.java rename to src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java index a1b028e8e10..fa8f5f894c5 100644 --- a/src/test/java/org/elasticsearch/test/unit/cluster/structure/RoutingIteratorTests.java +++ b/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.cluster.structure; +package org.elasticsearch.cluster.structure; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -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.unit.cluster.routing.allocation.RoutingAllocationTests; +import org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests; import org.junit.Test; import static org.elasticsearch.cluster.ClusterState.newClusterStateBuilder; @@ -39,6 +39,7 @@ import static org.elasticsearch.cluster.metadata.MetaData.newMetaDataBuilder; import static org.elasticsearch.cluster.node.DiscoveryNodes.newNodesBuilder; import static org.elasticsearch.cluster.routing.RoutingBuilders.routingTable; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; +import static org.elasticsearch.cluster.routing.allocation.RoutingAllocationTests.newNode; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -268,8 +269,8 @@ public class RoutingIteratorTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder() - .put(RoutingAllocationTests.newNode("node1", ImmutableMap.of("rack_id", "rack_1", "zone", "zone1"))) - .put(RoutingAllocationTests.newNode("node2", ImmutableMap.of("rack_id", "rack_2", "zone", "zone2"))) + .put(newNode("node1", ImmutableMap.of("rack_id", "rack_1", "zone", "zone1"))) + .put(newNode("node2", ImmutableMap.of("rack_id", "rack_2", "zone", "zone2"))) .localNodeId("node1") ).build(); routingTable = strategy.reroute(clusterState).routingTable(); @@ -317,8 +318,8 @@ public class RoutingIteratorTests { ClusterState clusterState = newClusterStateBuilder().metaData(metaData).routingTable(routingTable).build(); clusterState = newClusterStateBuilder().state(clusterState).nodes(newNodesBuilder() - .put(RoutingAllocationTests.newNode("node1")) - .put(RoutingAllocationTests.newNode("node2")) + .put(newNode("node1")) + .put(newNode("node2")) .localNodeId("node1") ).build(); routingTable = strategy.reroute(clusterState).routingTable(); diff --git a/src/test/java/org/elasticsearch/test/integration/codecs/CodecTests.java b/src/test/java/org/elasticsearch/codecs/CodecTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/codecs/CodecTests.java rename to src/test/java/org/elasticsearch/codecs/CodecTests.java index 83026115469..b3dc679bdf4 100644 --- a/src/test/java/org/elasticsearch/test/integration/codecs/CodecTests.java +++ b/src/test/java/org/elasticsearch/codecs/CodecTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.codecs; +package org.elasticsearch.codecs; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/unit/common/compress/CompressedStringTests.java b/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/common/compress/CompressedStringTests.java rename to src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java index 44ed6d63906..70188f54975 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/compress/CompressedStringTests.java +++ b/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java @@ -17,10 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.common.compress; +package org.elasticsearch.common.compress; -import org.elasticsearch.common.compress.CompressedString; -import org.elasticsearch.common.compress.CompressorFactory; import org.elasticsearch.common.settings.ImmutableSettings; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/geo/GeoJSONShapeParserTests.java b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/common/geo/GeoJSONShapeParserTests.java rename to src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java index 996de45ccf4..46cd38b8375 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/geo/GeoJSONShapeParserTests.java +++ b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.geo; +package org.elasticsearch.common.geo; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/elasticsearch/test/unit/common/geo/ShapeBuilderTests.java b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/common/geo/ShapeBuilderTests.java rename to src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java index c4affdb24f9..71e08a5065b 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/geo/ShapeBuilderTests.java +++ b/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.geo; +package org.elasticsearch.common.geo; import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Rectangle; diff --git a/src/test/java/org/elasticsearch/test/unit/common/io/StreamsTests.java b/src/test/java/org/elasticsearch/common/io/StreamsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/io/StreamsTests.java rename to src/test/java/org/elasticsearch/common/io/StreamsTests.java index 7f55dcdd9c8..79387063cde 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/io/StreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/StreamsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.io; +package org.elasticsearch.common.io; import com.google.common.base.Charsets; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/io/streams/BytesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/io/streams/BytesStreamsTests.java rename to src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java index d4ee4fff535..170c1b3462c 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/io/streams/BytesStreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.io.streams; +package org.elasticsearch.common.io.streams; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/src/test/java/org/elasticsearch/test/unit/common/io/streams/HandlesStreamsTests.java b/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/io/streams/HandlesStreamsTests.java rename to src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java index afe7ee54842..5914d36d063 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/io/streams/HandlesStreamsTests.java +++ b/src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.io.streams; +package org.elasticsearch.common.io.streams; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; diff --git a/src/test/java/org/elasticsearch/test/unit/common/joda/DateMathParserTests.java b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/common/joda/DateMathParserTests.java rename to src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java index 6cf87c2b143..8c737f3ba60 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/joda/DateMathParserTests.java +++ b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java @@ -1,7 +1,5 @@ -package org.elasticsearch.test.unit.common.joda; +package org.elasticsearch.common.joda; -import org.elasticsearch.common.joda.DateMathParser; -import org.elasticsearch.common.joda.Joda; import org.junit.Test; import java.util.concurrent.TimeUnit; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/LuceneTest.java b/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/LuceneTest.java rename to src/test/java/org/elasticsearch/common/lucene/LuceneTest.java index be445bb0db7..bbdabe4d7d5 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/LuceneTest.java +++ b/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.common.lucene; +package org.elasticsearch.common.lucene; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import org.apache.lucene.util.Version; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLoggerFactory; -import org.elasticsearch.common.lucene.Lucene; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/all/SimpleAllTests.java b/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/all/SimpleAllTests.java rename to src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java index f94f697debd..cf980c27eb5 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/all/SimpleAllTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.all; +package org.elasticsearch.common.lucene.all; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -29,9 +29,6 @@ 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.common.lucene.all.AllEntries; -import org.elasticsearch.common.lucene.all.AllTermQuery; -import org.elasticsearch.common.lucene.all.AllTokenStream; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MatchAllDocsFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/MatchAllDocsFilterTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java index 7281e3d0230..e3578d1d95f 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MatchAllDocsFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,8 +30,6 @@ 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.common.lucene.search.Queries; -import org.elasticsearch.common.lucene.search.XConstantScoreQuery; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MoreLikeThisQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/MoreLikeThisQueryTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java index 41233bc15d4..b630ddeaa0d 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MoreLikeThisQueryTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -30,7 +30,6 @@ 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.common.lucene.search.MoreLikeThisQuery; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MultiPhrasePrefixQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/MultiPhrasePrefixQueryTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java index e38c7d24691..b9dd7675994 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/MultiPhrasePrefixQueryTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -26,7 +26,6 @@ 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.common.lucene.search.MultiPhrasePrefixQuery; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/TermsFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/TermsFilterTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java index 1a778b7a9f8..af40bd11797 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/TermsFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.document.Document; @@ -31,7 +31,6 @@ 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.common.lucene.search.TermFilter; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterLuceneTests.java b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterLuceneTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java index d99232f3c74..149aa45fb87 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterLuceneTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.document.Document; @@ -13,7 +13,6 @@ 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.common.lucene.search.XBooleanFilter; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterTests.java b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterTests.java rename to src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java index f659f07092b..ef5f6f216d7 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.common.lucene.search; +package org.elasticsearch.common.lucene.search; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.document.Document; @@ -14,8 +14,6 @@ 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.common.lucene.search.TermFilter; -import org.elasticsearch.common.lucene.search.XBooleanFilter; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/store/InputStreamIndexInputTests.java b/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/store/InputStreamIndexInputTests.java rename to src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java index 042f48a4cd7..96cc86b4081 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/store/InputStreamIndexInputTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.store; +package org.elasticsearch.common.lucene.store; 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.common.lucene.store.InputStreamIndexInput; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/common/lucene/uid/VersionsTests.java b/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/lucene/uid/VersionsTests.java rename to src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java index ccafc6a70bd..6bf02edf3e2 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/lucene/uid/VersionsTests.java +++ b/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.lucene.uid; +package org.elasticsearch.common.lucene.uid; import com.google.common.collect.ImmutableMap; import org.apache.lucene.analysis.Analyzer; @@ -33,10 +33,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.Numbers; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.merge.policy.IndexUpgraderMergePolicy; -import org.elasticsearch.test.integration.ElasticsearchLuceneTestCase; +import org.elasticsearch.ElasticsearchLuceneTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/path/PathTrieTests.java b/src/test/java/org/elasticsearch/common/path/PathTrieTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/path/PathTrieTests.java rename to src/test/java/org/elasticsearch/common/path/PathTrieTests.java index 827a4488f53..aa4fa50437e 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/path/PathTrieTests.java +++ b/src/test/java/org/elasticsearch/common/path/PathTrieTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.common.path; +package org.elasticsearch.common.path; -import org.elasticsearch.common.path.PathTrie; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/unit/common/regex/RegexTests.java b/src/test/java/org/elasticsearch/common/regex/RegexTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/common/regex/RegexTests.java rename to src/test/java/org/elasticsearch/common/regex/RegexTests.java index 17c1b69f1d6..41c2f668295 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/regex/RegexTests.java +++ b/src/test/java/org/elasticsearch/common/regex/RegexTests.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.common.regex; +package org.elasticsearch.common.regex; -import org.elasticsearch.common.regex.Regex; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.util.Random; diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/ImmutableSettingsTests.java b/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/common/settings/ImmutableSettingsTests.java rename to src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java index 905ec8bdd06..4c0d357782a 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/settings/ImmutableSettingsTests.java +++ b/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.common.settings; +package org.elasticsearch.common.settings; -import org.elasticsearch.common.settings.NoClassSettingsException; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.ElasticsearchTestCase; -import org.elasticsearch.test.unit.common.settings.bar.BarTestClass; -import org.elasticsearch.test.unit.common.settings.foo.FooTestClass; +import org.elasticsearch.ElasticsearchTestCase; +import org.elasticsearch.common.settings.bar.BarTestClass; +import org.elasticsearch.common.settings.foo.FooTestClass; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -37,15 +35,15 @@ public class ImmutableSettingsTests extends ElasticsearchTestCase{ public void testGetAsClass() { Settings settings = settingsBuilder() .put("test.class", "bar") - .put("test.class.package", "org.elasticsearch.test.unit.common.settings.bar") + .put("test.class.package", "org.elasticsearch.common.settings.bar") .build(); // Assert that defaultClazz is loaded if setting is not specified - assertThat(settings.getAsClass("no.settings", FooTestClass.class, "org.elasticsearch.test.unit.common.settings.", "TestClass").getName(), + assertThat(settings.getAsClass("no.settings", FooTestClass.class, "org.elasticsearch.common.settings.", "TestClass").getName(), equalTo(FooTestClass.class.getName())); // Assert that correct class is loaded if setting contain name without package - assertThat(settings.getAsClass("test.class", FooTestClass.class, "org.elasticsearch.test.unit.common.settings.", "TestClass").getName(), + assertThat(settings.getAsClass("test.class", FooTestClass.class, "org.elasticsearch.common.settings.", "TestClass").getName(), equalTo(BarTestClass.class.getName())); // Assert that class cannot be loaded if wrong packagePrefix is specified diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/bar/BarTestClass.java b/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/common/settings/bar/BarTestClass.java rename to src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java index 3e61f947d46..e0b1561bd8f 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/settings/bar/BarTestClass.java +++ b/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.settings.bar; +package org.elasticsearch.common.settings.bar; //used in ImmutableSettingsTest public class BarTestClass { diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/foo/FooTestClass.java b/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/common/settings/foo/FooTestClass.java rename to src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java index 6a4fe62e23a..be3b8513fdc 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/settings/foo/FooTestClass.java +++ b/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.settings.foo; +package org.elasticsearch.common.settings.foo; // used in ImmutableSettingsTest public class FooTestClass { diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/JsonSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/common/settings/loader/JsonSettingsLoaderTests.java rename to src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java index 2530e2ee6a8..c2e853928ec 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/JsonSettingsLoaderTests.java +++ b/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.settings.loader; +package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -34,7 +34,7 @@ public class JsonSettingsLoaderTests { @Test public void testSimpleJsonSettings() throws Exception { Settings settings = settingsBuilder() - .loadFromClasspath("org/elasticsearch/test/unit/common/settings/loader/test-settings.json") + .loadFromClasspath("org/elasticsearch/common/settings/loader/test-settings.json") .build(); assertThat(settings.get("test1.value1"), equalTo("value1")); diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/YamlSettingsLoaderTests.java b/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/common/settings/loader/YamlSettingsLoaderTests.java rename to src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java index 9def39ccab2..ebe7ec5770d 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/YamlSettingsLoaderTests.java +++ b/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.settings.loader; +package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; import org.junit.Test; @@ -34,7 +34,7 @@ public class YamlSettingsLoaderTests { @Test public void testSimpleYamlSettings() throws Exception { Settings settings = settingsBuilder() - .loadFromClasspath("org/elasticsearch/test/unit/common/settings/loader/test-settings.yml") + .loadFromClasspath("org/elasticsearch/common/settings/loader/test-settings.yml") .build(); assertThat(settings.get("test1.value1"), equalTo("value1")); diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/test-settings.json b/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/common/settings/loader/test-settings.json rename to src/test/java/org/elasticsearch/common/settings/loader/test-settings.json diff --git a/src/test/java/org/elasticsearch/test/unit/common/settings/loader/test-settings.yml b/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/common/settings/loader/test-settings.yml rename to src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml diff --git a/src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeUnitTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeUnitTests.java rename to src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java index f274bd33edf..4a79db26f34 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeUnitTests.java +++ b/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.unit; +package org.elasticsearch.common.unit; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeValueTests.java b/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeValueTests.java rename to src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java index b8265d12081..1fcff0df626 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/unit/ByteSizeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java @@ -17,10 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.common.unit; +package org.elasticsearch.common.unit; -import org.elasticsearch.common.unit.ByteSizeUnit; -import org.elasticsearch.common.unit.ByteSizeValue; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/unit/DistanceUnitTests.java b/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/common/unit/DistanceUnitTests.java rename to src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java index 6cc7cbfd6c8..7ffc45ed71c 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/unit/DistanceUnitTests.java +++ b/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.common.unit; +package org.elasticsearch.common.unit; -import org.elasticsearch.common.unit.DistanceUnit; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/unit/TimeValueTests.java b/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/common/unit/TimeValueTests.java rename to src/test/java/org/elasticsearch/common/unit/TimeValueTests.java index fde218dff16..5439259a11d 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/unit/TimeValueTests.java +++ b/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.common.unit; +package org.elasticsearch.common.unit; -import org.elasticsearch.common.unit.TimeValue; import org.joda.time.PeriodType; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedDoubleListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/util/SlicedDoubleListTests.java rename to src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java index 62b33a6df00..948da7bdf5a 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedDoubleListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedDoubleListTests.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.common.util; +package org.elasticsearch.common.util; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import org.elasticsearch.common.util.SlicedDoubleList; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedLongListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/common/util/SlicedLongListTests.java rename to src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java index 0497d256c1b..8ad7988fd41 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedLongListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedLongListTests.java @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.common.util; +package org.elasticsearch.common.util; -import org.elasticsearch.common.util.SlicedDoubleList; -import org.elasticsearch.common.util.SlicedLongList; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedObjectListTests.java b/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/util/SlicedObjectListTests.java rename to src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java index 238ff69c4f5..b55319090cd 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/util/SlicedObjectListTests.java +++ b/src/test/java/org/elasticsearch/common/util/SlicedObjectListTests.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.common.util; +package org.elasticsearch.common.util; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.common.util.SlicedObjectList; import org.junit.Test; /** * Tests for {@link SlicedObjectList} diff --git a/src/test/java/org/elasticsearch/test/unit/common/util/concurrent/EsExecutorsTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/util/concurrent/EsExecutorsTests.java rename to src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java index b5ae1343eab..25a4e6a7bb1 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/util/concurrent/EsExecutorsTests.java +++ b/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.common.util.concurrent; +package org.elasticsearch.common.util.concurrent; import com.google.common.base.Predicate; -import org.elasticsearch.common.util.concurrent.*; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; diff --git a/src/test/java/org/elasticsearch/test/unit/common/util/concurrent/PrioritizedExecutorsTests.java b/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/util/concurrent/PrioritizedExecutorsTests.java rename to src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java index 95319e3c5ee..969a1a856fa 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/util/concurrent/PrioritizedExecutorsTests.java +++ b/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java @@ -17,14 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.common.util.concurrent; +package org.elasticsearch.common.util.concurrent; import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.common.util.concurrent.EsExecutors; -import org.elasticsearch.common.util.concurrent.PrioritizedCallable; -import org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; -import org.elasticsearch.common.util.concurrent.PrioritizedRunnable; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/BuilderRawFieldTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/BuilderRawFieldTests.java rename to src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java index dbb02e234c4..697897f1110 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/BuilderRawFieldTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.xcontent.builder; +package org.elasticsearch.common.xcontent.builder; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/XContentBuilderTests.java b/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/XContentBuilderTests.java rename to src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java index ded78dc3cef..b0cc0d383bc 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/xcontent/builder/XContentBuilderTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.xcontent.builder; +package org.elasticsearch.common.xcontent.builder; import com.google.common.collect.Lists; import org.elasticsearch.common.io.FastCharArrayWriter; diff --git a/src/test/java/org/elasticsearch/test/unit/common/xcontent/smile/JsonVsSmileTests.java b/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/common/xcontent/smile/JsonVsSmileTests.java rename to src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java index 68ae076f4ea..d89afe93b25 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/xcontent/smile/JsonVsSmileTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.xcontent.smile; +package org.elasticsearch.common.xcontent.smile; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentHelperTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentHelperTests.java rename to src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java index 1f296690f4a..28a16f353d6 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentHelperTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.common.xcontent.support; +package org.elasticsearch.common.xcontent.support; /* * Licensed to ElasticSearch under one * or more contributor license agreements. See the NOTICE file diff --git a/src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentMapValuesTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentMapValuesTests.java rename to src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java index 934c8f8bc1e..ddd71c086ae 100644 --- a/src/test/java/org/elasticsearch/test/unit/common/xcontent/support/XContentMapValuesTests.java +++ b/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.common.xcontent.support; +package org.elasticsearch.common.xcontent.support; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; @@ -25,7 +25,6 @@ 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.common.xcontent.support.XContentMapValues; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java b/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java rename to src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java index 2e2a10a1852..f70b8e2811a 100644 --- a/src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java +++ b/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.consistencylevel; +package org.elasticsearch.consistencylevel; import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.WriteConsistencyLevel; @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; diff --git a/src/test/java/org/elasticsearch/test/integration/count/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/count/query/SimpleQueryTests.java rename to src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java index 2e4707e339b..3f38ea2150b 100644 --- a/src/test/java/org/elasticsearch/test/integration/count/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.count.query; +package org.elasticsearch.count.query; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticSearchException; @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.*; import org.elasticsearch.index.query.CommonTermsQueryBuilder.Operator; import org.elasticsearch.index.query.MatchQueryBuilder.Type; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; diff --git a/src/test/java/org/elasticsearch/test/integration/count/simple/SimpleCountTests.java b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/count/simple/SimpleCountTests.java rename to src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java index 6e185c4d705..07789ea4f9b 100644 --- a/src/test/java/org/elasticsearch/test/integration/count/simple/SimpleCountTests.java +++ b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java @@ -1,10 +1,10 @@ -package org.elasticsearch.test.integration.count.simple; +package org.elasticsearch.count.simple; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.concurrent.ExecutionException; diff --git a/src/test/java/org/elasticsearch/test/integration/deleteByQuery/DeleteByQueryTests.java b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/deleteByQuery/DeleteByQueryTests.java rename to src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java index c0ffe98c757..ffc73d445d6 100644 --- a/src/test/java/org/elasticsearch/test/integration/deleteByQuery/DeleteByQueryTests.java +++ b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.deleteByQuery; +package org.elasticsearch.deleteByQuery; import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder; import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java b/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java rename to src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java index 461a4d7c493..f0a0abd826c 100644 --- a/src/test/java/org/elasticsearch/test/unit/deps/jackson/JacksonLocationTests.java +++ b/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.deps.jackson; +package org.elasticsearch.deps.jackson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/test/java/org/elasticsearch/test/unit/deps/joda/SimpleJodaTests.java b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/deps/joda/SimpleJodaTests.java rename to src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java index 87dd5441d15..013e139db0a 100644 --- a/src/test/java/org/elasticsearch/test/unit/deps/joda/SimpleJodaTests.java +++ b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.deps.joda; +package org.elasticsearch.deps.joda; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; diff --git a/src/test/java/org/elasticsearch/test/unit/deps/joda/TimeZoneRoundingTests.java b/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/deps/joda/TimeZoneRoundingTests.java rename to src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java index 5d9109d324b..42e725035ad 100644 --- a/src/test/java/org/elasticsearch/test/unit/deps/joda/TimeZoneRoundingTests.java +++ b/src/test/java/org/elasticsearch/deps/joda/TimeZoneRoundingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.deps.joda; +package org.elasticsearch.deps.joda; import org.elasticsearch.common.joda.TimeZoneRounding; import org.elasticsearch.common.unit.TimeValue; diff --git a/src/test/java/org/elasticsearch/test/unit/deps/lucene/SimpleLuceneTests.java b/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/deps/lucene/SimpleLuceneTests.java rename to src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java index ae130e88691..785503a763f 100644 --- a/src/test/java/org/elasticsearch/test/unit/deps/lucene/SimpleLuceneTests.java +++ b/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.deps.lucene; +package org.elasticsearch.deps.lucene; import org.apache.lucene.document.*; import org.apache.lucene.index.*; diff --git a/src/test/java/org/elasticsearch/test/unit/deps/lucene/VectorHighlighterTests.java b/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/deps/lucene/VectorHighlighterTests.java rename to src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java index af747641c7e..ee8addee422 100644 --- a/src/test/java/org/elasticsearch/test/unit/deps/lucene/VectorHighlighterTests.java +++ b/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.deps.lucene; +package org.elasticsearch.deps.lucene; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java b/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java rename to src/test/java/org/elasticsearch/discovery/DiscoveryTests.java index 7add903792b..d29a763885c 100644 --- a/src/test/java/org/elasticsearch/test/integration/discovery/DiscoveryTests.java +++ b/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.discovery; +package org.elasticsearch.discovery; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/multicast/MulticastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/multicast/MulticastZenPingTests.java rename to src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java index f8df3bd110b..2c2a1a16d8d 100644 --- a/src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/multicast/MulticastZenPingTests.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.discovery.zen.ping.multicast; +package org.elasticsearch.discovery.zen.ping.multicast; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; @@ -31,9 +31,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; -import org.elasticsearch.discovery.zen.ping.multicast.MulticastZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.local.LocalTransport; diff --git a/src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/unicast/UnicastZenPingTests.java b/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/unicast/UnicastZenPingTests.java rename to src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java index 84c0774b138..121a961b127 100644 --- a/src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/unicast/UnicastZenPingTests.java +++ b/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.discovery.zen.ping.unicast; +package org.elasticsearch.discovery.zen.ping.unicast; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterName; @@ -30,9 +30,8 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; -import org.elasticsearch.discovery.zen.ping.unicast.UnicastZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.netty.NettyTransport; diff --git a/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java b/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java rename to src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java index 9a31a57b160..cf9014ba78d 100644 --- a/src/test/java/org/elasticsearch/test/integration/document/AliasedIndexDocumentActionsTests.java +++ b/src/test/java/org/elasticsearch/document/AliasedIndexDocumentActionsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.document; +package org.elasticsearch.document; import static org.elasticsearch.client.Requests.createIndexRequest; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/document/BulkTests.java b/src/test/java/org/elasticsearch/document/BulkTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/document/BulkTests.java rename to src/test/java/org/elasticsearch/document/BulkTests.java index 1ee37d5047e..9e28dc1a7b0 100644 --- a/src/test/java/org/elasticsearch/test/integration/document/BulkTests.java +++ b/src/test/java/org/elasticsearch/document/BulkTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.document; +package org.elasticsearch.document; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; @@ -12,7 +12,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.concurrent.CyclicBarrier; diff --git a/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java rename to src/test/java/org/elasticsearch/document/DocumentActionsTests.java index a6758bad3ca..941da8963ad 100644 --- a/src/test/java/org/elasticsearch/test/integration/document/DocumentActionsTests.java +++ b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.document; +package org.elasticsearch.document; import com.google.common.base.Charsets; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -36,7 +36,7 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/explain/ExplainActionTests.java b/src/test/java/org/elasticsearch/explain/ExplainActionTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/explain/ExplainActionTests.java rename to src/test/java/org/elasticsearch/explain/ExplainActionTests.java index de47da90a4c..b1d133d0fff 100644 --- a/src/test/java/org/elasticsearch/test/integration/explain/ExplainActionTests.java +++ b/src/test/java/org/elasticsearch/explain/ExplainActionTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.explain; +package org.elasticsearch.explain; import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Map; @@ -32,7 +32,6 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.*; /** */ diff --git a/src/test/java/org/elasticsearch/test/integration/flt/FuzzyLikeThisActionTests.java b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/flt/FuzzyLikeThisActionTests.java rename to src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java index c8f98bd6548..577443e7f4d 100644 --- a/src/test/java/org/elasticsearch/test/integration/flt/FuzzyLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.integration.flt; +package org.elasticsearch.flt; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/fs/IndexGatewayTests.java b/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/gateway/fs/IndexGatewayTests.java rename to src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java index 4d2c3ccd15a..3ae9b7d58df 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/fs/IndexGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.gateway.fs; +package org.elasticsearch.gateway.fs; import com.carrotsearch.randomizedtesting.annotations.Nightly; import org.apache.lucene.util.LuceneTestCase.Slow; @@ -39,7 +39,7 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.indices.IndexAlreadyExistsException; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java b/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java rename to src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java index 3bdc780b323..6344cebe4d6 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/local/LocalGatewayIndexStateTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.gateway.local; +package org.elasticsearch.gateway.local; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -36,7 +36,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java rename to src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java index 34989aec354..16595101426 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/local/QuorumLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.gateway.local; +package org.elasticsearch.gateway.local; import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java rename to src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java index 1a266856356..fd327d99866 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/local/SimpleRecoveryLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.gateway.local; +package org.elasticsearch.gateway.local; import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -37,7 +37,7 @@ import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java b/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java rename to src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java index b2b359c4c2e..a2b7fe746bd 100644 --- a/src/test/java/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.java +++ b/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.gateway.none; +package org.elasticsearch.gateway.none; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.gateway.GatewayService; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/get/GetActionTests.java b/src/test/java/org/elasticsearch/get/GetActionTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/get/GetActionTests.java rename to src/test/java/org/elasticsearch/get/GetActionTests.java index b8f43cffef0..c650aa2a85a 100644 --- a/src/test/java/org/elasticsearch/test/integration/get/GetActionTests.java +++ b/src/test/java/org/elasticsearch/get/GetActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.get; +package org.elasticsearch.get; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -32,7 +32,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/unit/index/VersionTypeTests.java b/src/test/java/org/elasticsearch/index/VersionTypeTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/VersionTypeTests.java rename to src/test/java/org/elasticsearch/index/VersionTypeTests.java index 1b07b5cbf1f..263b87877b8 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/VersionTypeTests.java +++ b/src/test/java/org/elasticsearch/index/VersionTypeTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.index; +package org.elasticsearch.index; /* * Licensed to ElasticSearch under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +20,6 @@ package org.elasticsearch.test.unit.index; import org.elasticsearch.common.lucene.uid.Versions; -import org.elasticsearch.index.VersionType; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/aliases/IndexAliasesServiceTests.java b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/aliases/IndexAliasesServiceTests.java rename to src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java index ea2027ad89f..d99c4426156 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/aliases/IndexAliasesServiceTests.java +++ b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.aliases; +package org.elasticsearch.index.aliases; import org.elasticsearch.cache.recycler.CacheRecyclerModule; import org.elasticsearch.cluster.ClusterService; @@ -33,7 +33,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.aliases.IndexAliasesService; import org.elasticsearch.index.analysis.AnalysisModule; import org.elasticsearch.index.cache.IndexCacheModule; import org.elasticsearch.index.codec.CodecModule; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisModuleTests.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisModuleTests.java rename to src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java index 2c81b745c09..5881d673bde 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisModuleTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; @@ -30,7 +30,6 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.elasticsearch.Version; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; @@ -39,11 +38,10 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.*; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.unit.index.analysis.filter1.MyFilterTokenFilterFactory; +import org.elasticsearch.index.analysis.filter1.MyFilterTokenFilterFactory; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -52,7 +50,6 @@ import com.google.common.base.Charsets; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.OutputStreamWriter; import java.io.StringReader; import java.util.Set; @@ -69,13 +66,13 @@ public class AnalysisModuleTests { @Test public void testSimpleConfigurationJson() { - Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/test1.json").build(); + Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/test1.json").build(); testSimpleConfiguration(settings); } @Test public void testSimpleConfigurationYaml() { - Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/test1.yml").build(); + Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/test1.yml").build(); testSimpleConfiguration(settings); } diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisTestsHelper.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisTestsHelper.java rename to src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java index d2e12cacc82..d332bf3b522 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/AnalysisTestsHelper.java +++ b/src/test/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -28,8 +28,6 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/CJKFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/CJKFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java index d19a4796844..03e4e8b87b0 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/CJKFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +29,7 @@ import java.io.StringReader; public class CJKFilterFactoryTests extends ElasticSearchTokenStreamTestCase { - private static final String RESOURCE = "org/elasticsearch/test/unit/index/analysis/cjk_analysis.json"; + private static final String RESOURCE = "org/elasticsearch/index/analysis/cjk_analysis.json"; @Test public void testDefault() throws IOException { diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/CharFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/CharFilterTests.java rename to src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java index 5f7817c7e53..dca2f7f2ec5 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/CharFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -26,13 +26,10 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/CompoundAnalysisTests.java b/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/CompoundAnalysisTests.java rename to src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java index 7c3ca3fa8cc..c7ace081898 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/CompoundAnalysisTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; @@ -32,9 +32,6 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.compound.DictionaryCompoundWordTokenFilterFactory; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; @@ -110,10 +107,10 @@ public class CompoundAnalysisTests { } private Settings getJsonSettings() { - return settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/test1.json").build(); + return settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/test1.json").build(); } private Settings getYamlSettings() { - return settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/test1.yml").build(); + return settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/test1.yml").build(); } } diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/HunspellTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/HunspellTokenFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java index 0c94f56a532..e4ef9b2309e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/HunspellTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java @@ -17,14 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.ProvisionException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.HunspellTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/KeepFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/KeepFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java index 7f96c9e3ed8..fa8af28b7ea 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/KeepFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java @@ -17,17 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; 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.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.KeepWordFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Assert; import org.junit.Test; @@ -38,7 +35,7 @@ import static org.hamcrest.Matchers.instanceOf; public class KeepFilterFactoryTests extends ElasticSearchTokenStreamTestCase { - private static final String RESOURCE = "org/elasticsearch/test/unit/index/analysis/keep_analysis.json"; + private static final String RESOURCE = "org/elasticsearch/index/analysis/keep_analysis.json"; @Test diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/LimitTokenCountFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/LimitTokenCountFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java index 62875fdda7c..7750530952b 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/LimitTokenCountFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; 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.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/NGramTokenizerFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/NGramTokenizerFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java index 1d1eaf08165..8bb5f106c81 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/NGramTokenizerFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; @@ -31,10 +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.index.analysis.EdgeNGramTokenFilterFactory; -import org.elasticsearch.index.analysis.EdgeNGramTokenizerFactory; -import org.elasticsearch.index.analysis.NGramTokenizerFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/NumericAnalyzerTests.java b/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/NumericAnalyzerTests.java rename to src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java index 8b4f49d3c2d..6a7549ae23f 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/NumericAnalyzerTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; 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.index.analysis.NumericDoubleAnalyzer; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/PatternCaptureTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/PatternCaptureTokenFilterTests.java rename to src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java index 93fcfc10955..58050014ae8 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/PatternCaptureTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -27,13 +27,10 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -43,7 +40,7 @@ public class PatternCaptureTokenFilterTests extends ElasticSearchTokenStreamTest @Test public void testPatternCaptureTokenFilter() throws Exception { Index index = new Index("test"); - Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/pattern_capture.json").build(); + Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/pattern_capture.json").build(); Injector parentInjector = new ModulesBuilder().add(new SettingsModule(settings), new EnvironmentModule(new Environment(settings)), new IndicesAnalysisModule()).createInjector(); Injector injector = new ModulesBuilder().add( new IndexSettingsModule(index, settings), diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/ShingleTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/ShingleTokenFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java index 9c29a07f756..80c307af50e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/ShingleTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java @@ -17,16 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; 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.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.ShingleTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +34,7 @@ import static org.hamcrest.Matchers.instanceOf; @ThreadLeakScope(Scope.NONE) public class ShingleTokenFilterFactoryTests extends ElasticSearchTokenStreamTestCase { - private static final String RESOURCE = "org/elasticsearch/test/unit/index/analysis/shingle_analysis.json"; + private static final String RESOURCE = "org/elasticsearch/index/analysis/shingle_analysis.json"; @Test public void testDefault() throws IOException { diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/StopAnalyzerTests.java b/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/StopAnalyzerTests.java rename to src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java index 9705404f795..1036054f263 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/StopAnalyzerTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -27,13 +27,10 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; -import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -43,7 +40,7 @@ public class StopAnalyzerTests extends ElasticSearchTokenStreamTestCase { @Test public void testDefaultsCompoundAnalysis() throws Exception { Index index = new Index("test"); - Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/stop.json").build(); + Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/stop.json").build(); Injector parentInjector = new ModulesBuilder().add(new SettingsModule(settings), new EnvironmentModule(new Environment(settings)), new IndicesAnalysisModule()).createInjector(); Injector injector = new ModulesBuilder().add( new IndexSettingsModule(index, settings), diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/WordDelimiterTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/WordDelimiterTokenFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java index 2ce40f08f52..2a72e3a438f 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/WordDelimiterTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java @@ -16,14 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.analysis; +package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.index.analysis.AnalysisService; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/cjk_analysis.json b/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/cjk_analysis.json rename to src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java rename to src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java index 2f8fc28f6ee..fc93f1321b5 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis.commongrams; +package org.elasticsearch.index.analysis.commongrams; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Tokenizer; @@ -27,8 +27,8 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.integration.ElasticSearchTokenStreamTestCase; -import org.elasticsearch.test.unit.index.analysis.AnalysisTestsHelper; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.junit.Assert; import org.junit.Test; @@ -123,7 +123,7 @@ public class CommonGramsTokenFilterFactoryTests extends ElasticSearchTokenStream @Test public void testCommonGramsAnalysis() throws IOException { - Settings settings = ImmutableSettings.settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/commongrams/commongrams.json").build(); + Settings settings = ImmutableSettings.settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/commongrams/commongrams.json").build(); { AnalysisService analysisService = AnalysisTestsHelper.createAnalysisServiceFromSettings(settings); Analyzer analyzer = analysisService.analyzer("commongramsAnalyzer").analyzer(); @@ -196,7 +196,7 @@ public class CommonGramsTokenFilterFactoryTests extends ElasticSearchTokenStream @Test public void testQueryModeCommonGramsAnalysis() throws IOException { - Settings settings = ImmutableSettings.settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/commongrams/commongrams_query_mode.json").build(); + Settings settings = ImmutableSettings.settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json").build(); { AnalysisService analysisService = AnalysisTestsHelper.createAnalysisServiceFromSettings(settings); Analyzer analyzer = analysisService.analyzer("commongramsAnalyzer").analyzer(); diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/common_words.txt b/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/common_words.txt rename to src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams.json b/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json similarity index 87% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams.json rename to src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json index a287300b8a2..6db49fc87c4 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams.json +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json @@ -21,7 +21,7 @@ }, "common_grams_file":{ "type":"common_grams", - "common_words_path":"org/elasticsearch/test/unit/index/analysis/commongrams/common_words.txt" + "common_words_path":"org/elasticsearch/index/analysis/commongrams/common_words.txt" } } } diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams_query_mode.json b/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams_query_mode.json rename to src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json index c99a08b1730..6f0c015570c 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/commongrams/commongrams_query_mode.json +++ b/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json @@ -23,7 +23,7 @@ "common_grams_file":{ "type":"common_grams", "query_mode" : true, - "common_words_path":"org/elasticsearch/test/unit/index/analysis/commongrams/common_words.txt" + "common_words_path":"org/elasticsearch/index/analysis/commongrams/common_words.txt" } } } diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/filter1/MyFilterTokenFilterFactory.java b/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/filter1/MyFilterTokenFilterFactory.java rename to src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java index 8673387215f..db31bd7cf57 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/filter1/MyFilterTokenFilterFactory.java +++ b/src/test/java/org/elasticsearch/index/analysis/filter1/MyFilterTokenFilterFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis.filter1; +package org.elasticsearch.index.analysis.filter1; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopAnalyzer; diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/keep_analysis.json b/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/keep_analysis.json rename to src/test/java/org/elasticsearch/index/analysis/keep_analysis.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/pattern_capture.json b/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/pattern_capture.json rename to src/test/java/org/elasticsearch/index/analysis/pattern_capture.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/shingle_analysis.json b/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/shingle_analysis.json rename to src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/stop.json b/src/test/java/org/elasticsearch/index/analysis/stop.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/stop.json rename to src/test/java/org/elasticsearch/index/analysis/stop.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/SynonymsAnalysisTest.java b/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/SynonymsAnalysisTest.java rename to src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java index 36c517b6b25..bb8a61da3bf 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/SynonymsAnalysisTest.java +++ b/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.analysis.synonyms; +package org.elasticsearch.index.analysis.synonyms; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; @@ -57,7 +57,7 @@ public class SynonymsAnalysisTest { @Test public void testSynonymsAnalysis() throws IOException { - Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.json").build(); + Settings settings = settingsBuilder().loadFromClasspath("org/elasticsearch/index/analysis/synonyms/synonyms.json").build(); Index index = new Index("test"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.json b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json similarity index 88% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.json rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json index df24eade6d0..d23d6efd01e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.json +++ b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json @@ -30,7 +30,7 @@ }, "synonym_file":{ "type":"synonym", - "synonyms_path":"org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.txt" + "synonyms_path":"org/elasticsearch/index/analysis/synonyms/synonyms.txt" }, "synonymWordnet":{ "type":"synonym", @@ -44,7 +44,7 @@ "synonymWordnet_file":{ "type":"synonym", "format":"wordnet", - "synonyms_path":"org/elasticsearch/test/unit/index/analysis/synonyms/synonyms_wordnet.txt" + "synonyms_path":"org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt" } } } diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.txt b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms.txt rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms_wordnet.txt b/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/synonyms/synonyms_wordnet.txt rename to src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/test1.json b/src/test/java/org/elasticsearch/index/analysis/test1.json similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/test1.json rename to src/test/java/org/elasticsearch/index/analysis/test1.json index 37b1b2ac3f7..3b503d1da76 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/test1.json +++ b/src/test/java/org/elasticsearch/index/analysis/test1.json @@ -32,7 +32,7 @@ "stopwords":["stop2-1", "stop2-2"] }, "my":{ - "type":"org.elasticsearch.test.unit.index.analysis.filter1.MyFilterTokenFilterFactory" + "type":"org.elasticsearch.index.analysis.filter1.MyFilterTokenFilterFactory" }, "dict_dec":{ "type":"dictionary_decompounder", diff --git a/src/test/java/org/elasticsearch/test/unit/index/analysis/test1.yml b/src/test/java/org/elasticsearch/index/analysis/test1.yml similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/analysis/test1.yml rename to src/test/java/org/elasticsearch/index/analysis/test1.yml index 9bfc1ba5079..46cbc40f8c8 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/analysis/test1.yml +++ b/src/test/java/org/elasticsearch/index/analysis/test1.yml @@ -23,7 +23,7 @@ index : type : stop stopwords : [stop2-1, stop2-2] my : - type : org.elasticsearch.test.unit.index.analysis.filter1.MyFilterTokenFilterFactory + type : org.elasticsearch.index.analysis.filter1.MyFilterTokenFilterFactory dict_dec : type : dictionary_decompounder word_list : [donau, dampf, schiff, spargel, creme, suppe] diff --git a/src/test/java/org/elasticsearch/test/unit/index/cache/filter/FilterCacheTests.java b/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/cache/filter/FilterCacheTests.java rename to src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java index d11ba36ff90..661a2d2f77c 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/cache/filter/FilterCacheTests.java +++ b/src/test/java/org/elasticsearch/index/cache/filter/FilterCacheTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.cache.filter; +package org.elasticsearch.index.cache.filter; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -34,7 +34,6 @@ import org.elasticsearch.common.lucene.search.TermFilter; 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.FilterCache; import org.elasticsearch.index.cache.filter.none.NoneFilterCache; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/cache/id/SimpleIdCacheTests.java b/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/cache/id/SimpleIdCacheTests.java rename to src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java index 4cb738734de..4a1f8411d3d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/cache/id/SimpleIdCacheTests.java +++ b/src/test/java/org/elasticsearch/index/cache/id/SimpleIdCacheTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.cache.id; +package org.elasticsearch.index.cache.id; import com.google.common.collect.ImmutableSet; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -40,8 +40,6 @@ import org.elasticsearch.index.IndexShardMissingException; import org.elasticsearch.index.aliases.IndexAliasesService; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.cache.IndexCache; -import org.elasticsearch.index.cache.id.IdReaderCache; -import org.elasticsearch.index.cache.id.IdReaderTypeCache; import org.elasticsearch.index.cache.id.simple.SimpleIdCache; import org.elasticsearch.index.engine.IndexEngine; import org.elasticsearch.index.fielddata.IndexFieldDataService; @@ -55,7 +53,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.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/codec/CodecTests.java b/src/test/java/org/elasticsearch/index/codec/CodecTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/codec/CodecTests.java rename to src/test/java/org/elasticsearch/index/codec/CodecTests.java index 136bec62c06..b956b0b8a81 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/codec/CodecTests.java +++ b/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.codec; +package org.elasticsearch.index.codec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat; @@ -37,15 +37,12 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.analysis.AnalysisModule; -import org.elasticsearch.index.codec.CodecModule; -import org.elasticsearch.index.codec.CodecService; -import org.elasticsearch.index.codec.PerFieldMappingPostingFormatCodec; import org.elasticsearch.index.codec.postingsformat.*; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperServiceModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityModule; -import org.elasticsearch.test.integration.ElasticsearchLuceneTestCase; +import org.elasticsearch.ElasticsearchLuceneTestCase; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/codec/postingformat/DefaultPostingsFormatTests.java b/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/codec/postingformat/DefaultPostingsFormatTests.java rename to src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java index c68badc33ae..8fd452c5bc0 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/codec/postingformat/DefaultPostingsFormatTests.java +++ b/src/test/java/org/elasticsearch/index/codec/postingformat/DefaultPostingsFormatTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.codec.postingformat; +package org.elasticsearch.index.codec.postingformat; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotDeletionPolicyTests.java b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotDeletionPolicyTests.java rename to src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java index 136c06d62cf..44d10ebb4bc 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotDeletionPolicyTests.java +++ b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.deletionpolicy; +package org.elasticsearch.index.deletionpolicy; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -27,10 +27,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.Index; -import org.elasticsearch.index.deletionpolicy.KeepOnlyLastDeletionPolicy; -import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy; -import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit; -import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommits; import org.elasticsearch.index.shard.ShardId; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java rename to src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java index faef66556b3..b73489265ad 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java +++ b/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotIndexCommitExistsMatcher.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.index.deletionpolicy; +package org.elasticsearch.index.deletionpolicy; -import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/src/test/java/org/elasticsearch/test/unit/index/engine/EngineSearcherTotalHitsMatcher.java b/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/engine/EngineSearcherTotalHitsMatcher.java rename to src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java index 91f82774617..d109da052ac 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/engine/EngineSearcherTotalHitsMatcher.java +++ b/src/test/java/org/elasticsearch/index/engine/EngineSearcherTotalHitsMatcher.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.engine; +package org.elasticsearch.index.engine; import org.apache.lucene.search.Query; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.search.Queries; -import org.elasticsearch.index.engine.Engine; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/src/test/java/org/elasticsearch/test/unit/index/engine/robin/RobinEngineTests.java b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/engine/robin/RobinEngineTests.java rename to src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java index aede1c389fc..e39e9831c3f 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/engine/robin/RobinEngineTests.java +++ b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.engine.robin; +package org.elasticsearch.index.engine.robin; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; @@ -40,7 +40,6 @@ import org.elasticsearch.index.deletionpolicy.KeepOnlyLastDeletionPolicy; import org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy; import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommit; import org.elasticsearch.index.engine.*; -import org.elasticsearch.index.engine.robin.RobinEngine; import org.elasticsearch.index.indexing.ShardIndexingService; import org.elasticsearch.index.indexing.slowlog.ShardSlowLogIndexingService; import org.elasticsearch.index.mapper.ParsedDocument; @@ -59,10 +58,10 @@ import org.elasticsearch.index.store.distributor.LeastUsedDistributor; import org.elasticsearch.index.store.ram.RamDirectoryService; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.fs.FsTranslog; -import org.elasticsearch.test.integration.ElasticsearchTestCase; -import org.elasticsearch.test.unit.index.deletionpolicy.SnapshotIndexCommitExistsMatcher; -import org.elasticsearch.test.unit.index.engine.EngineSearcherTotalHitsMatcher; -import org.elasticsearch.test.unit.index.translog.TranslogSizeMatcher; +import org.elasticsearch.ElasticsearchTestCase; +import org.elasticsearch.index.deletionpolicy.SnapshotIndexCommitExistsMatcher; +import org.elasticsearch.index.engine.EngineSearcherTotalHitsMatcher; +import org.elasticsearch.index.translog.TranslogSizeMatcher; import org.elasticsearch.threadpool.ThreadPool; import org.hamcrest.MatcherAssert; import org.junit.After; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataImplTests.java b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataImplTests.java rename to src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java index c726499dd2e..aadddf8615e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataImplTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataImplTests.java @@ -17,16 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.search.*; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.HashedBytesRef; -import org.elasticsearch.index.fielddata.AtomicFieldData; -import org.elasticsearch.index.fielddata.BytesValues; -import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java index abc1a148d20..2dcf2453a69 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java @@ -17,18 +17,15 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.index.*; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.Index; -import org.elasticsearch.index.fielddata.FieldDataType; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.IndexFieldDataService; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractNumericFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractNumericFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java index a714c474b8e..bbc9f5ff5ba 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractNumericFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/AbstractNumericFieldDataTests.java @@ -17,16 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.search.*; -import org.elasticsearch.index.fielddata.*; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; -import org.junit.Ignore; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractStringFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java index 50065db1b1a..20e9d52ab8e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/AbstractStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/AbstractStringFieldDataTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import com.carrotsearch.randomizedtesting.annotations.Repeat; import com.carrotsearch.randomizedtesting.generators.RandomPicks; @@ -37,7 +37,6 @@ import org.apache.lucene.util._TestUtil; import org.elasticsearch.common.lucene.search.NotFilter; import org.elasticsearch.common.lucene.search.TermFilter; import org.elasticsearch.common.lucene.search.XFilteredQuery; -import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/DoubleFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/DoubleFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java index cc22ef9bfc1..eff45a2aee1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/DoubleFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/DoubleFieldDataTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.document.Document; import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.Term; -import org.elasticsearch.index.fielddata.FieldDataType; /** */ diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/DuellFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/DuellFieldDataTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/DuellFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/DuellFieldDataTests.java index 020036f0dbd..dd63f071a1d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/DuellFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/DuellFieldDataTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.document.*; import org.apache.lucene.index.AtomicReaderContext; @@ -25,7 +25,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.English; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.*; import org.elasticsearch.index.fielddata.BytesValues.Iter; import org.elasticsearch.index.mapper.FieldMapper; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FSTPackedBytesStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/FSTPackedBytesStringFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java index f3b802ee129..bda651078b0 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FSTPackedBytesStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FSTPackedBytesStringFieldDataTests.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.FieldDataType; -import org.junit.Test; /** */ diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FilterFieldDataTest.java b/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/FilterFieldDataTest.java rename to src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java index a895cbda41e..caea13c2f9e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FilterFieldDataTest.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.AtomicReaderContext; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.*; import org.elasticsearch.index.fielddata.AtomicFieldData.WithOrdinals; import org.elasticsearch.index.fielddata.ScriptDocValues.Strings; import org.elasticsearch.index.fielddata.ordinals.Ordinals.Docs; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FloatFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/FloatFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java index 7813b63462a..8c3cda9f5ae 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/FloatFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FloatFieldDataTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FloatField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.Term; -import org.elasticsearch.index.fielddata.FieldDataType; /** */ diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/LongFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/LongFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java index 7b5708c76ff..c16486a74d6 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/LongFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/LongFieldDataTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import gnu.trove.iterator.TLongIterator; import gnu.trove.set.TDoubleSet; @@ -30,7 +30,6 @@ import org.apache.lucene.document.LongField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.Term; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.*; import org.elasticsearch.index.fielddata.plain.PackedArrayAtomicFieldData; import org.elasticsearch.index.mapper.FieldMapper; import org.joda.time.DateTimeZone; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/NoOrdinalsStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/NoOrdinalsStringFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java index e2669437ddc..d7ec3bb0a38 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/NoOrdinalsStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java @@ -17,14 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; import org.elasticsearch.index.Index; -import org.elasticsearch.index.fielddata.AtomicFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; import org.elasticsearch.index.mapper.FieldMapper.Names; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/PagedBytesStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/PagedBytesStringFieldDataTests.java rename to src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java index 7f55e622f7d..5012b20b300 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/PagedBytesStringFieldDataTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/PagedBytesStringFieldDataTests.java @@ -17,10 +17,9 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata; +package org.elasticsearch.index.fielddata; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.FieldDataType; /** */ diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/MultiOrdinalsTests.java b/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/MultiOrdinalsTests.java rename to src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java index fbb21838848..03de723183b 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/MultiOrdinalsTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java @@ -17,15 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata.ordinals; +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.index.fielddata.ordinals.MultiOrdinals; -import org.elasticsearch.index.fielddata.ordinals.Ordinals; -import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/SingleOrdinalsTests.java b/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/SingleOrdinalsTests.java rename to src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java index cc73c95cf1e..f0fc111d9ed 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/fielddata/ordinals/SingleOrdinalsTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java @@ -17,12 +17,9 @@ * under the License. */ -package org.elasticsearch.test.unit.index.fielddata.ordinals; +package org.elasticsearch.index.fielddata.ordinals; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.index.fielddata.ordinals.Ordinals; -import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder; -import org.elasticsearch.index.fielddata.ordinals.SinglePackedOrdinals; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/gateway/CommitPointsTests.java b/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/gateway/CommitPointsTests.java rename to src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java index 32fd3dfb439..46e60332d17 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/gateway/CommitPointsTests.java +++ b/src/test/java/org/elasticsearch/index/gateway/CommitPointsTests.java @@ -17,16 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.gateway; +package org.elasticsearch.index.gateway; import com.google.common.base.Charsets; import com.google.common.collect.Lists; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.index.gateway.CommitPoint; -import org.elasticsearch.index.gateway.CommitPoints; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/MapperTestUtils.java b/src/test/java/org/elasticsearch/index/mapper/MapperTestUtils.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/MapperTestUtils.java rename to src/test/java/org/elasticsearch/index/mapper/MapperTestUtils.java index a682d604cac..ae36fb97bcc 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/MapperTestUtils.java +++ b/src/test/java/org/elasticsearch/index/mapper/MapperTestUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper; +package org.elasticsearch.index.mapper; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -31,8 +31,6 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.analysis.AnalysisModule; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.codec.postingsformat.PostingsFormatService; -import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.index.similarity.SimilarityLookupService; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/UidTests.java b/src/test/java/org/elasticsearch/index/mapper/UidTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/UidTests.java rename to src/test/java/org/elasticsearch/index/mapper/UidTests.java index 5bb8ad8ad1f..c6f34227f77 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/UidTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/UidTests.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.mapper; +package org.elasticsearch.index.mapper; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.bytes.HashedBytesArray; -import org.elasticsearch.index.mapper.Uid; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/SimpleAllMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/SimpleAllMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java index 6e845bc30f1..9096a4473b8 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/SimpleAllMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.all; +package org.elasticsearch.index.mapper.all; import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; @@ -29,7 +29,7 @@ import org.elasticsearch.common.lucene.all.AllTermQuery; import org.elasticsearch.common.lucene.all.AllTokenStream; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.hamcrest.Matchers; import org.junit.Test; @@ -45,9 +45,9 @@ public class SimpleAllMapperTests { @Test public void testSimpleAllMappers() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); AllEntries allEntries = ((AllTokenStream) field.tokenStream(docMapper.mappers().indexAnalyzer())).allEntries(); @@ -61,9 +61,9 @@ public class SimpleAllMapperTests { @Test public void testAllMappersNoBoost() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/noboost-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/noboost-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); AllEntries allEntries = ((AllTokenStream) field.tokenStream(docMapper.mappers().indexAnalyzer())).allEntries(); @@ -77,9 +77,9 @@ public class SimpleAllMapperTests { @Test public void testAllMappersTermQuery() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/mapping_omit_positions_on_all.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); AllEntries allEntries = ((AllTokenStream) field.tokenStream(docMapper.mappers().indexAnalyzer())).allEntries(); @@ -95,12 +95,12 @@ public class SimpleAllMapperTests { @Test public void testSimpleAllMappersWithReparse() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); String builtMapping = docMapper.mappingSource().string(); // reparse it DocumentMapper builtDocMapper = MapperTestUtils.newParser().parse(builtMapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = builtDocMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); @@ -113,9 +113,9 @@ public class SimpleAllMapperTests { @Test public void testSimpleAllMappersWithStore() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/store-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/store-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); AllEntries allEntries = ((AllTokenStream) field.tokenStream(docMapper.mappers().indexAnalyzer())).allEntries(); @@ -129,12 +129,12 @@ public class SimpleAllMapperTests { @Test public void testSimpleAllMappersWithReparseWithStore() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/store-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/store-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); String builtMapping = docMapper.mappingSource().string(); // reparse it DocumentMapper builtDocMapper = MapperTestUtils.newParser().parse(builtMapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/all/test1.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/all/test1.json"); Document doc = builtDocMapper.parse(new BytesArray(json)).rootDoc(); AllField field = (AllField) doc.getField("_all"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/mapping.json b/src/test/java/org/elasticsearch/index/mapper/all/mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/mapping.json rename to src/test/java/org/elasticsearch/index/mapper/all/mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/mapping_omit_positions_on_all.json b/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/mapping_omit_positions_on_all.json rename to src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/noboost-mapping.json b/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/noboost-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/store-mapping.json b/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/store-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/all/test1.json b/src/test/java/org/elasticsearch/index/mapper/all/test1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/all/test1.json rename to src/test/java/org/elasticsearch/index/mapper/all/test1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/analyzer/AnalyzerMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/analyzer/AnalyzerMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java index af337acc764..616ae96a7e6 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/analyzer/AnalyzerMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/analyzer/AnalyzerMapperTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.analyzer; +package org.elasticsearch.index.mapper.analyzer; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.analysis.FieldNameAnalyzer; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/BoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/boost/BoostMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java index ba27a06ca77..a688f929e8b 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/BoostMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/BoostMappingTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.boost; +package org.elasticsearch.index.mapper.boost; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/CustomBoostMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/boost/CustomBoostMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java index ff84e124306..faaafd89c96 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/CustomBoostMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.boost; +package org.elasticsearch.index.mapper.boost; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/FieldLevelBoostTests.java b/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/boost/FieldLevelBoostTests.java rename to src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java index 1dc3a947b2b..f3919e8d89c 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/boost/FieldLevelBoostTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.boost; +package org.elasticsearch.index.mapper.boost; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/camelcase/CamelCaseFieldNameTests.java b/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/camelcase/CamelCaseFieldNameTests.java rename to src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java index 60a2deffcd8..66d8546e7e7 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/camelcase/CamelCaseFieldNameTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.camelcase; +package org.elasticsearch.index.mapper.camelcase; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/completion/CompletionFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/completion/CompletionFieldMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java index 361bdd03ebc..c88fef06327 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/completion/CompletionFieldMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.mapper.completion; +package org.elasticsearch.index.mapper.completion; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/compound/CompoundTypesTests.java b/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/compound/CompoundTypesTests.java rename to src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java index 76089566cd2..45445a689f1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/compound/CompoundTypesTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.compound; +package org.elasticsearch.index.mapper.compound; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/date/SimpleDateMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index cc56f732301..d1318a1a1e9 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/date/SimpleDateMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.date; +package org.elasticsearch.index.mapper.date; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.MatcherAssert.assertThat; @@ -49,7 +49,7 @@ import org.elasticsearch.index.mapper.ParsedDocument; 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.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamic/DynamicMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamic/DynamicMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java index ca43a95d5b8..52158581b7e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamic/DynamicMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamic/DynamicMappingTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.dynamic; +package org.elasticsearch.index.mapper.dynamic; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.StrictDynamicMappingException; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java index f5f7a06c92a..843db35f349 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.dynamictemplate.genericstore; +package org.elasticsearch.index.mapper.dynamictemplate.genericstore; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -39,9 +39,9 @@ public class GenericStoreDynamicTemplateTests { @Test public void testSimple() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-data.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); IndexableField f = doc.getField("name"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/genericstore/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java similarity index 91% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java index 23e89b9b82f..44fc11f9b6d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.dynamictemplate.pathmatch; +package org.elasticsearch.index.mapper.dynamictemplate.pathmatch; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -39,9 +39,9 @@ public class PathMatchDynamicTemplateTests { @Test public void testSimple() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-data.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); IndexableField f = doc.getField("name"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/pathmatch/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java index 1ed30609134..fdd183d65a1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.dynamictemplate.simple; +package org.elasticsearch.index.mapper.dynamictemplate.simple; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMappers; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -39,9 +39,9 @@ public class SimpleDynamicTemplatesTests { @Test public void testSimple() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-data.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); IndexableField f = doc.getField("name"); @@ -92,12 +92,12 @@ public class SimpleDynamicTemplatesTests { @Test public void testSimpleWithXContentTraverse() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); docMapper.refreshSource(); docMapper = MapperTestUtils.newParser().parse(docMapper.mappingSource().string()); - byte[] json = copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-data.json"); + byte[] json = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json"); Document doc = docMapper.parse(new BytesArray(json)).rootDoc(); IndexableField f = doc.getField("name"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-data.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/dynamictemplate/simple/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeoShapeFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeoShapeFieldMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java index fcd6ed34198..bd2832a5ca9 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeoShapeFieldMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.unit.index.mapper.geo; +package org.elasticsearch.index.mapper.geo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -31,8 +31,7 @@ import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.geo.GeoShapeFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; public class GeoShapeFieldMapperTests { diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeohashMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java index 516c4840b5d..12db2c23a92 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/GeohashMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.geo; +package org.elasticsearch.index.mapper.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java index e41aaee01c5..8e34e178eaa 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonAndGeohashMappingGeoPointTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.geo; +package org.elasticsearch.index.mapper.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonMappingGeoPointTests.java rename to src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java index bb93f001cd8..ab3152b585e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/geo/LatLonMappingGeoPointTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/geo/LatLonMappingGeoPointTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.geo; +package org.elasticsearch.index.mapper.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/id/IdMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/id/IdMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java index 3d9e19a3e24..cf4193e32d5 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/id/IdMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.id; +package org.elasticsearch.index.mapper.id; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -27,7 +27,7 @@ import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.IdFieldMapper; import org.elasticsearch.index.mapper.internal.UidFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/index/IndexTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/index/IndexTypeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java index 4c15756f80e..e3eb02af34e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/index/IndexTypeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.index; +package org.elasticsearch.index.mapper.index; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.IndexFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/ip/SimpleIpMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/ip/SimpleIpMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java index 1e39a40a03f..c8a5634c70a 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/ip/SimpleIpMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.ip; +package org.elasticsearch.index.mapper.ip; import org.junit.Ignore; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/DoubleIndexingDocTest.java b/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/DoubleIndexingDocTest.java rename to src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java index 8d4e891199f..ee984a287d1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/DoubleIndexingDocTest.java +++ b/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.index.mapper.lucene; +package org.elasticsearch.index.mapper.lucene; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -11,7 +11,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/StoredNumericValuesTest.java b/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/StoredNumericValuesTest.java rename to src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java index e499a4ee1b7..d9e0236d4ba 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/lucene/StoredNumericValuesTest.java +++ b/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.index.mapper.lucene; +package org.elasticsearch.index.mapper.lucene; import org.apache.lucene.document.*; import org.apache.lucene.index.DirectoryReader; @@ -13,7 +13,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.fieldvisitor.CustomFieldsVisitor; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.util.*; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/merge/TestMergeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/merge/TestMergeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java index b5441676a1d..ccbc1c467c5 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/merge/TestMergeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.merge; +package org.elasticsearch.index.mapper.merge; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.object.ObjectMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.index.mapper.DocumentMapper.MergeFlags.mergeFlags; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/MultiFieldTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/MultiFieldTests.java rename to src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java index 94f70e70e48..e329366de33 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/MultiFieldTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.multifield; +package org.elasticsearch.index.mapper.multifield; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -41,9 +41,9 @@ public class MultiFieldTests { @Test public void testMultiField() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/test-data.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/multifield/test-data.json")); Document doc = docMapper.parse(json).rootDoc(); IndexableField f = doc.getField("name"); @@ -90,7 +90,7 @@ public class MultiFieldTests { DocumentMapper docMapper = mapperParser.parse(builtMapping); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/test-data.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/multifield/test-data.json")); Document doc = docMapper.parse(json).rootDoc(); IndexableField f = doc.getField("name"); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java similarity index 90% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java index 6ebe2ae47fe..7ee819d0d6e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.multifield.merge; +package org.elasticsearch.index.mapper.multifield.merge; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.util.Arrays; @@ -43,7 +43,7 @@ public class JavaMultiFieldMergeTests { @Test public void testMergeMultiField() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping1.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json"); DocumentMapperParser parser = MapperTestUtils.newParser(); DocumentMapper docMapper = parser.parse(mapping); @@ -51,7 +51,7 @@ public class JavaMultiFieldMergeTests { assertThat(docMapper.mappers().fullName("name").mapper().fieldType().indexed(), equalTo(true)); assertThat(docMapper.mappers().fullName("name.indexed"), nullValue()); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-data.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-data.json")); Document doc = docMapper.parse(json).rootDoc(); IndexableField f = doc.getField("name"); assertThat(f, notNullValue()); @@ -59,7 +59,7 @@ public class JavaMultiFieldMergeTests { assertThat(f, nullValue()); - mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping2.json"); + mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json"); DocumentMapper docMapper2 = parser.parse(mapping); DocumentMapper.MergeResult mergeResult = docMapper.merge(docMapper2, mergeFlags().simulate(true)); @@ -75,14 +75,14 @@ public class JavaMultiFieldMergeTests { assertThat(docMapper.mappers().fullName("name.not_indexed2"), nullValue()); assertThat(docMapper.mappers().fullName("name.not_indexed3"), nullValue()); - json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-data.json")); + json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-data.json")); doc = docMapper.parse(json).rootDoc(); f = doc.getField("name"); assertThat(f, notNullValue()); f = doc.getField("name.indexed"); assertThat(f, notNullValue()); - mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping3.json"); + mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json"); DocumentMapper docMapper3 = parser.parse(mapping); mergeResult = docMapper.merge(docMapper3, mergeFlags().simulate(true)); @@ -99,7 +99,7 @@ public class JavaMultiFieldMergeTests { assertThat(docMapper.mappers().fullName("name.not_indexed3"), nullValue()); - mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping4.json"); + mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json"); DocumentMapper docMapper4 = parser.parse(mapping); mergeResult = docMapper.merge(docMapper4, mergeFlags().simulate(true)); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-data.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping1.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping1.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping2.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping2.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping3.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping3.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping4.json b/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/merge/test-mapping4.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/test-data.json b/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/test-data.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/multifield/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/multifield/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/nested/NestedMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/nested/NestedMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java index a027df426ef..d1fb54f4614 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/nested/NestedMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.nested; +package org.elasticsearch.index.mapper.nested; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.TypeFieldMapper; import org.elasticsearch.index.mapper.object.ObjectMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/numeric/SimpleNumericTests.java b/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/numeric/SimpleNumericTests.java rename to src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java index c7eb971300c..6753115549b 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/numeric/SimpleNumericTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.numeric; +package org.elasticsearch.index.mapper.numeric; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; @@ -28,7 +28,7 @@ import org.elasticsearch.index.mapper.ParsedDocument; 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.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/object/NullValueObjectMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/object/NullValueObjectMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java index 6ecfd2556f3..37db5d5e3f4 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/object/NullValueObjectMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.object; +package org.elasticsearch.index.mapper.object; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/object/SimpleObjectMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/object/SimpleObjectMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java index 8dae8ed27e8..16ae932e5d4 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/object/SimpleObjectMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.object; +package org.elasticsearch.index.mapper.object; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/overridetype/OverrideTypeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/overridetype/OverrideTypeMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java index 89dff5854f2..be316987bc3 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/overridetype/OverrideTypeMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/overridetype/OverrideTypeMappingTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.overridetype; +package org.elasticsearch.index.mapper.overridetype; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/parent/ParentMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/parent/ParentMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java index 5ecaeaed33d..a28be7299f0 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/parent/ParentMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.parent; +package org.elasticsearch.index.mapper.parent; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/path/PathMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/path/PathMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java index 85495675e7c..fdee499177d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/path/PathMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.path; +package org.elasticsearch.index.mapper.path; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ public class PathMapperTests { @Test public void testPathMapping() throws IOException { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/path/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/path/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); assertThat(docMapper.mappers().indexName("first1"), notNullValue()); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/path/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/path/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/routing/RoutingTypeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/routing/RoutingTypeMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java index d328aa496b6..8b515542d4a 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/routing/RoutingTypeMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.routing; +package org.elasticsearch.index.mapper.routing; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/SimpleMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java similarity index 90% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/simple/SimpleMapperTests.java rename to src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java index bfa380be973..415a8faadc1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/SimpleMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java @@ -17,17 +17,16 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.simple; +package org.elasticsearch.index.mapper.simple; import org.apache.lucene.document.Document; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; -import org.elasticsearch.common.io.Streams; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import com.google.common.base.Charsets; @@ -51,7 +50,7 @@ public class SimpleMapperTests { .add(object("name").add(stringField("first").store(true).index(false))) ).build(mapperParser); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test1.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json")); Document doc = docMapper.parse("person", "1", json).rootDoc(); assertThat(doc.get(docMapper.mappers().name("first").mapper().names().indexName()), equalTo("shay")); @@ -65,13 +64,13 @@ public class SimpleMapperTests { @Test public void testParseToJsonAndParse() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); String builtMapping = docMapper.mappingSource().string(); // System.out.println(builtMapping); // reparse it DocumentMapper builtDocMapper = MapperTestUtils.newParser().parse(builtMapping); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test1.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json")); Document doc = builtDocMapper.parse(json).rootDoc(); assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1"))); assertThat(doc.get(docMapper.mappers().name("first").mapper().names().indexName()), equalTo("shay")); @@ -81,12 +80,12 @@ public class SimpleMapperTests { @Test public void testSimpleParser() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); assertThat((String) docMapper.meta().get("param1"), equalTo("value1")); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test1.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json")); Document doc = docMapper.parse(json).rootDoc(); assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1"))); assertThat(doc.get(docMapper.mappers().name("first").mapper().names().indexName()), equalTo("shay")); @@ -96,9 +95,9 @@ public class SimpleMapperTests { @Test public void testSimpleParserNoTypeNoId() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); - BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test1-notype-noid.json")); + BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1-notype-noid.json")); Document doc = docMapper.parse("person", "1", json).rootDoc(); assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1"))); assertThat(doc.get(docMapper.mappers().name("first").mapper().names().indexName()), equalTo("shay")); @@ -108,7 +107,7 @@ public class SimpleMapperTests { @Test public void testAttributes() throws Exception { - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/simple/test-mapping.json"); DocumentMapper docMapper = MapperTestUtils.newParser().parse(mapping); assertThat((String) docMapper.meta().get("param1"), equalTo("value1")); diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json b/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test-mapping.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1-notype-noid.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1-notype-noid.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1-notype.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1-notype.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1.json b/src/test/java/org/elasticsearch/index/mapper/simple/test1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/simple/test1.json rename to src/test/java/org/elasticsearch/index/mapper/simple/test1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/size/SizeMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/size/SizeMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java index 8f286236120..0233adf5ac8 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/size/SizeMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.size; +package org.elasticsearch.index.mapper.size; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/source/CompressSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/source/CompressSourceMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java index e4b60a7e127..3d16f0b06d7 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/source/CompressSourceMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.source; +package org.elasticsearch.index.mapper.source; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.compress.CompressorFactory; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/source/DefaultSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/source/DefaultSourceMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java index 0650ac62bed..c53fcdd4251 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/source/DefaultSourceMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.source; +package org.elasticsearch.index.mapper.source; import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.bytes.BytesArray; @@ -28,8 +28,8 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.integration.ElasticsearchTestCase; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.ElasticsearchTestCase; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/string/SimpleStringMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/string/SimpleStringMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java index dbac156e76a..ee690191a1b 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/string/SimpleStringMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.string; +package org.elasticsearch.index.mapper.string; import org.apache.lucene.index.FieldInfo; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/timestamp/TimestampMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java index 45ce51c6f49..ac8b0d8ed67 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/timestamp/TimestampMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.timestamp; +package org.elasticsearch.index.mapper.timestamp; import java.util.Locale; import java.util.Map; @@ -30,7 +30,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/ttl/TTLMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/ttl/TTLMappingTests.java rename to src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java index 901eb34933a..958d0ab751c 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/ttl/TTLMappingTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java @@ -18,7 +18,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.ttl; +package org.elasticsearch.index.mapper.ttl; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentFactory; @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.internal.TTLFieldMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java rename to src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java index 7298b13b1b8..e73c806caae 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.typelevels; +package org.elasticsearch.index.mapper.typelevels; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseMappingTypeLevelTests.java b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java similarity index 93% rename from src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseMappingTypeLevelTests.java rename to src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java index 4c7876d6b6f..1ad8ad15d0d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/mapper/typelevels/ParseMappingTypeLevelTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.index.mapper.typelevels; +package org.elasticsearch.index.mapper.typelevels; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.test.unit.index.mapper.MapperTestUtils; +import org.elasticsearch.index.mapper.MapperTestUtils; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/index/merge/policy/MergePolicySettingsTest.java b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/merge/policy/MergePolicySettingsTest.java rename to src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java index d0acdc975d4..0896a090041 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/merge/policy/MergePolicySettingsTest.java +++ b/src/test/java/org/elasticsearch/index/merge/policy/MergePolicySettingsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.merge.policy; +package org.elasticsearch.index.merge.policy; import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS; @@ -27,10 +27,6 @@ import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.index.merge.policy.LogByteSizeMergePolicyProvider; -import org.elasticsearch.index.merge.policy.LogDocMergePolicyProvider; -import org.elasticsearch.index.merge.policy.AbstractMergePolicyProvider; -import org.elasticsearch.index.merge.policy.TieredMergePolicyProvider; import org.elasticsearch.index.settings.IndexSettingsService; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.DirectoryService; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java rename to src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index d9f030a1886..7d8b4f544e1 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/SimpleIndexQueryParserTests.java +++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query; +package org.elasticsearch.index.query; import com.google.common.collect.Lists; @@ -54,7 +54,6 @@ import org.elasticsearch.index.codec.CodecModule; import org.elasticsearch.index.engine.IndexEngineModule; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperServiceModule; -import org.elasticsearch.index.query.*; import org.elasticsearch.index.query.functionscore.FunctionScoreModule; import org.elasticsearch.index.search.NumericRangeFieldDataFilter; import org.elasticsearch.index.search.geo.GeoDistanceFilter; @@ -64,7 +63,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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.hamcrest.Matchers; @@ -125,9 +124,9 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { } ).createInjector(); - String mapping = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/mapping.json"); + String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/mapping.json"); injector.getInstance(MapperService.class).merge("person", mapping, true); - injector.getInstance(MapperService.class).documentMapper("person").parse(new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/test/unit/index/query/data.json"))); + injector.getInstance(MapperService.class).documentMapper("person").parse(new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/query/data.json"))); queryParser = injector.getInstance(IndexQueryParserService.class); } @@ -161,7 +160,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryString() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(TermQuery.class)); TermQuery termQuery = (TermQuery) parsedQuery; @@ -207,7 +206,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryStringFields1() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query-fields1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query-fields1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery bQuery = (BooleanQuery) parsedQuery; @@ -219,7 +218,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryStringFieldsMatch() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query-fields-match.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query-fields-match.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery bQuery = (BooleanQuery) parsedQuery; @@ -242,7 +241,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryStringFields2() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query-fields2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query-fields2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(DisjunctionMaxQuery.class)); DisjunctionMaxQuery disMaxQuery = (DisjunctionMaxQuery) parsedQuery; @@ -267,7 +266,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryStringFields3() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query-fields3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query-fields3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(DisjunctionMaxQuery.class)); DisjunctionMaxQuery disMaxQuery = (DisjunctionMaxQuery) parsedQuery; @@ -290,7 +289,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testMatchAll() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/matchAll.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/matchAll.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(MatchAllDocsQuery.class)); MatchAllDocsQuery matchAllDocsQuery = (MatchAllDocsQuery) parsedQuery; @@ -300,7 +299,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testMatchAllEmpty1() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/match_all_empty1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/match_all_empty1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, equalTo(Queries.newMatchAllQuery())); assertThat(parsedQuery, not(sameInstance(Queries.newMatchAllQuery()))); @@ -309,7 +308,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testMatchAllEmpty2() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/match_all_empty2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/match_all_empty2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, equalTo(Queries.newMatchAllQuery())); assertThat(parsedQuery, not(sameInstance(Queries.newMatchAllQuery()))); @@ -319,7 +318,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testStarColonStar() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/starColonStar.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/starColonStar.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class)); ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) parsedQuery; @@ -350,7 +349,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testDisMax() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/disMax.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/disMax.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(DisjunctionMaxQuery.class)); DisjunctionMaxQuery disjunctionMaxQuery = (DisjunctionMaxQuery) parsedQuery; @@ -371,7 +370,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testDisMax2() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/disMax2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/disMax2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(DisjunctionMaxQuery.class)); DisjunctionMaxQuery disjunctionMaxQuery = (DisjunctionMaxQuery) parsedQuery; @@ -400,7 +399,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/term.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/term.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); NumericRangeQuery fieldQuery = (NumericRangeQuery) parsedQuery; @@ -422,7 +421,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFuzzyQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fuzzy.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fuzzy.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(FuzzyQuery.class)); FuzzyQuery fuzzyQuery = (FuzzyQuery) parsedQuery; @@ -444,7 +443,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFuzzyQueryWithFields() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fuzzy-with-fields.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fuzzy-with-fields.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(FuzzyQuery.class)); FuzzyQuery fuzzyQuery = (FuzzyQuery) parsedQuery; @@ -457,7 +456,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFuzzyQueryWithFields2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fuzzy-with-fields2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fuzzy-with-fields2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); NumericRangeQuery fuzzyQuery = (NumericRangeQuery) parsedQuery; @@ -480,7 +479,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFieldQuery1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/field1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/field1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); NumericRangeQuery fieldQuery = (NumericRangeQuery) parsedQuery; @@ -493,7 +492,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFieldQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/field2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/field2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery bQuery = (BooleanQuery) parsedQuery; @@ -507,7 +506,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFieldQuery3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/field3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/field3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat((double) parsedQuery.getBoost(), closeTo(2.0, 0.01)); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); @@ -521,7 +520,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTextQuery1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/text1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/text1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery booleanQuery = (BooleanQuery) parsedQuery; @@ -533,7 +532,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTextQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/text2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/text2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery booleanQuery = (BooleanQuery) parsedQuery; @@ -545,7 +544,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTextQuery3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/text3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/text3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(PhraseQuery.class)); PhraseQuery phraseQuery = (PhraseQuery) parsedQuery; @@ -556,7 +555,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTextQuery4() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/text4.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/text4.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(MultiPhrasePrefixQuery.class)); MultiPhrasePrefixQuery phraseQuery = (MultiPhrasePrefixQuery) parsedQuery; @@ -567,7 +566,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTextQuery4_2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/text4_2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/text4_2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(MultiPhrasePrefixQuery.class)); MultiPhrasePrefixQuery phraseQuery = (MultiPhrasePrefixQuery) parsedQuery; @@ -591,7 +590,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermWithBoostQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/term-with-boost.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/term-with-boost.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); NumericRangeQuery fieldQuery = (NumericRangeQuery) parsedQuery; @@ -615,7 +614,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testPrefixQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/prefix.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/prefix.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(PrefixQuery.class)); PrefixQuery prefixQuery = (PrefixQuery) parsedQuery; @@ -626,7 +625,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testPrefixBoostQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/prefix-boost.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/prefix-boost.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(PrefixQuery.class)); PrefixQuery prefixQuery = (PrefixQuery) parsedQuery; @@ -648,7 +647,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testPrefixFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/prefix-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/prefix-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -659,7 +658,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testPrefixNamedFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/prefix-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/prefix-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -681,7 +680,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testPrefixQueryBoostQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/prefix-with-boost.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/prefix-with-boost.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(PrefixQuery.class)); PrefixQuery prefixQuery = (PrefixQuery) parsedQuery; @@ -711,7 +710,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRegexpQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(RegexpQuery.class)); RegexpQuery regexpQuery = (RegexpQuery) parsedQuery; @@ -721,7 +720,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRegexpFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); Filter filter = ((XFilteredQuery) parsedQuery).getFilter(); @@ -734,7 +733,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNamedRegexpFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -748,7 +747,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRegexpWithFlagsFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp-filter-flags.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp-filter-flags.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); Filter filter = ((XFilteredQuery) parsedQuery.query()).getFilter(); @@ -762,7 +761,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNamedAndCachedRegexpWithFlagsFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp-filter-flags-named-cached.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); Filter filter = ((XFilteredQuery) parsedQuery.query()).getFilter(); @@ -779,7 +778,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRegexpBoostQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/regexp-boost.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/regexp-boost.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(RegexpQuery.class)); RegexpQuery regexpQuery = (RegexpQuery) parsedQuery; @@ -799,7 +798,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testWildcardQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/wildcard.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/wildcard.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(WildcardQuery.class)); WildcardQuery wildcardQuery = (WildcardQuery) parsedQuery; @@ -809,7 +808,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testWildcardBoostQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/wildcard-boost.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/wildcard-boost.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(WildcardQuery.class)); WildcardQuery wildcardQuery = (WildcardQuery) parsedQuery; @@ -834,7 +833,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRangeQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/range.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/range.json"); Query parsedQuery = queryParser.parse(query).query(); // since age is automatically registered in data, we encode it as numeric assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); @@ -849,7 +848,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRange2Query() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/range2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/range2.json"); Query parsedQuery = queryParser.parse(query).query(); // since age is automatically registered in data, we encode it as numeric assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); @@ -880,7 +879,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRangeFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/range-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/range-filter.json"); Query parsedQuery = queryParser.parse(query).query(); // since age is automatically registered in data, we encode it as numeric assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); @@ -897,7 +896,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testRangeNamedFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/range-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/range-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -929,7 +928,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNumericRangeFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/numeric_range-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/numeric_range-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); Filter filter = ((XFilteredQuery) parsedQuery).getFilter(); @@ -979,7 +978,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testBoolFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/bool-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/bool-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1025,7 +1024,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testAndFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/and-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/and-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1039,7 +1038,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testAndNamedFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/and-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/and-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -1054,7 +1053,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testAndFilteredQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/and-filter2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/and-filter2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1081,7 +1080,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testOrFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/or-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/or-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1095,7 +1094,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testOrFilteredQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/or-filter2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/or-filter2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1120,7 +1119,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNotFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/not-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/not-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1133,7 +1132,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNotFilteredQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/not-filter2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/not-filter2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1146,7 +1145,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testNotFilteredQuery3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/not-filter3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/not-filter3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1166,7 +1165,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testBoostingQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/boosting-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/boosting-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BoostingQuery.class)); } @@ -1174,7 +1173,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryStringFuzzyNumeric() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(NumericRangeQuery.class)); NumericRangeQuery fuzzyQuery = (NumericRangeQuery) parsedQuery; @@ -1209,7 +1208,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testBoolQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/bool.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/bool.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery booleanQuery = (BooleanQuery) parsedQuery; @@ -1250,7 +1249,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermsQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/terms-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/terms-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(BooleanQuery.class)); BooleanQuery booleanQuery = (BooleanQuery) parsedQuery; @@ -1298,7 +1297,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFilteredQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/filtered-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/filtered-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1309,7 +1308,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFilteredQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/filtered-query2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/filtered-query2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1320,7 +1319,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFilteredQuery3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/filtered-query3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/filtered-query3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1337,7 +1336,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFilteredQuery4() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/filtered-query4.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/filtered-query4.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1351,7 +1350,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testLimitFilter() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/limit-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/limit-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1365,7 +1364,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermFilterQuery() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/term-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/term-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1378,7 +1377,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermNamedFilterQuery() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/term-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/term-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -1405,7 +1404,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermsFilterQuery() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/terms-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/terms-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1418,7 +1417,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testTermsWithNameFilterQuery() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/terms-filter-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/terms-filter-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -1441,7 +1440,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testConstantScoreQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/constantScore-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/constantScore-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1484,7 +1483,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testCustomBoostFactorQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/custom-boost-factor-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/custom-boost-factor-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(FunctionScoreQuery.class)); FunctionScoreQuery functionScoreQuery = (FunctionScoreQuery) parsedQuery; @@ -1505,7 +1504,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanTermQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanTerm.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanTerm.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanTermQuery.class)); SpanTermQuery termQuery = (SpanTermQuery) parsedQuery; @@ -1527,7 +1526,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanNotQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanNot.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanNot.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanNotQuery.class)); SpanNotQuery spanNotQuery = (SpanNotQuery) parsedQuery; @@ -1550,7 +1549,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanFirstQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanFirst.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanFirst.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanFirstQuery.class)); SpanFirstQuery spanFirstQuery = (SpanFirstQuery) parsedQuery; @@ -1575,7 +1574,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanNearQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanNear.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanNear.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanNearQuery.class)); SpanNearQuery spanNearQuery = (SpanNearQuery) parsedQuery; @@ -1589,7 +1588,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFieldMaskingSpanQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanFieldMaskingTerm.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanFieldMaskingTerm.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanNearQuery.class)); SpanNearQuery spanNearQuery = (SpanNearQuery) parsedQuery; @@ -1616,7 +1615,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanOrQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanOr.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanOr.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanOrQuery.class)); SpanOrQuery spanOrQuery = (SpanOrQuery) parsedQuery; @@ -1629,7 +1628,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanOrQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/spanOr2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/spanOr2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanOrQuery.class)); SpanOrQuery spanOrQuery = (SpanOrQuery) parsedQuery; @@ -1642,7 +1641,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermWildcardQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-wildcard.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); WildcardQuery expectedWrapped = new WildcardQuery(new Term("user", "ki*y")); @@ -1654,7 +1653,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermPrefixQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-prefix.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); PrefixQuery expectedWrapped = new PrefixQuery(new Term("user", "ki")); @@ -1666,7 +1665,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermFuzzyTermQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); SpanMultiTermQueryWrapper wrapper = (SpanMultiTermQueryWrapper) parsedQuery; @@ -1676,7 +1675,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermFuzzyRangeQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); NumericRangeQuery expectedWrapped = NumericRangeQuery.newLongRange("age", 7l, 17l, true, true); @@ -1688,7 +1687,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermNumericRangeQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-range-numeric.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); NumericRangeQuery expectedWrapped = NumericRangeQuery.newLongRange("age", 10l, 20l, true, false); @@ -1700,7 +1699,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testSpanMultiTermTermRangeQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/span-multi-term-range-numeric.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(SpanMultiTermQueryWrapper.class)); NumericRangeQuery expectedWrapped = NumericRangeQuery.newLongRange("age", 10l, 20l, true, false); @@ -1726,7 +1725,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testQueryFilter() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/query-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/query-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XFilteredQuery.class)); XFilteredQuery filteredQuery = (XFilteredQuery) parsedQuery; @@ -1741,7 +1740,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFQueryFilter() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fquery-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fquery-filter.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XFilteredQuery.class)); @@ -1769,7 +1768,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testMoreLikeThis() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/mlt.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/mlt.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(MoreLikeThisQuery.class)); MoreLikeThisQuery mltQuery = (MoreLikeThisQuery) parsedQuery; @@ -1791,7 +1790,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFuzzyLikeThis() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fuzzyLikeThis.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fuzzyLikeThis.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(FuzzyLikeThisQuery.class)); // FuzzyLikeThisQuery fuzzyLikeThisQuery = (FuzzyLikeThisQuery) parsedQuery; @@ -1808,7 +1807,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testFuzzyLikeThisField() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/fuzzyLikeThisField.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/fuzzyLikeThisField.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(FuzzyLikeThisQuery.class)); // FuzzyLikeThisQuery fuzzyLikeThisQuery = (FuzzyLikeThisQuery) parsedQuery; @@ -1829,7 +1828,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testMoreLikeThisField() throws Exception { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/mltField.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/mltField.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(MoreLikeThisQuery.class)); MoreLikeThisQuery mltQuery = (MoreLikeThisQuery) parsedQuery; @@ -1842,7 +1841,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilterNamed() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XConstantScoreQuery.class)); @@ -1857,7 +1856,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1871,7 +1870,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1885,7 +1884,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1899,7 +1898,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter4() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance4.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance4.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1913,7 +1912,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter5() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance5.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance5.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1927,7 +1926,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter6() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance6.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance6.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1941,7 +1940,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter7() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance7.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance7.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1955,7 +1954,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter8() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance8.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance8.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1969,7 +1968,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter9() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance9.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance9.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1983,7 +1982,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter10() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance10.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance10.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -1997,7 +1996,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter11() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance11.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance11.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2011,7 +2010,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoDistanceFilter12() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_distance12.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_distance12.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2025,7 +2024,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoBoundingBoxFilterNamed() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_boundingbox-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_boundingbox-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.query(), instanceOf(XConstantScoreQuery.class)); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); @@ -2042,7 +2041,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoBoundingBoxFilter1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_boundingbox1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_boundingbox1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2057,7 +2056,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoBoundingBoxFilter2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_boundingbox2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_boundingbox2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2072,7 +2071,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoBoundingBoxFilter3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_boundingbox3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_boundingbox3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2087,7 +2086,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoBoundingBoxFilter4() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_boundingbox4.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_boundingbox4.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2102,7 +2101,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoPolygonNamedFilter() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_polygon-named.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_polygon-named.json"); ParsedQuery parsedQuery = queryParser.parse(query); assertThat(parsedQuery.namedFilters().containsKey("test"), equalTo(true)); assertThat(parsedQuery.query(), instanceOf(XConstantScoreQuery.class)); @@ -2121,7 +2120,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoPolygonFilter1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_polygon1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_polygon1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2139,7 +2138,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoPolygonFilter2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_polygon2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_polygon2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2157,7 +2156,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoPolygonFilter3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_polygon3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_polygon3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2175,7 +2174,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoPolygonFilter4() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geo_polygon4.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geo_polygon4.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2193,7 +2192,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoShapeFilter() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geoShape-filter.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geoShape-filter.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(XConstantScoreQuery.class)); XConstantScoreQuery constantScoreQuery = (XConstantScoreQuery) parsedQuery; @@ -2203,7 +2202,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testGeoShapeQuery() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/geoShape-query.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/geoShape-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class)); ConstantScoreQuery csq = (ConstantScoreQuery) parsedQuery; @@ -2213,7 +2212,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testCommonTermsQuery1() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/commonTerms-query1.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/commonTerms-query1.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(ExtendedCommonTermsQuery.class)); ExtendedCommonTermsQuery ectQuery = (ExtendedCommonTermsQuery) parsedQuery; @@ -2224,7 +2223,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testCommonTermsQuery2() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/commonTerms-query2.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/commonTerms-query2.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(ExtendedCommonTermsQuery.class)); ExtendedCommonTermsQuery ectQuery = (ExtendedCommonTermsQuery) parsedQuery; @@ -2235,7 +2234,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { @Test public void testCommonTermsQuery3() throws IOException { IndexQueryParserService queryParser = queryParser(); - String query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/commonTerms-query3.json"); + String query = copyToStringFromClasspath("/org/elasticsearch/index/query/commonTerms-query3.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat(parsedQuery, instanceOf(ExtendedCommonTermsQuery.class)); ExtendedCommonTermsQuery ectQuery = (ExtendedCommonTermsQuery) parsedQuery; @@ -2248,7 +2247,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { IndexQueryParserService queryParser; queryParser = queryParser(); String query; - query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/faulty-function-score-query.json"); + query = copyToStringFromClasspath("/org/elasticsearch/index/query/faulty-function-score-query.json"); Query parsedQuery = queryParser.parse(query).query(); } @@ -2257,7 +2256,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchTestCase { IndexQueryParserService queryParser; queryParser = queryParser(); String query; - query = copyToStringFromClasspath("/org/elasticsearch/test/unit/index/query/function-filter-score-query.json"); + query = copyToStringFromClasspath("/org/elasticsearch/index/query/function-filter-score-query.json"); Query parsedQuery = queryParser.parse(query).query(); assertThat((double) (parsedQuery.getBoost()), Matchers.closeTo(3.0, 1.e-7)); } diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/and-filter-named.json b/src/test/java/org/elasticsearch/index/query/and-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/and-filter-named.json rename to src/test/java/org/elasticsearch/index/query/and-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/and-filter.json b/src/test/java/org/elasticsearch/index/query/and-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/and-filter.json rename to src/test/java/org/elasticsearch/index/query/and-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/and-filter2.json b/src/test/java/org/elasticsearch/index/query/and-filter2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/and-filter2.json rename to src/test/java/org/elasticsearch/index/query/and-filter2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/bool-filter.json b/src/test/java/org/elasticsearch/index/query/bool-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/bool-filter.json rename to src/test/java/org/elasticsearch/index/query/bool-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/bool.json b/src/test/java/org/elasticsearch/index/query/bool.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/bool.json rename to src/test/java/org/elasticsearch/index/query/bool.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/boosting-query.json b/src/test/java/org/elasticsearch/index/query/boosting-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/boosting-query.json rename to src/test/java/org/elasticsearch/index/query/boosting-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query1.json b/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query1.json rename to src/test/java/org/elasticsearch/index/query/commonTerms-query1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query2.json b/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query2.json rename to src/test/java/org/elasticsearch/index/query/commonTerms-query2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query3.json b/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/commonTerms-query3.json rename to src/test/java/org/elasticsearch/index/query/commonTerms-query3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/constantScore-query.json b/src/test/java/org/elasticsearch/index/query/constantScore-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/constantScore-query.json rename to src/test/java/org/elasticsearch/index/query/constantScore-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/custom-boost-factor-query.json b/src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/custom-boost-factor-query.json rename to src/test/java/org/elasticsearch/index/query/custom-boost-factor-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/custom_score1.json b/src/test/java/org/elasticsearch/index/query/custom_score1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/custom_score1.json rename to src/test/java/org/elasticsearch/index/query/custom_score1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/data.json b/src/test/java/org/elasticsearch/index/query/data.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/data.json rename to src/test/java/org/elasticsearch/index/query/data.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/disMax.json b/src/test/java/org/elasticsearch/index/query/disMax.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/disMax.json rename to src/test/java/org/elasticsearch/index/query/disMax.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/disMax2.json b/src/test/java/org/elasticsearch/index/query/disMax2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/disMax2.json rename to src/test/java/org/elasticsearch/index/query/disMax2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/faulty-function-score-query.json b/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/faulty-function-score-query.json rename to src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/field1.json b/src/test/java/org/elasticsearch/index/query/field1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/field1.json rename to src/test/java/org/elasticsearch/index/query/field1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/field2.json b/src/test/java/org/elasticsearch/index/query/field2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/field2.json rename to src/test/java/org/elasticsearch/index/query/field2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/field3.json b/src/test/java/org/elasticsearch/index/query/field3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/field3.json rename to src/test/java/org/elasticsearch/index/query/field3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/filtered-query.json b/src/test/java/org/elasticsearch/index/query/filtered-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/filtered-query.json rename to src/test/java/org/elasticsearch/index/query/filtered-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/filtered-query2.json b/src/test/java/org/elasticsearch/index/query/filtered-query2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/filtered-query2.json rename to src/test/java/org/elasticsearch/index/query/filtered-query2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/filtered-query3.json b/src/test/java/org/elasticsearch/index/query/filtered-query3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/filtered-query3.json rename to src/test/java/org/elasticsearch/index/query/filtered-query3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/filtered-query4.json b/src/test/java/org/elasticsearch/index/query/filtered-query4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/filtered-query4.json rename to src/test/java/org/elasticsearch/index/query/filtered-query4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fquery-filter.json b/src/test/java/org/elasticsearch/index/query/fquery-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fquery-filter.json rename to src/test/java/org/elasticsearch/index/query/fquery-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/function-filter-score-query.json b/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/function-filter-score-query.json rename to src/test/java/org/elasticsearch/index/query/function-filter-score-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fuzzy-with-fields.json b/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fuzzy-with-fields.json rename to src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fuzzy-with-fields2.json b/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fuzzy-with-fields2.json rename to src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fuzzy.json b/src/test/java/org/elasticsearch/index/query/fuzzy.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fuzzy.json rename to src/test/java/org/elasticsearch/index/query/fuzzy.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fuzzyLikeThis.json b/src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fuzzyLikeThis.json rename to src/test/java/org/elasticsearch/index/query/fuzzyLikeThis.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/fuzzyLikeThisField.json b/src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/fuzzyLikeThisField.json rename to src/test/java/org/elasticsearch/index/query/fuzzyLikeThisField.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geoShape-filter.json b/src/test/java/org/elasticsearch/index/query/geoShape-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geoShape-filter.json rename to src/test/java/org/elasticsearch/index/query/geoShape-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geoShape-query.json b/src/test/java/org/elasticsearch/index/query/geoShape-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geoShape-query.json rename to src/test/java/org/elasticsearch/index/query/geoShape-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox-named.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox-named.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox1.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox1.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox2.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox2.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox3.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox3.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox4.json b/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_boundingbox4.json rename to src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance-named.json b/src/test/java/org/elasticsearch/index/query/geo_distance-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance-named.json rename to src/test/java/org/elasticsearch/index/query/geo_distance-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance1.json b/src/test/java/org/elasticsearch/index/query/geo_distance1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance1.json rename to src/test/java/org/elasticsearch/index/query/geo_distance1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance10.json b/src/test/java/org/elasticsearch/index/query/geo_distance10.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance10.json rename to src/test/java/org/elasticsearch/index/query/geo_distance10.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance11.json b/src/test/java/org/elasticsearch/index/query/geo_distance11.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance11.json rename to src/test/java/org/elasticsearch/index/query/geo_distance11.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance12.json b/src/test/java/org/elasticsearch/index/query/geo_distance12.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance12.json rename to src/test/java/org/elasticsearch/index/query/geo_distance12.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance2.json b/src/test/java/org/elasticsearch/index/query/geo_distance2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance2.json rename to src/test/java/org/elasticsearch/index/query/geo_distance2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance3.json b/src/test/java/org/elasticsearch/index/query/geo_distance3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance3.json rename to src/test/java/org/elasticsearch/index/query/geo_distance3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance4.json b/src/test/java/org/elasticsearch/index/query/geo_distance4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance4.json rename to src/test/java/org/elasticsearch/index/query/geo_distance4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance5.json b/src/test/java/org/elasticsearch/index/query/geo_distance5.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance5.json rename to src/test/java/org/elasticsearch/index/query/geo_distance5.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance6.json b/src/test/java/org/elasticsearch/index/query/geo_distance6.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance6.json rename to src/test/java/org/elasticsearch/index/query/geo_distance6.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance7.json b/src/test/java/org/elasticsearch/index/query/geo_distance7.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance7.json rename to src/test/java/org/elasticsearch/index/query/geo_distance7.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance8.json b/src/test/java/org/elasticsearch/index/query/geo_distance8.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance8.json rename to src/test/java/org/elasticsearch/index/query/geo_distance8.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_distance9.json b/src/test/java/org/elasticsearch/index/query/geo_distance9.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_distance9.json rename to src/test/java/org/elasticsearch/index/query/geo_distance9.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon-named.json b/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon-named.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon1.json b/src/test/java/org/elasticsearch/index/query/geo_polygon1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon1.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon2.json b/src/test/java/org/elasticsearch/index/query/geo_polygon2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon2.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon3.json b/src/test/java/org/elasticsearch/index/query/geo_polygon3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon3.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon4.json b/src/test/java/org/elasticsearch/index/query/geo_polygon4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/geo_polygon4.json rename to src/test/java/org/elasticsearch/index/query/geo_polygon4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/guice/IndexQueryParserModuleTests.java b/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/query/guice/IndexQueryParserModuleTests.java rename to src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java index bbcfb307abf..3cd2eb960d6 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/guice/IndexQueryParserModuleTests.java +++ b/src/test/java/org/elasticsearch/index/query/guice/IndexQueryParserModuleTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.guice; +package org.elasticsearch.index.query.guice; import org.elasticsearch.cache.recycler.CacheRecyclerModule; import org.elasticsearch.cluster.ClusterService; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonFilterParser.java b/src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonFilterParser.java rename to src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java index 3dc8fb5929f..0ade8523cee 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonFilterParser.java +++ b/src/test/java/org/elasticsearch/index/query/guice/MyJsonFilterParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.guice; +package org.elasticsearch.index.query.guice; import org.apache.lucene.search.Filter; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonQueryParser.java b/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonQueryParser.java rename to src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java index 71304a12eef..734d5ae8c14 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/guice/MyJsonQueryParser.java +++ b/src/test/java/org/elasticsearch/index/query/guice/MyJsonQueryParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.guice; +package org.elasticsearch.index.query.guice; import org.apache.lucene.search.Query; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/limit-filter.json b/src/test/java/org/elasticsearch/index/query/limit-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/limit-filter.json rename to src/test/java/org/elasticsearch/index/query/limit-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/mapping.json b/src/test/java/org/elasticsearch/index/query/mapping.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/mapping.json rename to src/test/java/org/elasticsearch/index/query/mapping.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/matchAll.json b/src/test/java/org/elasticsearch/index/query/matchAll.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/matchAll.json rename to src/test/java/org/elasticsearch/index/query/matchAll.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty1.json b/src/test/java/org/elasticsearch/index/query/match_all_empty1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty1.json rename to src/test/java/org/elasticsearch/index/query/match_all_empty1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty2.json b/src/test/java/org/elasticsearch/index/query/match_all_empty2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/match_all_empty2.json rename to src/test/java/org/elasticsearch/index/query/match_all_empty2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/mlt.json b/src/test/java/org/elasticsearch/index/query/mlt.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/mlt.json rename to src/test/java/org/elasticsearch/index/query/mlt.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/mltField.json b/src/test/java/org/elasticsearch/index/query/mltField.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/mltField.json rename to src/test/java/org/elasticsearch/index/query/mltField.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/not-filter.json b/src/test/java/org/elasticsearch/index/query/not-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/not-filter.json rename to src/test/java/org/elasticsearch/index/query/not-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/not-filter2.json b/src/test/java/org/elasticsearch/index/query/not-filter2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/not-filter2.json rename to src/test/java/org/elasticsearch/index/query/not-filter2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/not-filter3.json b/src/test/java/org/elasticsearch/index/query/not-filter3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/not-filter3.json rename to src/test/java/org/elasticsearch/index/query/not-filter3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/numeric_range-filter.json b/src/test/java/org/elasticsearch/index/query/numeric_range-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/numeric_range-filter.json rename to src/test/java/org/elasticsearch/index/query/numeric_range-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/or-filter.json b/src/test/java/org/elasticsearch/index/query/or-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/or-filter.json rename to src/test/java/org/elasticsearch/index/query/or-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/or-filter2.json b/src/test/java/org/elasticsearch/index/query/or-filter2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/or-filter2.json rename to src/test/java/org/elasticsearch/index/query/or-filter2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPlugin2Tests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPlugin2Tests.java rename to src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java index e2a26e6ce95..093be31c2dd 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPlugin2Tests.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPlugin2Tests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.plugin; +package org.elasticsearch.index.query.plugin; import org.elasticsearch.cache.recycler.CacheRecyclerModule; import org.elasticsearch.cluster.ClusterService; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPluginTests.java b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPluginTests.java rename to src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java index 1c4f4d9ad41..f799832260e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/IndexQueryParserPluginTests.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/IndexQueryParserPluginTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.plugin; +package org.elasticsearch.index.query.plugin; import org.elasticsearch.cache.recycler.CacheRecyclerModule; import org.elasticsearch.cluster.ClusterService; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonFilterParser.java b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonFilterParser.java rename to src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java index 9552e2aa870..441996ae08e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonFilterParser.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonFilterParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.plugin; +package org.elasticsearch.index.query.plugin; import org.apache.lucene.search.Filter; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonQueryParser.java b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonQueryParser.java rename to src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java index 857ee22cd22..35fe6da57e3 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/query/plugin/PluginJsonQueryParser.java +++ b/src/test/java/org/elasticsearch/index/query/plugin/PluginJsonQueryParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.query.plugin; +package org.elasticsearch.index.query.plugin; import org.apache.lucene.search.Query; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/prefix-boost.json b/src/test/java/org/elasticsearch/index/query/prefix-boost.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/prefix-boost.json rename to src/test/java/org/elasticsearch/index/query/prefix-boost.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/prefix-filter-named.json b/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/prefix-filter-named.json rename to src/test/java/org/elasticsearch/index/query/prefix-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/prefix-filter.json b/src/test/java/org/elasticsearch/index/query/prefix-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/prefix-filter.json rename to src/test/java/org/elasticsearch/index/query/prefix-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/prefix-with-boost.json b/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/prefix-with-boost.json rename to src/test/java/org/elasticsearch/index/query/prefix-with-boost.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/prefix.json b/src/test/java/org/elasticsearch/index/query/prefix.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/prefix.json rename to src/test/java/org/elasticsearch/index/query/prefix.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query-fields-match.json b/src/test/java/org/elasticsearch/index/query/query-fields-match.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query-fields-match.json rename to src/test/java/org/elasticsearch/index/query/query-fields-match.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query-fields1.json b/src/test/java/org/elasticsearch/index/query/query-fields1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query-fields1.json rename to src/test/java/org/elasticsearch/index/query/query-fields1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query-fields2.json b/src/test/java/org/elasticsearch/index/query/query-fields2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query-fields2.json rename to src/test/java/org/elasticsearch/index/query/query-fields2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query-fields3.json b/src/test/java/org/elasticsearch/index/query/query-fields3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query-fields3.json rename to src/test/java/org/elasticsearch/index/query/query-fields3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query-filter.json b/src/test/java/org/elasticsearch/index/query/query-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query-filter.json rename to src/test/java/org/elasticsearch/index/query/query-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query.json b/src/test/java/org/elasticsearch/index/query/query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query.json rename to src/test/java/org/elasticsearch/index/query/query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/query2.json b/src/test/java/org/elasticsearch/index/query/query2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/query2.json rename to src/test/java/org/elasticsearch/index/query/query2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/range-filter-named.json b/src/test/java/org/elasticsearch/index/query/range-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/range-filter-named.json rename to src/test/java/org/elasticsearch/index/query/range-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/range-filter.json b/src/test/java/org/elasticsearch/index/query/range-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/range-filter.json rename to src/test/java/org/elasticsearch/index/query/range-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/range.json b/src/test/java/org/elasticsearch/index/query/range.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/range.json rename to src/test/java/org/elasticsearch/index/query/range.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/range2.json b/src/test/java/org/elasticsearch/index/query/range2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/range2.json rename to src/test/java/org/elasticsearch/index/query/range2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp-boost.json b/src/test/java/org/elasticsearch/index/query/regexp-boost.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp-boost.json rename to src/test/java/org/elasticsearch/index/query/regexp-boost.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-flags-named-cached.json b/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-flags-named-cached.json rename to src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-flags.json b/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-flags.json rename to src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-named.json b/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter-named.json rename to src/test/java/org/elasticsearch/index/query/regexp-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter.json b/src/test/java/org/elasticsearch/index/query/regexp-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp-filter.json rename to src/test/java/org/elasticsearch/index/query/regexp-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/regexp.json b/src/test/java/org/elasticsearch/index/query/regexp.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/regexp.json rename to src/test/java/org/elasticsearch/index/query/regexp.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json b/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json rename to src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanFieldMaskingTerm.json b/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanFieldMaskingTerm.json rename to src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanFirst.json b/src/test/java/org/elasticsearch/index/query/spanFirst.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanFirst.json rename to src/test/java/org/elasticsearch/index/query/spanFirst.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanNear.json b/src/test/java/org/elasticsearch/index/query/spanNear.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanNear.json rename to src/test/java/org/elasticsearch/index/query/spanNear.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanNot.json b/src/test/java/org/elasticsearch/index/query/spanNot.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanNot.json rename to src/test/java/org/elasticsearch/index/query/spanNot.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanOr.json b/src/test/java/org/elasticsearch/index/query/spanOr.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanOr.json rename to src/test/java/org/elasticsearch/index/query/spanOr.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanOr2.json b/src/test/java/org/elasticsearch/index/query/spanOr2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanOr2.json rename to src/test/java/org/elasticsearch/index/query/spanOr2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/spanTerm.json b/src/test/java/org/elasticsearch/index/query/spanTerm.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/spanTerm.json rename to src/test/java/org/elasticsearch/index/query/spanTerm.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/starColonStar.json b/src/test/java/org/elasticsearch/index/query/starColonStar.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/starColonStar.json rename to src/test/java/org/elasticsearch/index/query/starColonStar.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/term-filter-named.json b/src/test/java/org/elasticsearch/index/query/term-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/term-filter-named.json rename to src/test/java/org/elasticsearch/index/query/term-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/term-filter.json b/src/test/java/org/elasticsearch/index/query/term-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/term-filter.json rename to src/test/java/org/elasticsearch/index/query/term-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/term-with-boost.json b/src/test/java/org/elasticsearch/index/query/term-with-boost.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/term-with-boost.json rename to src/test/java/org/elasticsearch/index/query/term-with-boost.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/term.json b/src/test/java/org/elasticsearch/index/query/term.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/term.json rename to src/test/java/org/elasticsearch/index/query/term.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/terms-filter-named.json b/src/test/java/org/elasticsearch/index/query/terms-filter-named.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/terms-filter-named.json rename to src/test/java/org/elasticsearch/index/query/terms-filter-named.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/terms-filter.json b/src/test/java/org/elasticsearch/index/query/terms-filter.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/terms-filter.json rename to src/test/java/org/elasticsearch/index/query/terms-filter.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/terms-query.json b/src/test/java/org/elasticsearch/index/query/terms-query.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/terms-query.json rename to src/test/java/org/elasticsearch/index/query/terms-query.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/text1.json b/src/test/java/org/elasticsearch/index/query/text1.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/text1.json rename to src/test/java/org/elasticsearch/index/query/text1.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/text2.json b/src/test/java/org/elasticsearch/index/query/text2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/text2.json rename to src/test/java/org/elasticsearch/index/query/text2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/text3.json b/src/test/java/org/elasticsearch/index/query/text3.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/text3.json rename to src/test/java/org/elasticsearch/index/query/text3.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/text4.json b/src/test/java/org/elasticsearch/index/query/text4.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/text4.json rename to src/test/java/org/elasticsearch/index/query/text4.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/text4_2.json b/src/test/java/org/elasticsearch/index/query/text4_2.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/text4_2.json rename to src/test/java/org/elasticsearch/index/query/text4_2.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/wildcard-boost.json b/src/test/java/org/elasticsearch/index/query/wildcard-boost.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/wildcard-boost.json rename to src/test/java/org/elasticsearch/index/query/wildcard-boost.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/wildcard.json b/src/test/java/org/elasticsearch/index/query/wildcard.json similarity index 100% rename from src/test/java/org/elasticsearch/test/unit/index/query/wildcard.json rename to src/test/java/org/elasticsearch/index/query/wildcard.json diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoDistanceTests.java rename to src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java index df37e7b25ef..1b32e19f7c5 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.geo; +package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoHashUtilsTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoHashUtilsTests.java rename to src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java index 45cf7e7dd8b..2510738d64d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoHashUtilsTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.geo; +package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoUtilsTests.java b/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoUtilsTests.java rename to src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java index 9588350630d..3c091279860 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/geo/GeoUtilsTests.java +++ b/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.geo; +package org.elasticsearch.index.search.geo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/AbstractNumberNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/AbstractNumberNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java index ae0a10b785a..546dba10dd4 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/AbstractNumberNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/AbstractNumberNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -33,8 +33,7 @@ import org.elasticsearch.common.lucene.search.TermFilter; import org.elasticsearch.common.lucene.search.XFilteredQuery; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; -import org.elasticsearch.index.search.nested.NestedFieldComparatorSource; -import org.elasticsearch.test.unit.index.fielddata.AbstractFieldDataTests; +import org.elasticsearch.index.fielddata.AbstractFieldDataTests; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/ByteNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/ByteNestedSortingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/ByteNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/ByteNestedSortingTests.java index 18bcc2b4ed2..9459ab234d0 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/ByteNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/ByteNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntField; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/DoubleNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/DoubleNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java index 4f6565600bb..71b5e93c654 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/DoubleNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/DoubleNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.Field; @@ -32,7 +32,6 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; import org.elasticsearch.index.fielddata.plain.DoubleArrayIndexFieldData; -import org.elasticsearch.index.search.nested.NestedFieldComparatorSource; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/FloatNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/FloatNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java index 37fc9ee1b9f..39d6174144c 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/FloatNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/FloatNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Field; import org.apache.lucene.document.FloatField; @@ -32,7 +32,6 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; import org.elasticsearch.index.fielddata.plain.FloatArrayIndexFieldData; -import org.elasticsearch.index.search.nested.NestedFieldComparatorSource; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/IntegerNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/IntegerNestedSortingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/IntegerNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/IntegerNestedSortingTests.java index 9672dae849e..adffdd78f15 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/IntegerNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/IntegerNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntField; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/LongNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/LongNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java index b6f3dbe94f7..1a905196476 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/LongNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/LongNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Field; import org.apache.lucene.document.LongField; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/NestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/NestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java index f3e05648666..16b3b0207ac 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/NestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java @@ -18,7 +18,7 @@ */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -38,8 +38,7 @@ import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.SortMode; import org.elasticsearch.index.fielddata.plain.PagedBytesIndexFieldData; -import org.elasticsearch.index.search.nested.NestedFieldComparatorSource; -import org.elasticsearch.test.unit.index.fielddata.AbstractFieldDataTests; +import org.elasticsearch.index.fielddata.AbstractFieldDataTests; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/unit/index/search/nested/ShortNestedSortingTests.java b/src/test/java/org/elasticsearch/index/search/nested/ShortNestedSortingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/search/nested/ShortNestedSortingTests.java rename to src/test/java/org/elasticsearch/index/search/nested/ShortNestedSortingTests.java index ff94fb48920..717e394d551 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/search/nested/ShortNestedSortingTests.java +++ b/src/test/java/org/elasticsearch/index/search/nested/ShortNestedSortingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.search.nested; +package org.elasticsearch.index.search.nested; import org.apache.lucene.document.Field; import org.apache.lucene.document.IntField; diff --git a/src/test/java/org/elasticsearch/test/unit/index/similarity/SimilarityTests.java b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/similarity/SimilarityTests.java rename to src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java index ad350585de6..a56e4992c9e 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/similarity/SimilarityTests.java +++ b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.similarity; +package org.elasticsearch.index.similarity; import org.apache.lucene.search.similarities.*; import org.elasticsearch.common.inject.Injector; @@ -33,7 +33,6 @@ 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.index.similarity.*; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/index/store/distributor/DistributorTests.java b/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/unit/index/store/distributor/DistributorTests.java rename to src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java index 3fc2a10547b..9a2130cda7d 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/store/distributor/DistributorTests.java +++ b/src/test/java/org/elasticsearch/index/store/distributor/DistributorTests.java @@ -17,12 +17,10 @@ * under the License. */ -package org.elasticsearch.test.unit.index.store.distributor; +package org.elasticsearch.index.store.distributor; import org.apache.lucene.store.*; import org.elasticsearch.index.store.DirectoryService; -import org.elasticsearch.index.store.distributor.LeastUsedDistributor; -import org.elasticsearch.index.store.distributor.RandomWeightedDistributor; import org.junit.Test; import java.io.File; diff --git a/src/test/java/org/elasticsearch/test/unit/index/store/memory/SimpleByteBufferStoreTests.java b/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/index/store/memory/SimpleByteBufferStoreTests.java rename to src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java index 3fdbeab4de3..e87b74a2018 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/store/memory/SimpleByteBufferStoreTests.java +++ b/src/test/java/org/elasticsearch/index/store/memory/SimpleByteBufferStoreTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.index.store.memory; +package org.elasticsearch.index.store.memory; import org.apache.lucene.store.*; import org.apache.lucene.store.bytebuffer.ByteBufferDirectory; diff --git a/src/test/java/org/elasticsearch/test/unit/index/translog/AbstractSimpleTranslogTests.java b/src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/index/translog/AbstractSimpleTranslogTests.java rename to src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java index 4e80bc1327c..bfd0e500054 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/translog/AbstractSimpleTranslogTests.java +++ b/src/test/java/org/elasticsearch/index/translog/AbstractSimpleTranslogTests.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.translog; +package org.elasticsearch.index.translog; import org.apache.lucene.index.Term; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.index.translog.TranslogStreams; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.After; diff --git a/src/test/java/org/elasticsearch/test/unit/index/translog/TranslogSizeMatcher.java b/src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/index/translog/TranslogSizeMatcher.java rename to src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java index 6276d28729d..92a6c026aa7 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/translog/TranslogSizeMatcher.java +++ b/src/test/java/org/elasticsearch/index/translog/TranslogSizeMatcher.java @@ -17,9 +17,8 @@ * under the License. */ -package org.elasticsearch.test.unit.index.translog; +package org.elasticsearch.index.translog; -import org.elasticsearch.index.translog.Translog; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsBufferedTranslogTests.java b/src/test/java/org/elasticsearch/index/translog/fs/FsBufferedTranslogTests.java similarity index 85% rename from src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsBufferedTranslogTests.java rename to src/test/java/org/elasticsearch/index/translog/fs/FsBufferedTranslogTests.java index a9238debcc1..12d6b536f87 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsBufferedTranslogTests.java +++ b/src/test/java/org/elasticsearch/index/translog/fs/FsBufferedTranslogTests.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.translog.fs; +package org.elasticsearch.index.translog.fs; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.index.translog.fs.FsTranslog; -import org.elasticsearch.index.translog.fs.FsTranslogFile; -import org.elasticsearch.test.unit.index.translog.AbstractSimpleTranslogTests; +import org.elasticsearch.index.translog.AbstractSimpleTranslogTests; import org.junit.AfterClass; import java.io.File; diff --git a/src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsSimpleTranslogTests.java b/src/test/java/org/elasticsearch/index/translog/fs/FsSimpleTranslogTests.java similarity index 85% rename from src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsSimpleTranslogTests.java rename to src/test/java/org/elasticsearch/index/translog/fs/FsSimpleTranslogTests.java index 537a60b1baf..e9f8346cc39 100644 --- a/src/test/java/org/elasticsearch/test/unit/index/translog/fs/FsSimpleTranslogTests.java +++ b/src/test/java/org/elasticsearch/index/translog/fs/FsSimpleTranslogTests.java @@ -17,14 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.index.translog.fs; +package org.elasticsearch.index.translog.fs; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.index.translog.fs.FsTranslog; -import org.elasticsearch.index.translog.fs.FsTranslogFile; -import org.elasticsearch.test.unit.index.translog.AbstractSimpleTranslogTests; +import org.elasticsearch.index.translog.AbstractSimpleTranslogTests; import org.junit.AfterClass; import java.io.File; diff --git a/src/test/java/org/elasticsearch/test/integration/indexing/IndexActionTests.java b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indexing/IndexActionTests.java rename to src/test/java/org/elasticsearch/indexing/IndexActionTests.java index 0a9b7fa8b1e..c7dbad1c20c 100644 --- a/src/test/java/org/elasticsearch/test/integration/indexing/IndexActionTests.java +++ b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.indexing; +package org.elasticsearch.indexing; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.index.VersionType; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java b/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java rename to src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java index 7b0c94765d4..aae251463b8 100644 --- a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java +++ b/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indexlifecycle; +package org.elasticsearch.indexlifecycle; import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -32,7 +32,7 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java b/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java rename to src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java index 3343fa32da3..3f599c4dd91 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/IgnoreIndicesTests.java +++ b/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java @@ -17,15 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.indices; +package org.elasticsearch.indices; import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java rename to src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java index f25bd28ec90..9ecdbb7f14e 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.analyze; +package org.elasticsearch.indices.analyze; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchIllegalArgumentException; @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/analyze/HunspellServiceTests.java b/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/analyze/HunspellServiceTests.java rename to src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java index c268bf74911..c71580bde5d 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/analyze/HunspellServiceTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.analyze; +package org.elasticsearch.indices.analyze; import org.apache.lucene.analysis.hunspell.HunspellDictionary; import org.apache.lucene.util.Version; @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.HunspellService; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/cache/CacheTests.java b/src/test/java/org/elasticsearch/indices/cache/CacheTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/cache/CacheTests.java rename to src/test/java/org/elasticsearch/indices/cache/CacheTests.java index df622a7e4a6..a79a458e4bf 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/cache/CacheTests.java +++ b/src/test/java/org/elasticsearch/indices/cache/CacheTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.cache; +package org.elasticsearch.indices.cache; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags; @@ -27,7 +27,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/exists/types/TypesExistsTests.java b/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/indices/exists/types/TypesExistsTests.java rename to src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java index 18d48d159d1..5aa07d4b123 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/exists/types/TypesExistsTests.java +++ b/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.exists.types; +package org.elasticsearch.indices.exists.types; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.exists.types.TypesExistsResponse; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.client.Client; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/leaks/IndicesLeaksTests.java b/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/leaks/IndicesLeaksTests.java rename to src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java index 6a0ae76d4d5..0fe7ed267d9 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/leaks/IndicesLeaksTests.java +++ b/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.leaks; +package org.elasticsearch.indices.leaks; import org.apache.lucene.util.LuceneTestCase.BadApple; import org.elasticsearch.common.inject.Injector; @@ -29,7 +29,7 @@ import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/ConcurrentDynamicTemplateTests.java b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/indices/mapping/ConcurrentDynamicTemplateTests.java rename to src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java index 47389af6b0d..936cc6d0b77 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/ConcurrentDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.mapping; +package org.elasticsearch.indices.mapping; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.WriteConsistencyLevel; @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.HashMap; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java rename to src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java index 08aded41b11..91379d80f18 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleDeleteMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.mapping; +package org.elasticsearch.indices.mapping; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleGetMappingsTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleGetMappingsTests.java rename to src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java index b7e64570c6b..777b1c8b117 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/SimpleGetMappingsTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.mapping; +package org.elasticsearch.indices.mapping; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java rename to src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java index 06869eeb5b1..0c2c4e5a2bc 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/mapping/UpdateMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.indices.mapping; +package org.elasticsearch.indices.mapping; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; @@ -13,7 +13,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MergeMappingException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java rename to src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index 48e5bdc76f5..76757b35105 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.settings; +package org.elasticsearch.indices.settings; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java rename to src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index b2756ae1f7e..b00d9129084 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.settings; +package org.elasticsearch.indices.settings; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -25,7 +25,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/state/CloseIndexDisableCloseAllTests.java b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/state/CloseIndexDisableCloseAllTests.java rename to src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java index b7d0ea58502..30aa9f685ad 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/state/CloseIndexDisableCloseAllTests.java +++ b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.indices.state; +package org.elasticsearch.indices.state; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/state/OpenCloseIndexTests.java b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/indices/state/OpenCloseIndexTests.java rename to src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java index 1855b94f844..30dc2c0295b 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/state/OpenCloseIndexTests.java +++ b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.state; +package org.elasticsearch.indices.state; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -30,7 +30,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.junit.annotations.TestLogging; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java b/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java rename to src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java index 752b57fa610..bd93ee687de 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/state/SimpleIndexStateTests.java +++ b/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java @@ -17,15 +17,13 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.state; +package org.elasticsearch.indices.state; import junit.framework.Assert; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; -import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; -import org.elasticsearch.action.admin.indices.settings.UpdateSettingsResponse; import org.elasticsearch.action.admin.indices.status.IndicesStatusResponse; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -37,7 +35,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java b/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java rename to src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java index 13e174ac44b..6647773af2f 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/stats/SimpleIndexStatsTests.java +++ b/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.stats; +package org.elasticsearch.indices.stats; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.stats.*; @@ -28,7 +28,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java b/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java rename to src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java index 2aaaecd3cd1..b892fe8cd02 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/store/IndicesStoreTests.java +++ b/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.store; +package org.elasticsearch.indices.store; import com.google.common.base.Predicate; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.io.File; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/store/SimpleDistributorTests.java b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/store/SimpleDistributorTests.java rename to src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java index adb242c8de8..55386e7d806 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/store/SimpleDistributorTests.java +++ b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.store; +package org.elasticsearch.indices.store; import org.apache.lucene.store.Directory; import org.elasticsearch.env.Environment; @@ -25,7 +25,7 @@ import org.elasticsearch.index.shard.service.InternalIndexShard; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/store/StrictDistributor.java b/src/test/java/org/elasticsearch/indices/store/StrictDistributor.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/indices/store/StrictDistributor.java rename to src/test/java/org/elasticsearch/indices/store/StrictDistributor.java index 639eb9f27ee..e42ec6bf5a3 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/store/StrictDistributor.java +++ b/src/test/java/org/elasticsearch/indices/store/StrictDistributor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.store; +package org.elasticsearch.indices.store; import org.apache.lucene.store.Directory; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java rename to src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java index fd20030ff5f..9dcb0da0f52 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.template; +package org.elasticsearch.indices.template; import com.google.common.collect.Lists; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.indices.IndexTemplateAlreadyExistsException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/warmer/LocalGatewayIndicesWarmerTests.java b/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/warmer/LocalGatewayIndicesWarmerTests.java rename to src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java index abfa756902a..4ce27d75381 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/warmer/LocalGatewayIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.warmer; +package org.elasticsearch.indices.warmer; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.cluster.ClusterState; @@ -30,7 +30,7 @@ import org.elasticsearch.gateway.Gateway; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/indices/warmer/SimpleIndicesWarmerTests.java b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/indices/warmer/SimpleIndicesWarmerTests.java rename to src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java index b5176442384..7bbf31809f1 100644 --- a/src/test/java/org/elasticsearch/test/integration/indices/warmer/SimpleIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.indices.warmer; +package org.elasticsearch.indices.warmer; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.admin.indices.warmer.get.GetWarmersResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmerMissingException; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java index 621f551e9c7..576f1275b4e 100644 --- a/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java +++ b/src/test/java/org/elasticsearch/junit/listeners/ReproduceInfoPrinter.java @@ -5,7 +5,7 @@ import com.carrotsearch.randomizedtesting.ReproduceErrorMessageBuilder; import com.carrotsearch.randomizedtesting.TraceFormatting; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.notification.Failure; diff --git a/src/test/java/org/elasticsearch/test/integration/mget/SimpleMgetTests.java b/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/mget/SimpleMgetTests.java rename to src/test/java/org/elasticsearch/mget/SimpleMgetTests.java index 9de5a2a4d40..d7e16c58a8c 100644 --- a/src/test/java/org/elasticsearch/test/integration/mget/SimpleMgetTests.java +++ b/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.mget; +package org.elasticsearch.mget; import org.elasticsearch.action.get.MultiGetItemResponse; import org.elasticsearch.action.get.MultiGetRequest; @@ -24,7 +24,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.search.fetch.source.FetchSourceContext; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/mlt/MoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/mlt/MoreLikeThisActionTests.java rename to src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java index 63780756700..ec5dd7fdba3 100644 --- a/src/test/java/org/elasticsearch/test/integration/mlt/MoreLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.mlt; +package org.elasticsearch.mlt; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.search.SearchPhaseExecutionException; @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.client.Requests.*; diff --git a/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java rename to src/test/java/org/elasticsearch/nested/SimpleNestedTests.java index aa93fb26d4d..dacdf01e90d 100644 --- a/src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java +++ b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.nested; +package org.elasticsearch.nested; import org.apache.lucene.search.Explanation; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -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.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/node/InternalNodeTests.java b/src/test/java/org/elasticsearch/node/InternalNodeTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/node/InternalNodeTests.java rename to src/test/java/org/elasticsearch/node/InternalNodeTests.java index ea72ef13d0b..5fad244b857 100644 --- a/src/test/java/org/elasticsearch/test/integration/node/InternalNodeTests.java +++ b/src/test/java/org/elasticsearch/node/InternalNodeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.node; +package org.elasticsearch.node; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.common.component.AbstractLifecycleComponent; @@ -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.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/unit/node/internal/InternalSettingsPerparerTests.java b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/unit/node/internal/InternalSettingsPerparerTests.java rename to src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java index 4834fe881d0..844900a7bb8 100644 --- a/src/test/java/org/elasticsearch/test/unit/node/internal/InternalSettingsPerparerTests.java +++ b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPerparerTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.node.internal; +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.node.internal.InternalSettingsPerparer; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java b/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java rename to src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java index 46656496a53..e301a129995 100644 --- a/src/test/java/org/elasticsearch/test/integration/nodesinfo/SimpleNodesInfoTests.java +++ b/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.nodesinfo; +package org.elasticsearch.nodesinfo; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -32,9 +32,9 @@ import org.elasticsearch.action.admin.cluster.node.info.PluginsInfo; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; -import org.elasticsearch.test.integration.nodesinfo.plugin.dummy1.TestPlugin; -import org.elasticsearch.test.integration.nodesinfo.plugin.dummy2.TestNoVersionPlugin; +import org.elasticsearch.AbstractNodesTests; +import org.elasticsearch.nodesinfo.plugin.dummy1.TestPlugin; +import org.elasticsearch.nodesinfo.plugin.dummy2.TestNoVersionPlugin; import org.junit.After; import org.junit.Test; @@ -195,7 +195,7 @@ public class SimpleNodesInfoTests extends AbstractNodesTests { } private String startNodeWithPlugins(String name, String ... pluginClassNames) throws URISyntaxException { - URL resource = SimpleNodesInfoTests.class.getResource("/org/elasticsearch/test/integration/nodesinfo/" + name + "/"); + URL resource = SimpleNodesInfoTests.class.getResource("/org/elasticsearch/nodesinfo/" + name + "/"); ImmutableSettings.Builder settings = settingsBuilder(); if (resource != null) { settings.put("path.plugins", new File(resource.toURI()).getAbsolutePath()); diff --git a/src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy1/TestPlugin.java b/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java similarity index 94% rename from src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy1/TestPlugin.java rename to src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java index 81679c2d0b6..2f597fc6141 100644 --- a/src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy1/TestPlugin.java +++ b/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy1/TestPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.nodesinfo.plugin.dummy1; +package org.elasticsearch.nodesinfo.plugin.dummy1; import org.elasticsearch.plugins.AbstractPlugin; diff --git a/src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java b/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java similarity index 94% rename from src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java rename to src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java index 056958cb862..6e9c846bfdd 100644 --- a/src/test/java/org/elasticsearch/test/integration/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java +++ b/src/test/java/org/elasticsearch/nodesinfo/plugin/dummy2/TestNoVersionPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.nodesinfo.plugin.dummy2; +package org.elasticsearch.nodesinfo.plugin.dummy2; import org.elasticsearch.plugins.AbstractPlugin; diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java rename to src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java index fce7611e1b9..8c1494a2e01 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/ConcurrentPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -34,7 +34,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Before; import org.junit.Test; @@ -50,7 +50,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray; +import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; import static org.hamcrest.Matchers.*; diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/DeletePercolatorTypeTests.java b/src/test/java/org/elasticsearch/percolator/DeletePercolatorTypeTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/percolator/DeletePercolatorTypeTests.java rename to src/test/java/org/elasticsearch/percolator/DeletePercolatorTypeTests.java index f96815ba8b5..28f4f362301 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/DeletePercolatorTypeTests.java +++ b/src/test/java/org/elasticsearch/percolator/DeletePercolatorTypeTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -11,7 +11,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java rename to src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java index 9f89b491218..b31acf49697 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/MultiPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java @@ -16,21 +16,21 @@ * the License. */ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder; import org.elasticsearch.action.percolate.MultiPercolateResponse; import org.elasticsearch.client.Requests; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.*; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray; +import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java rename to src/test/java/org/elasticsearch/percolator/PercolatorTests.java index a5f524c5239..f9109ef00e5 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/PercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; @@ -42,7 +42,7 @@ import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.functionscore.factor.FactorBuilder; import org.elasticsearch.search.highlight.HighlightBuilder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.*; diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java rename to src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java index 6479a63a6e9..d34fcf6e323 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/RecoveryPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -37,7 +37,7 @@ import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.junit.annotations.TestLogging; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; @@ -51,8 +51,8 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.integration.percolator.PercolatorTests.convertFromTextArray; -import static org.elasticsearch.test.integration.percolator.TTLPercolatorTests.ensureGreen; +import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; +import static org.elasticsearch.percolator.TTLPercolatorTests.ensureGreen; import static org.hamcrest.Matchers.*; public class RecoveryPercolatorTests extends AbstractNodesTests { diff --git a/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java rename to src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java index e6b3a081ead..a17cd619dcc 100644 --- a/src/test/java/org/elasticsearch/test/integration/percolator/TTLPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.percolator; +package org.elasticsearch.percolator; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -10,14 +10,14 @@ import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; 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.integration.percolator.PercolatorTests.convertFromTextArray; +import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; import static org.hamcrest.Matchers.*; /** diff --git a/src/test/java/org/elasticsearch/test/integration/plugin/PluginManagerTests.java b/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/plugin/PluginManagerTests.java rename to src/test/java/org/elasticsearch/plugin/PluginManagerTests.java index 67b5ba64d1f..4076b8a6358 100644 --- a/src/test/java/org/elasticsearch/test/integration/plugin/PluginManagerTests.java +++ b/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java @@ -16,7 +16,7 @@ * the License. */ -package org.elasticsearch.test.integration.plugin; +package org.elasticsearch.plugin; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.common.collect.Tuple; @@ -30,9 +30,9 @@ import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.node.internal.InternalSettingsPerparer; import org.elasticsearch.plugins.PluginManager; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractNodesTests; -import org.elasticsearch.test.integration.rest.helper.HttpClient; -import org.elasticsearch.test.integration.rest.helper.HttpClientResponse; +import org.elasticsearch.AbstractNodesTests; +import org.elasticsearch.rest.helper.HttpClient; +import org.elasticsearch.rest.helper.HttpClientResponse; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/plugin/ResponseHeaderPluginTests.java b/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/integration/plugin/ResponseHeaderPluginTests.java rename to src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java index b8021e91ff1..480c0e83876 100644 --- a/src/test/java/org/elasticsearch/test/integration/plugin/ResponseHeaderPluginTests.java +++ b/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java @@ -17,17 +17,17 @@ * under the License. */ -package org.elasticsearch.test.integration.plugin; +package org.elasticsearch.plugin; import com.google.common.collect.Maps; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractNodesTests; -import org.elasticsearch.test.integration.plugin.responseheader.TestResponseHeaderPlugin; -import org.elasticsearch.test.integration.rest.helper.HttpClient; -import org.elasticsearch.test.integration.rest.helper.HttpClientResponse; +import org.elasticsearch.AbstractNodesTests; +import org.elasticsearch.plugin.responseheader.TestResponseHeaderPlugin; +import org.elasticsearch.rest.helper.HttpClient; +import org.elasticsearch.rest.helper.HttpClientResponse; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/plugin/SitePluginTests.java b/src/test/java/org/elasticsearch/plugin/SitePluginTests.java similarity index 89% rename from src/test/java/org/elasticsearch/test/integration/plugin/SitePluginTests.java rename to src/test/java/org/elasticsearch/plugin/SitePluginTests.java index 6fb839bdfff..176f633fa72 100644 --- a/src/test/java/org/elasticsearch/test/integration/plugin/SitePluginTests.java +++ b/src/test/java/org/elasticsearch/plugin/SitePluginTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.plugin; +package org.elasticsearch.plugin; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractNodesTests; -import org.elasticsearch.test.integration.rest.helper.HttpClient; -import org.elasticsearch.test.integration.rest.helper.HttpClientResponse; +import org.elasticsearch.AbstractNodesTests; +import org.elasticsearch.rest.helper.HttpClient; +import org.elasticsearch.rest.helper.HttpClientResponse; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,7 +44,7 @@ public class SitePluginTests extends AbstractNodesTests { @Before public void startNodes() throws URISyntaxException { - File pluginDir = new File(SitePluginTests.class.getResource("/org/elasticsearch/test/integration/plugin").toURI()); + File pluginDir = new File(SitePluginTests.class.getResource("/org/elasticsearch/plugin").toURI()); startNode("test", settingsBuilder() .put("path.plugins", pluginDir.getAbsolutePath()) .build()); diff --git a/src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderPlugin.java b/src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderPlugin.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderPlugin.java rename to src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderPlugin.java index 9101edfc5d1..f961f6dc359 100644 --- a/src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderPlugin.java +++ b/src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.plugin.responseheader; +package org.elasticsearch.plugin.responseheader; import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.rest.RestModule; diff --git a/src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderRestAction.java b/src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderRestAction.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderRestAction.java rename to src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderRestAction.java index 1939aac8082..df3befd70d7 100644 --- a/src/test/java/org/elasticsearch/test/integration/plugin/responseheader/TestResponseHeaderRestAction.java +++ b/src/test/java/org/elasticsearch/plugin/responseheader/TestResponseHeaderRestAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.plugin.responseheader; +package org.elasticsearch.plugin.responseheader; import org.elasticsearch.client.Client; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java b/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java rename to src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java index 3aefe44a93a..83774d3bf20 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.java +++ b/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.common.Priority; import org.elasticsearch.common.collect.MapBuilder; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java rename to src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java index 5122a3ff369..b7a7bedcc69 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/RecoveryWhileUnderLoadTests.java +++ b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import com.google.common.base.Predicate; import org.apache.lucene.util.LuceneTestCase.Slow; @@ -29,7 +29,7 @@ import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.junit.annotations.TestLogging; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java b/src/test/java/org/elasticsearch/recovery/RelocationTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java rename to src/test/java/org/elasticsearch/recovery/RelocationTests.java index e01b9c7d9cf..4f536afe426 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/RelocationTests.java +++ b/src/test/java/org/elasticsearch/recovery/RelocationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import gnu.trove.procedure.TIntProcedure; import gnu.trove.set.TIntSet; @@ -35,7 +35,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java rename to src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java index 7f8063d6552..e7b92893694 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/SimpleRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.client.Requests.*; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java rename to src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java index f01f7cde4b6..9ebc13a7864 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/SmallFileChunkSizeRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SmallFileChunkSizeRecoveryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java rename to src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java index 87d6b0436bc..2aa2632106f 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogOpsRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SmallTranslogOpsRecoveryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java rename to src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java index a5340959f98..c8322764d95 100644 --- a/src/test/java/org/elasticsearch/test/integration/recovery/SmallTranslogSizeRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SmallTranslogSizeRecoveryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.recovery; +package org.elasticsearch.recovery; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClient.java b/src/test/java/org/elasticsearch/rest/helper/HttpClient.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClient.java rename to src/test/java/org/elasticsearch/rest/helper/HttpClient.java index 9f4651a27a2..9ceeaf72fb9 100644 --- a/src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClient.java +++ b/src/test/java/org/elasticsearch/rest/helper/HttpClient.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.rest.helper; +package org.elasticsearch.rest.helper; import com.google.common.base.Charsets; import org.elasticsearch.ElasticSearchException; diff --git a/src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClientResponse.java b/src/test/java/org/elasticsearch/rest/helper/HttpClientResponse.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClientResponse.java rename to src/test/java/org/elasticsearch/rest/helper/HttpClientResponse.java index 9f4ef9fbe7f..7ad6dcc98b5 100644 --- a/src/test/java/org/elasticsearch/test/integration/rest/helper/HttpClientResponse.java +++ b/src/test/java/org/elasticsearch/rest/helper/HttpClientResponse.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.rest.helper; +package org.elasticsearch.rest.helper; import java.util.List; import java.util.Map; -import java.util.HashMap; public class HttpClientResponse { private final String response; diff --git a/src/test/java/org/elasticsearch/test/unit/rest/util/RestUtilsTests.java b/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/rest/util/RestUtilsTests.java rename to src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java index d1da7ca8d01..34b90d84a9b 100644 --- a/src/test/java/org/elasticsearch/test/unit/rest/util/RestUtilsTests.java +++ b/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.rest.util; +package org.elasticsearch.rest.util; import org.elasticsearch.rest.support.RestUtils; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java rename to src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java index fa3a6d9b60c..65ad5ddb8f2 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/AliasResolveRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.integration.routing; +package org.elasticsearch.routing; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java rename to src/test/java/org/elasticsearch/routing/AliasRoutingTests.java index cce48a3318c..06966bcc628 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.routing; +package org.elasticsearch.routing; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.RoutingMissingException; @@ -27,7 +27,7 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Requests; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction; diff --git a/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java rename to src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java index 68aa1091f46..2a84a884241 100644 --- a/src/test/java/org/elasticsearch/test/integration/routing/SimpleRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.routing; +package org.elasticsearch.routing; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.RoutingMissingException; @@ -26,7 +26,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; diff --git a/src/test/java/org/elasticsearch/test/unit/script/NativeScriptTests.java b/src/test/java/org/elasticsearch/script/NativeScriptTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/unit/script/NativeScriptTests.java rename to src/test/java/org/elasticsearch/script/NativeScriptTests.java index 35d631aa916..bdee66ba9f8 100644 --- a/src/test/java/org/elasticsearch/test/unit/script/NativeScriptTests.java +++ b/src/test/java/org/elasticsearch/script/NativeScriptTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.script; +package org.elasticsearch.script; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.inject.Injector; @@ -25,7 +25,6 @@ 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.script.*; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java rename to src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java index 68792f7515c..abce0c2f7a6 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.basic; +package org.elasticsearch.search.basic; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileRelocatingTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileRelocatingTests.java rename to src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java index 37fc7c69b89..5b73f3d8f7b 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileRelocatingTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.basic; +package org.elasticsearch.search.basic; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.lucene.search.function.CombineFunction; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java b/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java rename to src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java index bd7f88c9596..447938c9863 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.basic; +package org.elasticsearch.search.basic; import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.client.Requests.refreshRequest; @@ -41,7 +41,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import com.google.common.base.Charsets; diff --git a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java rename to src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java index cc0435c7bf4..d11213d8fc0 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.basic; +package org.elasticsearch.search.basic; @@ -38,7 +38,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.query.QueryFacet; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java rename to src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index a41f3dbc29f..22af4b2e940 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.child; +package org.elasticsearch.search.child; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; @@ -33,7 +33,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java rename to src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java index d6ebcfb05a3..fc19e46830a 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/compress/SearchSourceCompressTests.java +++ b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.compress; +package org.elasticsearch.search.compress; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; @@ -27,7 +27,7 @@ import org.elasticsearch.common.compress.lzf.LZFCompressor; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java rename to src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java index 0226c3206de..24b5abeb9ef 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/customscore/CustomScoreSearchTests.java +++ b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.customscore; +package org.elasticsearch.search.customscore; import org.apache.lucene.search.Explanation; import org.elasticsearch.ElasticSearchException; @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.Priority; import org.elasticsearch.index.query.FilterBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/ConcurrentDuel.java b/src/test/java/org/elasticsearch/search/facet/ConcurrentDuel.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/facet/ConcurrentDuel.java rename to src/test/java/org/elasticsearch/search/facet/ConcurrentDuel.java index cf2a3fc8308..9fa430508ee 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/ConcurrentDuel.java +++ b/src/test/java/org/elasticsearch/search/facet/ConcurrentDuel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTests.java rename to src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java index c02ac1dfec5..2f0024d9f57 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.collect.Tuple; @@ -7,10 +7,9 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.text.StringText; import org.elasticsearch.common.text.Text; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.facet.terms.TermsFacetBuilder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.*; diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java similarity index 84% rename from src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java rename to src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java index 1b8d3fba5b1..31954c5cb74 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java +++ b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTestsMultiShardMultiNodeTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; /** */ diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardMultiNodeTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java rename to src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardMultiNodeTests.java index 41ac56c40fc..0d61f71bf8d 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardMultiNodeTests.java +++ b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardMultiNodeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; /** diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java rename to src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardTests.java index 336590c47b4..306317fd269 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsMultiShardTests.java +++ b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsMultiShardTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; /** diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java rename to src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java index 3eff710cd5a..e3e2d808dd1 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/SimpleFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.facet; +package org.elasticsearch.search.facet; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -29,9 +29,6 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.search.facet.Facet; -import org.elasticsearch.search.facet.FacetBuilder; -import org.elasticsearch.search.facet.Facets; import org.elasticsearch.search.facet.datehistogram.DateHistogramFacet; import org.elasticsearch.search.facet.filter.FilterFacet; import org.elasticsearch.search.facet.histogram.HistogramFacet; @@ -43,7 +40,7 @@ import org.elasticsearch.search.facet.terms.TermsFacet.Entry; import org.elasticsearch.search.facet.terms.doubles.InternalDoubleTermsFacet; import org.elasticsearch.search.facet.terms.longs.InternalLongTermsFacet; import org.elasticsearch.search.facet.termsstats.TermsStatsFacet; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/facet/terms/UnmappedFieldsTermsFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/facet/terms/UnmappedFieldsTermsFacetsTests.java rename to src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java index 1734cc80ddc..1dca3849199 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/facet/terms/UnmappedFieldsTermsFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.test.integration.search.facet.terms; +package org.elasticsearch.search.facet.terms; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.search.facet.terms.TermsFacet; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java rename to src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java index eb1d3ccc02d..e0b79a3abb5 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java +++ b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.fields; +package org.elasticsearch.search.fields; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Base64; @@ -29,7 +29,7 @@ import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/functionscore/DecayFunctionScoreTests.java rename to src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index 00b3a1408d1..2f307d32ea9 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.functionscore; +package org.elasticsearch.search.functionscore; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.action.ActionFuture; @@ -32,7 +32,7 @@ import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder; import org.elasticsearch.index.query.functionscore.gauss.GaussDecayFunctionBuilder; import org.elasticsearch.search.SearchHits; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/org/elasticsearch/test/integration/search/functionscore/FunctionScorePluginTests.java b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/functionscore/FunctionScorePluginTests.java rename to src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java index fe789015fec..80cb345008e 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/functionscore/FunctionScorePluginTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.functionscore; +package org.elasticsearch.search.functionscore; import org.apache.lucene.search.ComplexExplanation; import org.apache.lucene.search.Explanation; @@ -34,7 +34,7 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreModule; import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.search.SearchHits; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.After; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/functionscore/RandomScoreFunctionTests.java b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/functionscore/RandomScoreFunctionTests.java rename to src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java index 9f41beffa47..3e2a982f7b3 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/functionscore/RandomScoreFunctionTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.search.functionscore; +package org.elasticsearch.search.functionscore; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.CoreMatchers; import org.junit.Ignore; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java b/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java rename to src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java index ca7c03b55f8..fd093fd6536 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.geo; +package org.elasticsearch.search.geo; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -33,7 +33,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java rename to src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java index 700073b5759..ee6a2b1527a 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceFacetTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.geo; +package org.elasticsearch.search.geo; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java rename to src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java index 2038b5dc0cf..580114560cc 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.geo; +package org.elasticsearch.search.geo; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; @@ -35,7 +35,7 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoFilterTests.java b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/geo/GeoFilterTests.java rename to src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java index 76c8efe0718..ade9bc87d59 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoFilterTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.geo; +package org.elasticsearch.search.geo; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; @@ -45,7 +45,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.BeforeClass; import org.junit.Test; @@ -395,7 +395,7 @@ public class GeoFilterTests extends AbstractSharedClusterTest { @Test public void bulktest() throws Exception { - byte[] bulkAction = unZipData("/org/elasticsearch/test/integration/search/geo/gzippedmap.json"); + byte[] bulkAction = unZipData("/org/elasticsearch/search/geo/gzippedmap.json"); String mapping = XContentFactory.jsonBuilder() .startObject() diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java rename to src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java index 738cb585431..22f0e0720e6 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/geo/GeoShapeIntegrationTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.geo; +package org.elasticsearch.search.geo; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.get.GetResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/geo/gzippedmap.json b/src/test/java/org/elasticsearch/search/geo/gzippedmap.json similarity index 100% rename from src/test/java/org/elasticsearch/test/integration/search/geo/gzippedmap.json rename to src/test/java/org/elasticsearch/search/geo/gzippedmap.json diff --git a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighter.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java similarity index 86% rename from src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighter.java rename to src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java index 701e0fc2907..014e8a4f6b8 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighter.java +++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java @@ -16,15 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.highlight; +package org.elasticsearch.search.highlight; import com.google.common.collect.Lists; import org.elasticsearch.common.text.StringText; import org.elasticsearch.common.text.Text; -import org.elasticsearch.search.highlight.HighlightField; -import org.elasticsearch.search.highlight.Highlighter; -import org.elasticsearch.search.highlight.HighlighterContext; -import org.elasticsearch.search.highlight.SearchContextHighlight; import java.util.List; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterPlugin.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java similarity index 91% rename from src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterPlugin.java rename to src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java index ec4b7bbc98c..a9418fc3624 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterPlugin.java +++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterPlugin.java @@ -17,10 +17,9 @@ * under the License. */ -package org.elasticsearch.test.integration.search.highlight; +package org.elasticsearch.search.highlight; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.search.highlight.HighlightModule; public class CustomHighlighterPlugin extends AbstractPlugin { diff --git a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterSearchTests.java rename to src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java index 1ec7edf5657..6c53ec95166 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/highlight/CustomHighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.highlight; +package org.elasticsearch.search.highlight; import com.google.common.collect.Maps; import org.elasticsearch.action.search.SearchResponse; @@ -25,8 +25,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.highlight.HighlightBuilder; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java rename to src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java index 4f7f056795d..6cbb84fd5c0 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.highlight; +package org.elasticsearch.search.highlight; import org.apache.lucene.util.LuceneTestCase.Slow; import org.elasticsearch.ElasticSearchException; @@ -35,9 +35,8 @@ import org.elasticsearch.index.query.MatchQueryBuilder.Type; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.highlight.HighlightBuilder; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java rename to src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java index e39c73f5af0..0a873991937 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java +++ b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.indicesboost; +package org.elasticsearch.search.indicesboost; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.client.Requests.*; diff --git a/src/test/java/org/elasticsearch/test/integration/search/matchedqueries/MatchedQueriesTests.java b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/matchedqueries/MatchedQueriesTests.java rename to src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java index dcf4a454e8c..515014f525a 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/matchedqueries/MatchedQueriesTests.java +++ b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.search.matchedqueries; +package org.elasticsearch.search.matchedqueries; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/search/msearch/SimpleMultiSearchTests.java b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java similarity index 92% rename from src/test/java/org/elasticsearch/test/integration/search/msearch/SimpleMultiSearchTests.java rename to src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java index 28419f45241..7f0bbd1f4ee 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/msearch/SimpleMultiSearchTests.java +++ b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java @@ -1,8 +1,8 @@ -package org.elasticsearch.test.integration.search.msearch; +package org.elasticsearch.search.msearch; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; diff --git a/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java rename to src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java index 43c9eb6f937..c38f94dc108 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java +++ b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.preference; +package org.elasticsearch.search.preference; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.Priority; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java rename to src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java index 907ca859031..975fc8a8eec 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.query; +package org.elasticsearch.search.query; import org.apache.lucene.util.English; import org.elasticsearch.ElasticSearchException; @@ -34,7 +34,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.facet.FacetBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; diff --git a/src/test/java/org/elasticsearch/test/integration/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/rescore/QueryRescorerTests.java rename to src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java index 334ca37bb61..69f89dce959 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/rescore/QueryRescorerTests.java +++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.rescore; +package org.elasticsearch.search.rescore; @@ -33,9 +33,8 @@ import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.rescore.RescoreBuilder; import org.elasticsearch.search.rescore.RescoreBuilder.QueryRescorer; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java b/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java rename to src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java index 3ab1d4c93bb..4c6ca4ff84f 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanScrollingTests.java +++ b/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.scan; +package org.elasticsearch.search.scan; import com.google.common.collect.Sets; import org.elasticsearch.action.search.SearchResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import java.util.Set; diff --git a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java b/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java rename to src/test/java/org/elasticsearch/search/scan/SearchScanTests.java index b65d10bc794..5d69764f6ce 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scan/SearchScanTests.java +++ b/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.scan; +package org.elasticsearch.search.scan; import com.google.common.collect.Sets; import org.apache.lucene.util.LuceneTestCase.Slow; @@ -27,7 +27,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Set; diff --git a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java rename to src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java index 35f4fe249e5..10bf5c28f67 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.scriptfilter; +package org.elasticsearch.search.scriptfilter; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; @@ -118,7 +118,7 @@ public class ScriptFilterSearchTests extends AbstractSharedClusterTest { client().admin().indices().prepareFlush().execute().actionGet(); client().admin().indices().refresh(refreshRequest()).actionGet(); - String script = "org.elasticsearch.test.integration.search.scriptfilter.ScriptFilterSearchTests.incrementScriptCounter() > 0"; + String script = "org.elasticsearch.search.scriptfilter.ScriptFilterSearchTests.incrementScriptCounter() > 0"; scriptCounter.set(0); logger.info("running script filter the first time"); diff --git a/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java rename to src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java index 3f04758b6ca..ac58b1bf5ff 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/scroll/SearchScrollTests.java +++ b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.scroll; +package org.elasticsearch.search.scroll; import org.elasticsearch.action.search.ClearScrollResponse; import org.elasticsearch.action.search.SearchResponse; @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java rename to src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java index 938dad9dbe0..8019260616c 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java +++ b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.search.simple; +package org.elasticsearch.search.simple; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.concurrent.ExecutionException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java rename to src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java index 2b41d5d57e0..3e0c56f14bf 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.sort; +package org.elasticsearch.search.sort; @@ -35,10 +35,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.sort.ScriptSortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/search/source/SourceFetchingTests.java b/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/search/source/SourceFetchingTests.java rename to src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java index ec9d9df5086..16d51db226c 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/source/SourceFetchingTests.java +++ b/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.search.source; +package org.elasticsearch.search.source; /* * Licensed to ElasticSearch under one * or more contributor license agreements. See the NOTICE file @@ -20,7 +20,7 @@ package org.elasticsearch.test.integration.search.source; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.hamcrest.Matchers.notNullValue; diff --git a/src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java rename to src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java index 151c87e7d03..3bb7c125247 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java +++ b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.stats; +package org.elasticsearch.search.stats; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.MatcherAssert.assertThat; @@ -37,7 +37,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.stats.SearchStats.Stats; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionPostingsFormatTest.java b/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionPostingsFormatTest.java rename to src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java index 40768c73fcc..048db0f0291 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionPostingsFormatTest.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionPostingsFormatTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.codecs.*; @@ -43,12 +43,11 @@ import org.elasticsearch.index.codec.postingsformat.PostingsFormatProvider; import org.elasticsearch.index.codec.postingsformat.PreBuiltPostingsFormatProvider; import org.elasticsearch.index.mapper.FieldMapper.Names; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; -import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.completion.AnalyzingCompletionLookupProvider; 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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionSuggestSearchTests.java rename to src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java index 3a5d0e301bd..b2711c7cc67 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.google.common.collect.Lists; @@ -34,13 +34,12 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; -import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.completion.CompletionStats; 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.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionTokenStreamTest.java b/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionTokenStreamTest.java rename to src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java index ecb8c8380d1..ba1dd0c020a 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CompletionTokenStreamTest.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; @@ -35,7 +35,7 @@ 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.integration.ElasticSearchTokenStreamTestCase; +import org.elasticsearch.ElasticSearchTokenStreamTestCase; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggester.java b/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggester.java rename to src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java index 9a7f3c89763..4d6e17a3544 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggester.java +++ b/src/test/java/org/elasticsearch/search/suggest/CustomSuggester.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.CharsRef; import org.elasticsearch.common.text.StringText; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.search.suggest.*; import java.io.IOException; import java.util.Locale; diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterPlugin.java b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java similarity index 91% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterPlugin.java rename to src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java index f55c49dd872..9d77ce7034c 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterPlugin.java +++ b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterPlugin.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.search.suggest.SuggestModule; /** * diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterSearchTests.java rename to src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java index 8454362b3ca..9f961c834fe 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/CustomSuggesterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import com.google.common.collect.Lists; import org.elasticsearch.action.search.SearchRequestBuilder; @@ -25,8 +25,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.search.suggest.Suggest; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import java.util.List; diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java rename to src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java index 91f2d79829b..43b5df44c91 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.suggest; +package org.elasticsearch.search.suggest; import com.google.common.base.Charsets; import com.google.common.io.Resources; @@ -30,13 +30,12 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder; 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.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/search/suggest/phrase/NoisyChannelSpellCheckerTests.java rename to src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java index 18d73c08062..5e95c5b184e 100644 --- a/src/test/java/org/elasticsearch/test/unit/search/suggest/phrase/NoisyChannelSpellCheckerTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.unit.search.suggest.phrase; +package org.elasticsearch.search.suggest.phrase; /* * Licensed to ElasticSearch and Shay Banon under one * or more contributor license agreements. See the NOTICE file @@ -41,9 +41,8 @@ import org.apache.lucene.search.spell.SuggestMode; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.elasticsearch.search.suggest.phrase.*; import org.elasticsearch.search.suggest.phrase.NoisyChannelSpellChecker.Result; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.junit.Test; import java.io.*; diff --git a/src/test/java/org/elasticsearch/test/integration/search/timeout/SearchTimeoutTests.java b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java similarity index 94% rename from src/test/java/org/elasticsearch/test/integration/search/timeout/SearchTimeoutTests.java rename to src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java index fd3454e86fd..fa1ca49811b 100644 --- a/src/test/java/org/elasticsearch/test/integration/search/timeout/SearchTimeoutTests.java +++ b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.search.timeout; +package org.elasticsearch.search.timeout; import static org.elasticsearch.index.query.FilterBuilders.scriptFilter; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; @@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; /** diff --git a/src/test/java/org/elasticsearch/test/integration/similarity/SimilarityTests.java b/src/test/java/org/elasticsearch/similarity/SimilarityTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/similarity/SimilarityTests.java rename to src/test/java/org/elasticsearch/similarity/SimilarityTests.java index 71ee078c11c..993a4c0e458 100644 --- a/src/test/java/org/elasticsearch/test/integration/similarity/SimilarityTests.java +++ b/src/test/java/org/elasticsearch/similarity/SimilarityTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.integration.similarity; +package org.elasticsearch.similarity; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/termvectors/AbstractTermVectorTests.java b/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/termvectors/AbstractTermVectorTests.java rename to src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java index 08631616def..46f2b10863c 100644 --- a/src/test/java/org/elasticsearch/test/integration/termvectors/AbstractTermVectorTests.java +++ b/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.termvectors; +package org.elasticsearch.termvectors; /* * Licensed to ElasticSearch under one @@ -42,7 +42,7 @@ import org.elasticsearch.common.inject.internal.Join; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import java.io.IOException; import java.io.Reader; diff --git a/src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorCheckDocFreqTests.java b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorCheckDocFreqTests.java rename to src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java index 27a8f987378..cbcfb27cb79 100644 --- a/src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorCheckDocFreqTests.java +++ b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.termvectors; +package org.elasticsearch.termvectors; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.Fields; @@ -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.hamcrest.ElasticsearchAssertions; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorTests.java b/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorTests.java rename to src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java index 210daf81554..342e3b5769b 100644 --- a/src/test/java/org/elasticsearch/test/integration/termvectors/GetTermVectorTests.java +++ b/src/test/java/org/elasticsearch/termvectors/GetTermVectorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.termvectors; +package org.elasticsearch.termvectors; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.*; diff --git a/src/test/java/org/elasticsearch/test/integration/termvectors/MultiTermVectorsTests.java b/src/test/java/org/elasticsearch/termvectors/MultiTermVectorsTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/termvectors/MultiTermVectorsTests.java rename to src/test/java/org/elasticsearch/termvectors/MultiTermVectorsTests.java index ff2de2a9a02..1df7f21b567 100644 --- a/src/test/java/org/elasticsearch/test/integration/termvectors/MultiTermVectorsTests.java +++ b/src/test/java/org/elasticsearch/termvectors/MultiTermVectorsTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.termvectors; +package org.elasticsearch.termvectors; /* * Licensed to ElasticSearch under one * or more contributor license agreements. See the NOTICE file diff --git a/src/test/java/org/elasticsearch/test/unit/termvectors/TermVectorUnitTests.java b/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/termvectors/TermVectorUnitTests.java rename to src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java index de7d30c59e3..af29cc60525 100644 --- a/src/test/java/org/elasticsearch/test/unit/termvectors/TermVectorUnitTests.java +++ b/src/test/java/org/elasticsearch/termvectors/TermVectorUnitTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.termvectors; +package org.elasticsearch.termvectors; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.*; @@ -28,6 +28,7 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; +import org.elasticsearch.ElasticsearchLuceneTestCase; import org.elasticsearch.action.termvector.TermVectorRequest; import org.elasticsearch.action.termvector.TermVectorRequest.Flag; import org.elasticsearch.action.termvector.TermVectorResponse; @@ -50,7 +51,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class TermVectorUnitTests extends org.elasticsearch.test.integration.ElasticsearchLuceneTestCase { +public class TermVectorUnitTests extends ElasticsearchLuceneTestCase { @Test public void streamResponse() throws Exception { diff --git a/src/test/java/org/elasticsearch/test/integration/threadpool/SimpleThreadPoolTests.java b/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java similarity index 96% rename from src/test/java/org/elasticsearch/test/integration/threadpool/SimpleThreadPoolTests.java rename to src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java index fd24691c4a7..6ee43b74d15 100644 --- a/src/test/java/org/elasticsearch/test/integration/threadpool/SimpleThreadPoolTests.java +++ b/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java @@ -1,4 +1,4 @@ -package org.elasticsearch.test.integration.threadpool; +package org.elasticsearch.threadpool; import org.elasticsearch.action.admin.cluster.node.info.NodeInfo; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; @@ -10,10 +10,8 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.node.internal.InternalNode; -import org.elasticsearch.test.integration.AbstractNodesTests; -import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.AbstractNodesTests; import org.elasticsearch.threadpool.ThreadPool.Names; -import org.elasticsearch.threadpool.ThreadPoolInfo; import org.junit.Test; import java.io.IOException; diff --git a/src/test/java/org/elasticsearch/test/unit/threadpool/UpdateThreadPoolSettingsTests.java b/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/threadpool/UpdateThreadPoolSettingsTests.java rename to src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java index aff625970a3..9b5e4d87953 100644 --- a/src/test/java/org/elasticsearch/test/unit/threadpool/UpdateThreadPoolSettingsTests.java +++ b/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.threadpool; +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.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool.Names; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java similarity index 97% rename from src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java rename to src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java index cea6a6dd976..fd56b7713ff 100644 --- a/src/test/java/org/elasticsearch/test/integration/timestamp/SimpleTimestampTests.java +++ b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.integration.timestamp; +package org.elasticsearch.timestamp; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java b/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java rename to src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java index 6f66adf91e7..965e448e38e 100644 --- a/src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java +++ b/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.transport; +package org.elasticsearch.transport; import com.google.common.collect.ImmutableMap; import org.elasticsearch.Version; @@ -28,9 +28,8 @@ 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.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.transport.*; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/transport/local/SimpleLocalTransportTests.java b/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java similarity index 86% rename from src/test/java/org/elasticsearch/test/unit/transport/local/SimpleLocalTransportTests.java rename to src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java index 8eda003ae3d..fc2a69cf538 100644 --- a/src/test/java/org/elasticsearch/test/unit/transport/local/SimpleLocalTransportTests.java +++ b/src/test/java/org/elasticsearch/transport/local/SimpleLocalTransportTests.java @@ -17,13 +17,12 @@ * under the License. */ -package org.elasticsearch.test.unit.transport.local; +package org.elasticsearch.transport.local; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.unit.transport.AbstractSimpleTransportTests; +import org.elasticsearch.transport.AbstractSimpleTransportTests; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.transport.local.LocalTransport; public class SimpleLocalTransportTests extends AbstractSimpleTransportTests { diff --git a/src/test/java/org/elasticsearch/test/unit/transport/netty/KeyedLockTests.java b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/unit/transport/netty/KeyedLockTests.java rename to src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java index a36c41e7493..1b18e834f04 100644 --- a/src/test/java/org/elasticsearch/test/unit/transport/netty/KeyedLockTests.java +++ b/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.test.unit.transport.netty; +package org.elasticsearch.transport.netty; import org.elasticsearch.ElasticSearchIllegalStateException; import org.elasticsearch.common.util.concurrent.KeyedLock; -import org.elasticsearch.test.integration.ElasticsearchTestCase; +import org.elasticsearch.ElasticsearchTestCase; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/unit/transport/netty/SimpleNettyTransportTests.java b/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java similarity index 92% rename from src/test/java/org/elasticsearch/test/unit/transport/netty/SimpleNettyTransportTests.java rename to src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java index 670afd363cb..cd227315cb4 100644 --- a/src/test/java/org/elasticsearch/test/unit/transport/netty/SimpleNettyTransportTests.java +++ b/src/test/java/org/elasticsearch/transport/netty/SimpleNettyTransportTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.unit.transport.netty; +package org.elasticsearch.transport.netty; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -25,10 +25,9 @@ import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; -import org.elasticsearch.test.unit.transport.AbstractSimpleTransportTests; +import org.elasticsearch.transport.AbstractSimpleTransportTests; import org.elasticsearch.transport.ConnectTransportException; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.transport.netty.NettyTransport; import org.junit.Test; public class SimpleNettyTransportTests extends AbstractSimpleTransportTests { diff --git a/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java b/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java similarity index 98% rename from src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java rename to src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java index e7db607aedb..e36e8cb673e 100644 --- a/src/test/java/org/elasticsearch/test/integration/ttl/SimpleTTLTests.java +++ b/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.test.integration.ttl; +package org.elasticsearch.ttl; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.integration.AbstractNodesTests; +import org.elasticsearch.AbstractNodesTests; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; diff --git a/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java rename to src/test/java/org/elasticsearch/update/UpdateTests.java index 46bedceadc7..dc1651a18c1 100644 --- a/src/test/java/org/elasticsearch/test/integration/update/UpdateTests.java +++ b/src/test/java/org/elasticsearch/update/UpdateTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.update; +package org.elasticsearch.update; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.get.GetResponse; @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentMissingException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.HashMap; diff --git a/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java rename to src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java index 9f5be770e3a..a81c707590c 100644 --- a/src/test/java/org/elasticsearch/test/integration/validate/SimpleValidateQueryTests.java +++ b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.validate; +package org.elasticsearch.validate; import com.google.common.base.Charsets; import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse; @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.hamcrest.Matcher; import org.junit.Test; diff --git a/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java b/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java similarity index 95% rename from src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java rename to src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java index 5b9cc55f532..afbd5e181c4 100644 --- a/src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java +++ b/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java @@ -1,8 +1,8 @@ -package org.elasticsearch.test.integration.versioning; +package org.elasticsearch.versioning; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.Map; diff --git a/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java similarity index 99% rename from src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java rename to src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java index 1a7e542a3e1..efccc3a27c7 100644 --- a/src/test/java/org/elasticsearch/test/integration/versioning/SimpleVersioningTests.java +++ b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.integration.versioning; +package org.elasticsearch.versioning; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.delete.DeleteResponse; @@ -27,7 +27,7 @@ import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentAlreadyExistsException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.integration.AbstractSharedClusterTest; +import org.elasticsearch.AbstractSharedClusterTest; import org.junit.Test; import java.util.HashMap; diff --git a/src/test/resources/org/elasticsearch/test/integration/nodesinfo/node2/dummy/_site/es-plugin.properties b/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/nodesinfo/node2/dummy/_site/es-plugin.properties rename to src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/es-plugin.properties diff --git a/src/test/resources/org/elasticsearch/test/integration/nodesinfo/node2/dummy/_site/index.html b/src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/nodesinfo/node2/dummy/_site/index.html rename to src/test/resources/org/elasticsearch/nodesinfo/node2/dummy/_site/index.html diff --git a/src/test/resources/org/elasticsearch/test/integration/nodesinfo/node4/dummy/_site/index.html b/src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/nodesinfo/node4/dummy/_site/index.html rename to src/test/resources/org/elasticsearch/nodesinfo/node4/dummy/_site/index.html diff --git a/src/test/resources/org/elasticsearch/test/integration/nodesinfo/node4/test-no-version-plugin/_site/index.html b/src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/nodesinfo/node4/test-no-version-plugin/_site/index.html rename to src/test/resources/org/elasticsearch/nodesinfo/node4/test-no-version-plugin/_site/index.html diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/anotherplugin/_site/index.html b/src/test/resources/org/elasticsearch/plugin/anotherplugin/_site/index.html similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/anotherplugin/_site/index.html rename to src/test/resources/org/elasticsearch/plugin/anotherplugin/_site/index.html diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/dummy/_site/index.html b/src/test/resources/org/elasticsearch/plugin/dummy/_site/index.html similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/dummy/_site/index.html rename to src/test/resources/org/elasticsearch/plugin/dummy/_site/index.html diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/plugin_folder_file.zip b/src/test/resources/org/elasticsearch/plugin/plugin_folder_file.zip similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/plugin_folder_file.zip rename to src/test/resources/org/elasticsearch/plugin/plugin_folder_file.zip diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/plugin_folder_site.zip b/src/test/resources/org/elasticsearch/plugin/plugin_folder_site.zip similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/plugin_folder_site.zip rename to src/test/resources/org/elasticsearch/plugin/plugin_folder_site.zip diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/plugin_single_folder.zip b/src/test/resources/org/elasticsearch/plugin/plugin_single_folder.zip similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/plugin_single_folder.zip rename to src/test/resources/org/elasticsearch/plugin/plugin_single_folder.zip diff --git a/src/test/resources/org/elasticsearch/test/integration/plugin/plugin_without_folders.zip b/src/test/resources/org/elasticsearch/plugin/plugin_without_folders.zip similarity index 100% rename from src/test/resources/org/elasticsearch/test/integration/plugin/plugin_without_folders.zip rename to src/test/resources/org/elasticsearch/plugin/plugin_without_folders.zip