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

Collapse test.{unit,integration} into org.elasticsearch.

This commit is contained in:
Andrew Raines 2013-09-11 12:49:49 -05:00
parent b5c9807ba2
commit 7425b85b0b
548 changed files with 838 additions and 1068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java → src/test/java/org/elasticsearch/AbstractNodesTests.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/AbstractSharedClusterTest.java → src/test/java/org/elasticsearch/AbstractSharedClusterTest.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/ClusterManager.java → src/test/java/org/elasticsearch/ClusterManager.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/ElasticSearchExceptionTests.java → src/test/java/org/elasticsearch/ElasticSearchExceptionTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.unit;
package org.elasticsearch;
import org.elasticsearch.ElasticSearchException;
import org.elasticsearch.index.Index;

2
src/test/java/org/elasticsearch/test/integration/ElasticSearchThreadFilter.java → src/test/java/org/elasticsearch/ElasticSearchThreadFilter.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.integration;
package org.elasticsearch;
import com.carrotsearch.randomizedtesting.ThreadFilter;

2
src/test/java/org/elasticsearch/test/integration/ElasticSearchTokenStreamTestCase.java → src/test/java/org/elasticsearch/ElasticSearchTokenStreamTestCase.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/ElasticsearchLuceneTestCase.java → src/test/java/org/elasticsearch/ElasticsearchLuceneTestCase.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/ElasticsearchTestCase.java → src/test/java/org/elasticsearch/ElasticsearchTestCase.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/TestCluster.java → src/test/java/org/elasticsearch/TestCluster.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/VersionTests.java → src/test/java/org/elasticsearch/VersionTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.test.unit;
package org.elasticsearch;
import org.junit.Test;

12
src/test/java/org/elasticsearch/test/unit/action/bulk/BulkRequestTests.java → src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
View File

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

0
src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk.json → src/test/java/org/elasticsearch/action/bulk/simple-bulk.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk2.json → src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk3.json → src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/bulk/simple-bulk4.json → src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json
View File

8
src/test/java/org/elasticsearch/test/unit/action/percolate/MultiPercolatorRequestTests.java → src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java
View File

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

0
src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate1.json → src/test/java/org/elasticsearch/action/percolate/mpercolate1.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/percolate/mpercolate2.json → src/test/java/org/elasticsearch/action/percolate/mpercolate2.json
View File

10
src/test/java/org/elasticsearch/test/unit/action/search/MultiSearchRequestTests.java → src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java
View File

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

0
src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch1.json → src/test/java/org/elasticsearch/action/search/simple-msearch1.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch2.json → src/test/java/org/elasticsearch/action/search/simple-msearch2.json
View File

0
src/test/java/org/elasticsearch/test/unit/action/search/simple-msearch3.json → src/test/java/org/elasticsearch/action/search/simple-msearch3.json
View File

6
src/test/java/org/elasticsearch/test/unit/action/suggest/SuggestActionTests.java → src/test/java/org/elasticsearch/action/suggest/SuggestActionTests.java
View File

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

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

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

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

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

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

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

4
src/test/java/org/elasticsearch/test/integration/cluster/AbstractZenNodesTests.java → src/test/java/org/elasticsearch/cluster/AbstractZenNodesTests.java
View File

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

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

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

3
src/test/java/org/elasticsearch/test/integration/cluster/ClusterServiceTests.java → src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java
View File

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

2
src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
View File

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

3
src/test/java/org/elasticsearch/test/integration/cluster/MinimumMasterNodesTests.java → src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
View File

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

5
src/test/java/org/elasticsearch/test/integration/cluster/NoMasterNodeTests.java → src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/SimpleDataNodesTests.java → src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java
View File

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

2
src/test/java/org/elasticsearch/test/integration/cluster/SpecificMasterNodesTests.java → src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/UpdateSettingsValidationTests.java → src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/allocation/AwarenessAllocationTests.java → src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/allocation/ClusterRerouteTests.java → src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/allocation/FilteringAllocationTests.java → src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/allocation/ShardsAllocatorModuleTests.java → src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java
View File

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

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

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

3
src/test/java/org/elasticsearch/test/unit/cluster/metadata/MappingMetaDataParserTests.java → src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/metadata/MetaDataTests.java → src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
View File

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

4
src/test/java/org/elasticsearch/test/unit/cluster/metadata/ToAndFromJsonMetaDataTests.java → src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java
View File

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

4
src/test/java/org/elasticsearch/test/unit/cluster/node/DiscoveryNodeFiltersTests.java → src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AddIncrementallyTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java
View File

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

6
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocatePostApiFlagTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/AllocatePostApiFlagTests.java
View File

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

6
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AllocationCommandsTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java
View File

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

7
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/AwarenessAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java
View File

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

8
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/BalanceConfigurationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ClusterRebalanceRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java
View File

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

6
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DeadNodesAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/DisableAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java
View File

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

8
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedNodeRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java
View File

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

6
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FailedShardsRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/FilterRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/IndexBalanceTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java
View File

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

7
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PreferPrimaryAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java
View File

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

6
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryElectionRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java
View File

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

8
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RandomAllocationDeciderTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RebalanceAfterActiveTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/RoutingAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocationTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SameShardRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardVersioningTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ShardsLimitAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java
View File

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

20
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java
View File

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

10
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/ThrottlingAllocationTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/cluster/routing/allocation/UpdateNumberOfReplicasTests.java → src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java
View File

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

4
src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/cluster/serialization/ClusterSerializationTests.java → src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/cluster/settings/ClusterSettingsTests.java → src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/cluster/settings/SettingsValidatorTests.java → src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java
View File

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

4
src/test/java/org/elasticsearch/test/integration/cluster/shards/ClusterSearchShardsTests.java → src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java
View File

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

13
src/test/java/org/elasticsearch/test/unit/cluster/structure/RoutingIteratorTests.java → src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java
View File

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

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

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

4
src/test/java/org/elasticsearch/test/unit/common/compress/CompressedStringTests.java → src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/common/geo/GeoJSONShapeParserTests.java → src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/common/geo/ShapeBuilderTests.java → src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/common/io/StreamsTests.java → src/test/java/org/elasticsearch/common/io/StreamsTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/common/io/streams/BytesStreamsTests.java → src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java
View File

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

2
src/test/java/org/elasticsearch/test/unit/common/io/streams/HandlesStreamsTests.java → src/test/java/org/elasticsearch/common/io/streams/HandlesStreamsTests.java
View File

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

4
src/test/java/org/elasticsearch/test/unit/common/joda/DateMathParserTests.java → src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/LuceneTest.java → src/test/java/org/elasticsearch/common/lucene/LuceneTest.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/common/lucene/all/SimpleAllTests.java → src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java
View File

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

4
src/test/java/org/elasticsearch/test/unit/common/lucene/search/MatchAllDocsFilterTests.java → src/test/java/org/elasticsearch/common/lucene/search/MatchAllDocsFilterTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/search/MoreLikeThisQueryTests.java → src/test/java/org/elasticsearch/common/lucene/search/MoreLikeThisQueryTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/search/MultiPhrasePrefixQueryTests.java → src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/search/TermsFilterTests.java → src/test/java/org/elasticsearch/common/lucene/search/TermsFilterTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterLuceneTests.java → src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterLuceneTests.java
View File

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

4
src/test/java/org/elasticsearch/test/unit/common/lucene/search/XBooleanFilterTests.java → src/test/java/org/elasticsearch/common/lucene/search/XBooleanFilterTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/lucene/store/InputStreamIndexInputTests.java → src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/common/lucene/uid/VersionsTests.java → src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java
View File

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

3
src/test/java/org/elasticsearch/test/unit/common/path/PathTrieTests.java → src/test/java/org/elasticsearch/common/path/PathTrieTests.java
View File

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

5
src/test/java/org/elasticsearch/test/unit/common/regex/RegexTests.java → src/test/java/org/elasticsearch/common/regex/RegexTests.java
View File

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

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