From ea3ec926c91f615767f1460709d96486d5686902 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Sat, 28 Sep 2013 22:16:34 +0200 Subject: [PATCH] Move Mock Store impls to test package --- .../search/basic/SearchWithRandomExceptionsTests.java | 3 +-- .../java/org/elasticsearch/test/ElasticSearchTestCase.java | 2 +- src/test/java/org/elasticsearch/test/TestCluster.java | 2 +- .../{index => test}/store/mock/MockDirectoryHelper.java | 2 +- .../{index => test}/store/mock/MockFSDirectoryService.java | 2 +- .../{index => test}/store/mock/MockFSIndexStore.java | 2 +- .../{index => test}/store/mock/MockFSIndexStoreModule.java | 2 +- .../{index => test}/store/mock/MockRamDirecorySerivce.java | 2 +- .../{index => test}/store/mock/MockRamIndexStore.java | 2 +- .../{index => test}/store/mock/MockRamIndexStoreModule.java | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockDirectoryHelper.java (99%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockFSDirectoryService.java (97%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockFSIndexStore.java (97%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockFSIndexStoreModule.java (96%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockRamDirecorySerivce.java (98%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockRamIndexStore.java (97%) rename src/test/java/org/elasticsearch/{index => test}/store/mock/MockRamIndexStoreModule.java (96%) diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java index a5f3d40e138..9d2b538f0d1 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.store.mock.MockDirectoryHelper; import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.store.mock.MockDirectoryHelper; import org.hamcrest.Matchers; import org.junit.Test; @@ -41,7 +41,6 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; - public class SearchWithRandomExceptionsTests extends AbstractIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java b/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java index 26471140fdd..abd310e4ae0 100644 --- a/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticSearchTestCase.java @@ -26,9 +26,9 @@ import org.apache.lucene.util.AbstractRandomizedTest; import org.apache.lucene.util.TimeUnits; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.index.store.mock.MockDirectoryHelper; import org.elasticsearch.junit.listeners.LoggingListener; import org.elasticsearch.test.engine.MockRobinEngine; +import org.elasticsearch.test.store.mock.MockDirectoryHelper; import org.junit.BeforeClass; import java.io.Closeable; diff --git a/src/test/java/org/elasticsearch/test/TestCluster.java b/src/test/java/org/elasticsearch/test/TestCluster.java index 8b1afb93d35..fb2aeda739c 100644 --- a/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/src/test/java/org/elasticsearch/test/TestCluster.java @@ -48,10 +48,10 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.index.engine.IndexEngineModule; -import org.elasticsearch.index.store.mock.MockFSIndexStoreModule; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.test.engine.MockEngineModule; +import org.elasticsearch.test.store.mock.MockFSIndexStoreModule; import org.elasticsearch.transport.TransportService; import org.junit.Assert; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockDirectoryHelper.java b/src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java similarity index 99% rename from src/test/java/org/elasticsearch/index/store/mock/MockDirectoryHelper.java rename to src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java index 3c634c15d27..ec60b733a19 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockDirectoryHelper.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockDirectoryHelper.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import com.carrotsearch.randomizedtesting.SeedUtils; import org.apache.lucene.store.*; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockFSDirectoryService.java b/src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java similarity index 97% rename from src/test/java/org/elasticsearch/index/store/mock/MockFSDirectoryService.java rename to src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java index 42b524ca8ed..a20a6586090 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockFSDirectoryService.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockFSDirectoryService.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStore.java b/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java similarity index 97% rename from src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStore.java rename to src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java index 2e91ce9a00a..120e85a8b12 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStore.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStore.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStoreModule.java b/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java similarity index 96% rename from src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStoreModule.java rename to src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java index 7207ac2e77f..27dc9b68b78 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockFSIndexStoreModule.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockFSIndexStoreModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.store.IndexStore; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockRamDirecorySerivce.java b/src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java similarity index 98% rename from src/test/java/org/elasticsearch/index/store/mock/MockRamDirecorySerivce.java rename to src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java index ec14c11ef1e..4f4098acc73 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockRamDirecorySerivce.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockRamDirecorySerivce.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.apache.lucene.store.Directory; import org.elasticsearch.cache.memory.ByteBufferCache; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStore.java b/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java similarity index 97% rename from src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStore.java rename to src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java index 7da9e765646..09bfe3e7ec3 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStore.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStore.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.elasticsearch.common.inject.Inject; diff --git a/src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStoreModule.java b/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java similarity index 96% rename from src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStoreModule.java rename to src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java index 0b284e8537f..7ccfe58cf96 100644 --- a/src/test/java/org/elasticsearch/index/store/mock/MockRamIndexStoreModule.java +++ b/src/test/java/org/elasticsearch/test/store/mock/MockRamIndexStoreModule.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.store.mock; +package org.elasticsearch.test.store.mock; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.index.store.IndexStore;